diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/Java/gtPlusPlus/core/gui/machine/GUI_VolumetricFlaskSetter.java | 183 | ||||
-rw-r--r-- | src/Java/gtPlusPlus/core/gui/widget/GuiValueField.java | 86 | ||||
-rw-r--r-- | src/Java/gtPlusPlus/core/item/base/rods/BaseItemRod.java | 49 | ||||
-rw-r--r-- | src/Java/gtPlusPlus/core/item/base/rods/BaseItemRodLong.java | 46 | ||||
-rw-r--r-- | src/Java/gtPlusPlus/core/item/base/screws/BaseItemScrew.java | 32 | ||||
-rw-r--r-- | src/Java/gtPlusPlus/core/material/nuclear/NUCLIDE.java | 129 | ||||
-rw-r--r-- | src/Java/gtPlusPlus/core/recipe/RECIPES_SeleniumProcessing.java | 218 | ||||
-rw-r--r-- | src/Java/gtPlusPlus/nei/GTPP_NEI_DefaultHandler.java | 822 | ||||
-rw-r--r-- | src/Java/gtPlusPlus/nei/GT_NEI_FlotationCell.java | 462 | ||||
-rw-r--r-- | src/Java/gtPlusPlus/nei/GT_NEI_FluidReactor.java | 507 | ||||
-rw-r--r-- | src/Java/gtPlusPlus/nei/GT_NEI_MillingMachine.java | 472 | ||||
-rw-r--r-- | src/Java/gtPlusPlus/nei/GT_NEI_RFPP.java | 515 | ||||
-rw-r--r-- | src/Java/gtPlusPlus/nei/GT_NEI_VacFurnace.java | 482 | ||||
-rw-r--r-- | src/Java/gtPlusPlus/nei/GT_NEI_multiCentriElectroFreezer.java | 554 | ||||
-rw-r--r-- | src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_AirIntake.java | 289 | ||||
-rw-r--r-- | src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_ElementalDuplicator.java | 993 | ||||
-rw-r--r-- | src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java | 632 | ||||
-rw-r--r-- | src/Java/gtPlusPlus/xmod/gregtech/loaders/misc/AddCustomMachineToPA.java | 51 | ||||
-rw-r--r-- | src/Java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_LFTR.java | 98 | ||||
-rw-r--r-- | src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLFTR.java | 27 | ||||
-rw-r--r-- | src/main/java/gregtech/api/enums/TAE.java (renamed from src/Java/gregtech/api/enums/TAE.java) | 0 | ||||
-rw-r--r-- | src/main/java/gregtech/api/util/EmptyRecipeMap.java (renamed from src/Java/gregtech/api/util/EmptyRecipeMap.java) | 0 | ||||
-rw-r--r-- | src/main/java/gregtech/api/util/FishPondFakeRecipe.java (renamed from src/Java/gregtech/api/util/FishPondFakeRecipe.java) | 0 | ||||
-rw-r--r-- | src/main/java/gregtech/api/util/GTPP_Recipe.java (renamed from src/Java/gregtech/api/util/GTPP_Recipe.java) | 18 | ||||
-rw-r--r-- | src/main/java/gregtech/api/util/GasSpargingRecipe.java | 99 | ||||
-rw-r--r-- | src/main/java/gregtech/api/util/GasSpargingRecipeMap.java | 48 | ||||
-rw-r--r-- | src/main/java/gregtech/api/util/HotFuel.java (renamed from src/Java/gregtech/api/util/HotFuel.java) | 0 | ||||
-rw-r--r-- | src/main/java/gregtech/api/util/SemiFluidFuelHandler.java (renamed from src/Java/gregtech/api/util/SemiFluidFuelHandler.java) | 0 | ||||
-rw-r--r-- | src/main/java/gregtech/api/util/ThermalFuel.java (renamed from src/Java/gregtech/api/util/ThermalFuel.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/GTplusplus.java (renamed from src/Java/gtPlusPlus/GTplusplus.java) | 92 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/GenerateDictionaries.java (renamed from src/Java/gtPlusPlus/GenerateDictionaries.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/RoadMap.java (renamed from src/Java/gtPlusPlus/RoadMap.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/api/damage/DamageTeslaTower.java (renamed from src/Java/gtPlusPlus/api/damage/DamageTeslaTower.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/api/enums/ParticleNames.java (renamed from src/Java/gtPlusPlus/api/enums/ParticleNames.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/api/enums/Quality.java (renamed from src/Java/gtPlusPlus/api/enums/Quality.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/api/helpers/GregtechPlusPlus_API.java (renamed from src/Java/gtPlusPlus/api/helpers/GregtechPlusPlus_API.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/api/helpers/MaterialHelper.java (renamed from src/Java/gtPlusPlus/api/helpers/MaterialHelper.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/api/interfaces/IChunkLoader.java (renamed from src/Java/gtPlusPlus/api/interfaces/IChunkLoader.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/api/interfaces/IComparableRecipe.java (renamed from src/Java/gtPlusPlus/api/interfaces/IComparableRecipe.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/api/interfaces/IEntityCatcher.java (renamed from src/Java/gtPlusPlus/api/interfaces/IEntityCatcher.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/api/interfaces/IGeneratorWorld.java (renamed from src/Java/gtPlusPlus/api/interfaces/IGeneratorWorld.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/api/interfaces/IGregtechPacketEntity.java (renamed from src/Java/gtPlusPlus/api/interfaces/IGregtechPacketEntity.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/api/interfaces/IGregtechPower.java (renamed from src/Java/gtPlusPlus/api/interfaces/IGregtechPower.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/api/interfaces/ILazyCoverable.java (renamed from src/Java/gtPlusPlus/api/interfaces/ILazyCoverable.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/api/interfaces/IPlugin.java (renamed from src/Java/gtPlusPlus/api/interfaces/IPlugin.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/api/interfaces/IRandomGenerator.java (renamed from src/Java/gtPlusPlus/api/interfaces/IRandomGenerator.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/api/interfaces/ITexturedBlock.java (renamed from src/Java/gtPlusPlus/api/interfaces/ITexturedBlock.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/api/interfaces/ITileTooltip.java (renamed from src/Java/gtPlusPlus/api/interfaces/ITileTooltip.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/api/interfaces/IToolable.java (renamed from src/Java/gtPlusPlus/api/interfaces/IToolable.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/api/interfaces/RunnableWithInfo.java (renamed from src/Java/gtPlusPlus/api/interfaces/RunnableWithInfo.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/api/objects/GregtechException.java (renamed from src/Java/gtPlusPlus/api/objects/GregtechException.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/api/objects/Logger.java (renamed from src/Java/gtPlusPlus/api/objects/Logger.java) | 2 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/api/objects/data/AutoMap.java (renamed from src/Java/gtPlusPlus/api/objects/data/AutoMap.java) | 12 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/api/objects/data/ConcurrentHashSet.java (renamed from src/Java/gtPlusPlus/api/objects/data/ConcurrentHashSet.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/api/objects/data/ConcurrentSet.java (renamed from src/Java/gtPlusPlus/api/objects/data/ConcurrentSet.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/api/objects/data/FlexiblePair.java (renamed from src/Java/gtPlusPlus/api/objects/data/FlexiblePair.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/api/objects/data/ObjMap.java (renamed from src/Java/gtPlusPlus/api/objects/data/ObjMap.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/api/objects/data/Pair.java (renamed from src/Java/gtPlusPlus/api/objects/data/Pair.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/api/objects/data/Quad.java (renamed from src/Java/gtPlusPlus/api/objects/data/Quad.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/api/objects/data/ReverseAutoMap.java (renamed from src/Java/gtPlusPlus/api/objects/data/ReverseAutoMap.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/api/objects/data/Triplet.java (renamed from src/Java/gtPlusPlus/api/objects/data/Triplet.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/api/objects/data/TypeCounter.java (renamed from src/Java/gtPlusPlus/api/objects/data/TypeCounter.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/api/objects/data/WeightedCollection.java (renamed from src/Java/gtPlusPlus/api/objects/data/WeightedCollection.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/api/objects/data/weakref/WeakAutoMap.java (renamed from src/Java/gtPlusPlus/api/objects/data/weakref/WeakAutoMap.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/api/objects/minecraft/AABB.java (renamed from src/Java/gtPlusPlus/api/objects/minecraft/AABB.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/api/objects/minecraft/BTF_FluidTank.java (renamed from src/Java/gtPlusPlus/api/objects/minecraft/BTF_FluidTank.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/api/objects/minecraft/BTF_Inventory.java (renamed from src/Java/gtPlusPlus/api/objects/minecraft/BTF_Inventory.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/api/objects/minecraft/BlockPos.java (renamed from src/Java/gtPlusPlus/api/objects/minecraft/BlockPos.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/api/objects/minecraft/CubicObject.java (renamed from src/Java/gtPlusPlus/api/objects/minecraft/CubicObject.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/api/objects/minecraft/DimChunkPos.java (renamed from src/Java/gtPlusPlus/api/objects/minecraft/DimChunkPos.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/api/objects/minecraft/FakeBlockPos.java (renamed from src/Java/gtPlusPlus/api/objects/minecraft/FakeBlockPos.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/api/objects/minecraft/FakeWorld.java (renamed from src/Java/gtPlusPlus/api/objects/minecraft/FakeWorld.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/api/objects/minecraft/FluidGT6.java (renamed from src/Java/gtPlusPlus/api/objects/minecraft/FluidGT6.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/api/objects/minecraft/FormattedTooltipString.java (renamed from src/Java/gtPlusPlus/api/objects/minecraft/FormattedTooltipString.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/api/objects/minecraft/GenericStack.java (renamed from src/Java/gtPlusPlus/api/objects/minecraft/GenericStack.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/api/objects/minecraft/ItemPackage.java (renamed from src/Java/gtPlusPlus/api/objects/minecraft/ItemPackage.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/api/objects/minecraft/ItemStackData.java (renamed from src/Java/gtPlusPlus/api/objects/minecraft/ItemStackData.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/api/objects/minecraft/NoConflictGTRecipeMap.java (renamed from src/Java/gtPlusPlus/api/objects/minecraft/NoConflictGTRecipeMap.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/api/objects/minecraft/SafeTexture.java (renamed from src/Java/gtPlusPlus/api/objects/minecraft/SafeTexture.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/api/objects/minecraft/ShapedRecipe.java (renamed from src/Java/gtPlusPlus/api/objects/minecraft/ShapedRecipe.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/api/objects/minecraft/TexturePackage.java (renamed from src/Java/gtPlusPlus/api/objects/minecraft/TexturePackage.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/api/objects/minecraft/ThreadPooCollector.java (renamed from src/Java/gtPlusPlus/api/objects/minecraft/ThreadPooCollector.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/api/objects/minecraft/multi/NoEUBonusMultiBehaviour.java (renamed from src/Java/gtPlusPlus/api/objects/minecraft/multi/NoEUBonusMultiBehaviour.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/api/objects/minecraft/multi/NoOutputBonusMultiBehaviour.java (renamed from src/Java/gtPlusPlus/api/objects/minecraft/multi/NoOutputBonusMultiBehaviour.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/api/objects/minecraft/multi/NoSpeedBonusMultiBehaviour.java (renamed from src/Java/gtPlusPlus/api/objects/minecraft/multi/NoSpeedBonusMultiBehaviour.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/api/objects/minecraft/multi/SpecialMultiBehaviour.java (renamed from src/Java/gtPlusPlus/api/objects/minecraft/multi/SpecialMultiBehaviour.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/api/objects/random/CSPRNG_DO_NOT_USE.java (renamed from src/Java/gtPlusPlus/api/objects/random/CSPRNG_DO_NOT_USE.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/api/objects/random/UUIDGenerator.java (renamed from src/Java/gtPlusPlus/api/objects/random/UUIDGenerator.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/api/objects/random/XSTR.java (renamed from src/Java/gtPlusPlus/api/objects/random/XSTR.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/api/plugin/Sample_Plugin.java (renamed from src/Java/gtPlusPlus/api/plugin/Sample_Plugin.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/api/thermal/energy/IThermalConnection.java (renamed from src/Java/gtPlusPlus/api/thermal/energy/IThermalConnection.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/api/thermal/energy/IThermalContainerItem.java (renamed from src/Java/gtPlusPlus/api/thermal/energy/IThermalContainerItem.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/api/thermal/energy/IThermalHandler.java (renamed from src/Java/gtPlusPlus/api/thermal/energy/IThermalHandler.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/api/thermal/energy/IThermalProvider.java (renamed from src/Java/gtPlusPlus/api/thermal/energy/IThermalProvider.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/api/thermal/energy/IThermalReceiver.java (renamed from src/Java/gtPlusPlus/api/thermal/energy/IThermalReceiver.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/api/thermal/energy/IThermalStorage.java (renamed from src/Java/gtPlusPlus/api/thermal/energy/IThermalStorage.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/api/thermal/energy/ThermalStorage.java (renamed from src/Java/gtPlusPlus/api/thermal/energy/ThermalStorage.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/api/thermal/energy/ThermalStorageAdv.java (renamed from src/Java/gtPlusPlus/api/thermal/energy/ThermalStorageAdv.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/api/thermal/sample/ItemThermalContainer.java (renamed from src/Java/gtPlusPlus/api/thermal/sample/ItemThermalContainer.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/api/thermal/sample/TileThermalHandler.java (renamed from src/Java/gtPlusPlus/api/thermal/sample/TileThermalHandler.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/api/thermal/tileentity/IThermalInfo.java (renamed from src/Java/gtPlusPlus/api/thermal/tileentity/IThermalInfo.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/australia/GTplusplus_Australia.java (renamed from src/Java/gtPlusPlus/australia/GTplusplus_Australia.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/australia/biome/CustomDecorator.java (renamed from src/Java/gtPlusPlus/australia/biome/CustomDecorator.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/australia/biome/GenLayerAustralia.java (renamed from src/Java/gtPlusPlus/australia/biome/GenLayerAustralia.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/australia/biome/GenLayerBiomesAustraliaDimension.java (renamed from src/Java/gtPlusPlus/australia/biome/GenLayerBiomesAustraliaDimension.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/australia/biome/type/Biome_AustralianDesert.java (renamed from src/Java/gtPlusPlus/australia/biome/type/Biome_AustralianDesert.java) | 12 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/australia/biome/type/Biome_AustralianDesert2.java (renamed from src/Java/gtPlusPlus/australia/biome/type/Biome_AustralianDesert2.java) | 14 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/australia/biome/type/Biome_AustralianDesert_Ex.java (renamed from src/Java/gtPlusPlus/australia/biome/type/Biome_AustralianDesert_Ex.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/australia/biome/type/Biome_AustralianForest.java (renamed from src/Java/gtPlusPlus/australia/biome/type/Biome_AustralianForest.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/australia/biome/type/Biome_AustralianOcean.java (renamed from src/Java/gtPlusPlus/australia/biome/type/Biome_AustralianOcean.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/australia/biome/type/Biome_AustralianOutback.java (renamed from src/Java/gtPlusPlus/australia/biome/type/Biome_AustralianOutback.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/australia/biome/type/Biome_AustralianPlains.java (renamed from src/Java/gtPlusPlus/australia/biome/type/Biome_AustralianPlains.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/australia/block/AustraliaContentLoader.java (renamed from src/Java/gtPlusPlus/australia/block/AustraliaContentLoader.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/australia/block/BlockAustraliaPortal.java (renamed from src/Java/gtPlusPlus/australia/block/BlockAustraliaPortal.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/australia/block/BlockAustraliaSand.java (renamed from src/Java/gtPlusPlus/australia/block/BlockAustraliaSand.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/australia/block/BlockAustraliaTopSoil.java (renamed from src/Java/gtPlusPlus/australia/block/BlockAustraliaTopSoil.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/australia/block/BlockDarkWorldPortalFrame.java (renamed from src/Java/gtPlusPlus/australia/block/BlockDarkWorldPortalFrame.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/australia/chunk/ChunkProviderAustralia.java (renamed from src/Java/gtPlusPlus/australia/chunk/ChunkProviderAustralia.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/australia/dimension/Dimension_Australia.java (renamed from src/Java/gtPlusPlus/australia/dimension/Dimension_Australia.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/australia/entity/model/ModelAustralianSpider.java (renamed from src/Java/gtPlusPlus/australia/entity/model/ModelAustralianSpider.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/australia/entity/model/ModelBoar.java (renamed from src/Java/gtPlusPlus/australia/entity/model/ModelBoar.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/australia/entity/model/ModelDingo.java (renamed from src/Java/gtPlusPlus/australia/entity/model/ModelDingo.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/australia/entity/model/ModelOctopus.java (renamed from src/Java/gtPlusPlus/australia/entity/model/ModelOctopus.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/australia/entity/render/RenderAustralianSpider.java (renamed from src/Java/gtPlusPlus/australia/entity/render/RenderAustralianSpider.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/australia/entity/render/RenderBoar.java (renamed from src/Java/gtPlusPlus/australia/entity/render/RenderBoar.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/australia/entity/render/RenderDingo.java (renamed from src/Java/gtPlusPlus/australia/entity/render/RenderDingo.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/australia/entity/render/RenderOctopus.java (renamed from src/Java/gtPlusPlus/australia/entity/render/RenderOctopus.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/australia/entity/type/EntityAustralianSpiderBase.java (renamed from src/Java/gtPlusPlus/australia/entity/type/EntityAustralianSpiderBase.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/australia/entity/type/EntityBoar.java (renamed from src/Java/gtPlusPlus/australia/entity/type/EntityBoar.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/australia/entity/type/EntityDingo.java (renamed from src/Java/gtPlusPlus/australia/entity/type/EntityDingo.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/australia/entity/type/EntityOctopus.java (renamed from src/Java/gtPlusPlus/australia/entity/type/EntityOctopus.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/australia/gen/gt/WorldGen_Australia_Ores.java (renamed from src/Java/gtPlusPlus/australia/gen/gt/WorldGen_Australia_Ores.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/australia/gen/gt/WorldGen_GT_Australia.java (renamed from src/Java/gtPlusPlus/australia/gen/gt/WorldGen_GT_Australia.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/australia/gen/gt/WorldGen_GT_Australia_Base.java (renamed from src/Java/gtPlusPlus/australia/gen/gt/WorldGen_GT_Australia_Base.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/australia/gen/gt/WorldGen_GT_Australia_Ore_Layer.java (renamed from src/Java/gtPlusPlus/australia/gen/gt/WorldGen_GT_Australia_Ore_Layer.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/australia/gen/map/MapGenExtendedVillage.java (renamed from src/Java/gtPlusPlus/australia/gen/map/MapGenExtendedVillage.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/australia/gen/map/MapGenLargeRavine.java (renamed from src/Java/gtPlusPlus/australia/gen/map/MapGenLargeRavine.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/australia/gen/map/component/AustraliaComponent.java (renamed from src/Java/gtPlusPlus/australia/gen/map/component/AustraliaComponent.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/australia/gen/map/component/ComponentHut.java (renamed from src/Java/gtPlusPlus/australia/gen/map/component/ComponentHut.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/australia/gen/map/component/ComponentShack.java (renamed from src/Java/gtPlusPlus/australia/gen/map/component/ComponentShack.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/australia/gen/map/structure/StructureManager.java (renamed from src/Java/gtPlusPlus/australia/gen/map/structure/StructureManager.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/australia/gen/map/structure/type/ComponentVillageBank.java (renamed from src/Java/gtPlusPlus/australia/gen/map/structure/type/ComponentVillageBank.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/australia/gen/world/WorldGenAustralianOre.java (renamed from src/Java/gtPlusPlus/australia/gen/world/WorldGenAustralianOre.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/australia/gen/world/WorldGenAustralianTrees.java (renamed from src/Java/gtPlusPlus/australia/gen/world/WorldGenAustralianTrees.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/australia/item/ItemAustraliaPortalTrigger.java (renamed from src/Java/gtPlusPlus/australia/item/ItemAustraliaPortalTrigger.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/australia/item/ItemBlockAustralia.java (renamed from src/Java/gtPlusPlus/australia/item/ItemBlockAustralia.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/australia/world/AustraliaPortalPosition.java (renamed from src/Java/gtPlusPlus/australia/world/AustraliaPortalPosition.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/australia/world/AustraliaTeleporterDimensionMod.java (renamed from src/Java/gtPlusPlus/australia/world/AustraliaTeleporterDimensionMod.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/australia/world/AustraliaWorldChunkManager.java (renamed from src/Java/gtPlusPlus/australia/world/AustraliaWorldChunkManager.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/australia/world/AustraliaWorldGenerator.java (renamed from src/Java/gtPlusPlus/australia/world/AustraliaWorldGenerator.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/australia/world/AustraliaWorldProvider.java (renamed from src/Java/gtPlusPlus/australia/world/AustraliaWorldProvider.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/australia/world/AustraliaWorldType.java (renamed from src/Java/gtPlusPlus/australia/world/AustraliaWorldType.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/block/ModBlocks.java (renamed from src/Java/gtPlusPlus/core/block/ModBlocks.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/block/base/AdvancedBlock.java (renamed from src/Java/gtPlusPlus/core/block/base/AdvancedBlock.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/block/base/BasicBlock.java (renamed from src/Java/gtPlusPlus/core/block/base/BasicBlock.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java (renamed from src/Java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/block/base/BlockBaseFluid.java (renamed from src/Java/gtPlusPlus/core/block/base/BlockBaseFluid.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/block/base/BlockBaseModular.java (renamed from src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/block/base/BlockBaseNBT.java (renamed from src/Java/gtPlusPlus/core/block/base/BlockBaseNBT.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java (renamed from src/Java/gtPlusPlus/core/block/base/BlockBaseOre.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/block/base/MetaBlock.java (renamed from src/Java/gtPlusPlus/core/block/base/MetaBlock.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/block/base/MultiTextureBlock.java (renamed from src/Java/gtPlusPlus/core/block/base/MultiTextureBlock.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/block/general/BlockCompressedObsidian.java (renamed from src/Java/gtPlusPlus/core/block/general/BlockCompressedObsidian.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/block/general/BlockNet.java (renamed from src/Java/gtPlusPlus/core/block/general/BlockNet.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java (renamed from src/Java/gtPlusPlus/core/block/general/BlockSuperLight.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/block/general/BlockTankXpConverter.java (renamed from src/Java/gtPlusPlus/core/block/general/BlockTankXpConverter.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/block/general/FirePit.java (renamed from src/Java/gtPlusPlus/core/block/general/FirePit.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/block/general/FluidTankInfinite.java (renamed from src/Java/gtPlusPlus/core/block/general/FluidTankInfinite.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/block/general/HellFire.java (renamed from src/Java/gtPlusPlus/core/block/general/HellFire.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/block/general/LightGlass.java (renamed from src/Java/gtPlusPlus/core/block/general/LightGlass.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/block/general/MiningExplosives.java (renamed from src/Java/gtPlusPlus/core/block/general/MiningExplosives.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/block/general/PlayerDoors.java (renamed from src/Java/gtPlusPlus/core/block/general/PlayerDoors.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/block/general/antigrief/BlockWitherProof.java (renamed from src/Java/gtPlusPlus/core/block/general/antigrief/BlockWitherProof.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/block/general/antigrief/TowerDevice.java (renamed from src/Java/gtPlusPlus/core/block/general/antigrief/TowerDevice.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/block/general/fluids/BlockFluidSludge.java (renamed from src/Java/gtPlusPlus/core/block/general/fluids/BlockFluidSludge.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstone.java (renamed from src/Java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstone.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstoneDetector.java (renamed from src/Java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstoneDetector.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstoneEmitter.java (renamed from src/Java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstoneEmitter.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstoneTest.java (renamed from src/Java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstoneTest.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/block/machine/BlockGtFrameBox.java (renamed from src/Java/gtPlusPlus/core/block/machine/BlockGtFrameBox.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/block/machine/CircuitProgrammer.java (renamed from src/Java/gtPlusPlus/core/block/machine/CircuitProgrammer.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/block/machine/DecayablesChest.java (renamed from src/Java/gtPlusPlus/core/block/machine/DecayablesChest.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/block/machine/EggBox.java (renamed from src/Java/gtPlusPlus/core/block/machine/EggBox.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/block/machine/FishTrap.java (renamed from src/Java/gtPlusPlus/core/block/machine/FishTrap.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/block/machine/HeliumGenerator.java (renamed from src/Java/gtPlusPlus/core/block/machine/HeliumGenerator.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/block/machine/Machine_ModularityTable.java (renamed from src/Java/gtPlusPlus/core/block/machine/Machine_ModularityTable.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/block/machine/Machine_PestKiller.java (renamed from src/Java/gtPlusPlus/core/block/machine/Machine_PestKiller.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/block/machine/Machine_PooCollector.java (renamed from src/Java/gtPlusPlus/core/block/machine/Machine_PooCollector.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/block/machine/Machine_ProjectTable.java (renamed from src/Java/gtPlusPlus/core/block/machine/Machine_ProjectTable.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/block/machine/Machine_RoundRobinator.java (renamed from src/Java/gtPlusPlus/core/block/machine/Machine_RoundRobinator.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/block/machine/Machine_SuperJukebox.java (renamed from src/Java/gtPlusPlus/core/block/machine/Machine_SuperJukebox.java) | 8 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/block/machine/Machine_TradeTable.java (renamed from src/Java/gtPlusPlus/core/block/machine/Machine_TradeTable.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/block/machine/Machine_WireiusDeletus.java (renamed from src/Java/gtPlusPlus/core/block/machine/Machine_WireiusDeletus.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/block/machine/Machine_Workbench.java (renamed from src/Java/gtPlusPlus/core/block/machine/Machine_Workbench.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/block/machine/Machine_WorkbenchAdvanced.java (renamed from src/Java/gtPlusPlus/core/block/machine/Machine_WorkbenchAdvanced.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/block/machine/VolumetricFlaskSetter.java (renamed from src/Java/gtPlusPlus/core/block/machine/VolumetricFlaskSetter.java) | 7 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/block/machine/bedrock/Mining_Head_Fake.java (renamed from src/Java/gtPlusPlus/core/block/machine/bedrock/Mining_Head_Fake.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/block/machine/bedrock/Mining_Pipe_Fake.java (renamed from src/Java/gtPlusPlus/core/block/machine/bedrock/Mining_Pipe_Fake.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/chunkloading/GTPP_ChunkManager.java (renamed from src/Java/gtPlusPlus/core/chunkloading/GTPP_ChunkManager.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/chunkloading/StaticChunkFunctions.java (renamed from src/Java/gtPlusPlus/core/chunkloading/StaticChunkFunctions.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/client/CustomTextureSet.java (renamed from src/Java/gtPlusPlus/core/client/CustomTextureSet.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/client/model/ModelBatKing.java (renamed from src/Java/gtPlusPlus/core/client/model/ModelBatKing.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/client/model/ModelDecayChest.java (renamed from src/Java/gtPlusPlus/core/client/model/ModelDecayChest.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/client/model/ModelEggBox.java (renamed from src/Java/gtPlusPlus/core/client/model/ModelEggBox.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/client/model/ModelGiantChicken.java (renamed from src/Java/gtPlusPlus/core/client/model/ModelGiantChicken.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/client/model/ModelSickBlaze.java (renamed from src/Java/gtPlusPlus/core/client/model/ModelSickBlaze.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/client/model/ModelStaballoyConstruct.java (renamed from src/Java/gtPlusPlus/core/client/model/ModelStaballoyConstruct.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/client/model/tabula/ModelTabulaBase.java (renamed from src/Java/gtPlusPlus/core/client/model/tabula/ModelTabulaBase.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/client/renderer/CustomItemBlockRenderer.java (renamed from src/Java/gtPlusPlus/core/client/renderer/CustomItemBlockRenderer.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/client/renderer/CustomOreBlockRenderer.java (renamed from src/Java/gtPlusPlus/core/client/renderer/CustomOreBlockRenderer.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/client/renderer/RenderBatKing.java (renamed from src/Java/gtPlusPlus/core/client/renderer/RenderBatKing.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/client/renderer/RenderDecayChest.java (renamed from src/Java/gtPlusPlus/core/client/renderer/RenderDecayChest.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/client/renderer/RenderGiantChicken.java (renamed from src/Java/gtPlusPlus/core/client/renderer/RenderGiantChicken.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/client/renderer/RenderMiningExplosivesPrimed.java (renamed from src/Java/gtPlusPlus/core/client/renderer/RenderMiningExplosivesPrimed.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/client/renderer/RenderPlasmaBolt.java (renamed from src/Java/gtPlusPlus/core/client/renderer/RenderPlasmaBolt.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/client/renderer/RenderPotionthrow.java (renamed from src/Java/gtPlusPlus/core/client/renderer/RenderPotionthrow.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/client/renderer/RenderSickBlaze.java (renamed from src/Java/gtPlusPlus/core/client/renderer/RenderSickBlaze.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/client/renderer/RenderStaballoyConstruct.java (renamed from src/Java/gtPlusPlus/core/client/renderer/RenderStaballoyConstruct.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/client/renderer/RenderToxinball.java (renamed from src/Java/gtPlusPlus/core/client/renderer/RenderToxinball.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/client/renderer/particle/EntityDropParticleFX.java (renamed from src/Java/gtPlusPlus/core/client/renderer/particle/EntityDropParticleFX.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/client/renderer/tabula/RenderTabulaBase.java (renamed from src/Java/gtPlusPlus/core/client/renderer/tabula/RenderTabulaBase.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/commands/CommandDebugChunks.java (renamed from src/Java/gtPlusPlus/core/commands/CommandDebugChunks.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java (renamed from src/Java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java) | 30 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/commands/CommandMath.java (renamed from src/Java/gtPlusPlus/core/commands/CommandMath.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/commands/CommandUtils.java (renamed from src/Java/gtPlusPlus/core/commands/CommandUtils.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/common/BasePlayer.java (renamed from src/Java/gtPlusPlus/core/common/BasePlayer.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/common/CommonProxy.java (renamed from src/Java/gtPlusPlus/core/common/CommonProxy.java) | 19 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/common/compat/COMPAT_Baubles.java (renamed from src/Java/gtPlusPlus/core/common/compat/COMPAT_Baubles.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/common/compat/COMPAT_BigReactors.java (renamed from src/Java/gtPlusPlus/core/common/compat/COMPAT_BigReactors.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/common/compat/COMPAT_CompactWindmills.java (renamed from src/Java/gtPlusPlus/core/common/compat/COMPAT_CompactWindmills.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/common/compat/COMPAT_EnderIO.java (renamed from src/Java/gtPlusPlus/core/common/compat/COMPAT_EnderIO.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/common/compat/COMPAT_ExtraUtils.java (renamed from src/Java/gtPlusPlus/core/common/compat/COMPAT_ExtraUtils.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/common/compat/COMPAT_HarvestCraft.java (renamed from src/Java/gtPlusPlus/core/common/compat/COMPAT_HarvestCraft.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/common/compat/COMPAT_IC2.java (renamed from src/Java/gtPlusPlus/core/common/compat/COMPAT_IC2.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/common/compat/COMPAT_MorePlanets.java (renamed from src/Java/gtPlusPlus/core/common/compat/COMPAT_MorePlanets.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/common/compat/COMPAT_OpenBlocks.java (renamed from src/Java/gtPlusPlus/core/common/compat/COMPAT_OpenBlocks.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/common/compat/COMPAT_PlayerAPI.java (renamed from src/Java/gtPlusPlus/core/common/compat/COMPAT_PlayerAPI.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/common/compat/COMPAT_PneumaticCraft.java (renamed from src/Java/gtPlusPlus/core/common/compat/COMPAT_PneumaticCraft.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/common/compat/COMPAT_RFTools.java (renamed from src/Java/gtPlusPlus/core/common/compat/COMPAT_RFTools.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/common/compat/COMPAT_Railcraft.java (renamed from src/Java/gtPlusPlus/core/common/compat/COMPAT_Railcraft.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/common/compat/COMPAT_SimplyJetpacks.java (renamed from src/Java/gtPlusPlus/core/common/compat/COMPAT_SimplyJetpacks.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/common/compat/COMPAT_Thaumcraft.java (renamed from src/Java/gtPlusPlus/core/common/compat/COMPAT_Thaumcraft.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/common/compat/COMPAT_Witchery.java (renamed from src/Java/gtPlusPlus/core/common/compat/COMPAT_Witchery.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/config/ConfigHandler.java (renamed from src/Java/gtPlusPlus/core/config/ConfigHandler.java) | 4 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/container/Container_BackpackBase.java (renamed from src/Java/gtPlusPlus/core/container/Container_BackpackBase.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/container/Container_CircuitProgrammer.java (renamed from src/Java/gtPlusPlus/core/container/Container_CircuitProgrammer.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/container/Container_DecayablesChest.java (renamed from src/Java/gtPlusPlus/core/container/Container_DecayablesChest.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/container/Container_EggBox.java (renamed from src/Java/gtPlusPlus/core/container/Container_EggBox.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/container/Container_FishTrap.java (renamed from src/Java/gtPlusPlus/core/container/Container_FishTrap.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/container/Container_Grindle.java (renamed from src/Java/gtPlusPlus/core/container/Container_Grindle.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/container/Container_HeliumGenerator.java (renamed from src/Java/gtPlusPlus/core/container/Container_HeliumGenerator.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/container/Container_ModularityTable.java (renamed from src/Java/gtPlusPlus/core/container/Container_ModularityTable.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/container/Container_PestKiller.java (renamed from src/Java/gtPlusPlus/core/container/Container_PestKiller.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/container/Container_ProjectTable.java (renamed from src/Java/gtPlusPlus/core/container/Container_ProjectTable.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/container/Container_RoundRobinator.java (renamed from src/Java/gtPlusPlus/core/container/Container_RoundRobinator.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/container/Container_SuperJukebox.java (renamed from src/Java/gtPlusPlus/core/container/Container_SuperJukebox.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/container/Container_TradeTable.java (renamed from src/Java/gtPlusPlus/core/container/Container_TradeTable.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/container/Container_VolumetricFlaskSetter.java (renamed from src/Java/gtPlusPlus/core/container/Container_VolumetricFlaskSetter.java) | 9 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/container/Container_Workbench.java (renamed from src/Java/gtPlusPlus/core/container/Container_Workbench.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/container/Container_WorkbenchAdvanced.java (renamed from src/Java/gtPlusPlus/core/container/Container_WorkbenchAdvanced.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/container/box/LunchBoxContainer.java (renamed from src/Java/gtPlusPlus/core/container/box/LunchBoxContainer.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/container/box/MagicBagContainer.java (renamed from src/Java/gtPlusPlus/core/container/box/MagicBagContainer.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/container/box/ToolBoxContainer.java (renamed from src/Java/gtPlusPlus/core/container/box/ToolBoxContainer.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/creative/AddToCreativeTab.java (renamed from src/Java/gtPlusPlus/core/creative/AddToCreativeTab.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabBlock.java (renamed from src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabBlock.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMachines.java (renamed from src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMachines.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMisc.java (renamed from src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMisc.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabOther.java (renamed from src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabOther.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabTools.java (renamed from src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabTools.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/entity/EntityPrimedMiningExplosive.java (renamed from src/Java/gtPlusPlus/core/entity/EntityPrimedMiningExplosive.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/entity/EntityTeleportFX.java (renamed from src/Java/gtPlusPlus/core/entity/EntityTeleportFX.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/entity/EntityTeslaTowerLightning.java (renamed from src/Java/gtPlusPlus/core/entity/EntityTeslaTowerLightning.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/entity/InternalEntityRegistry.java (renamed from src/Java/gtPlusPlus/core/entity/InternalEntityRegistry.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/entity/ai/batking/EntityAIBatKingAttack.java (renamed from src/Java/gtPlusPlus/core/entity/ai/batking/EntityAIBatKingAttack.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/entity/item/ItemEntityGiantEgg.java (renamed from src/Java/gtPlusPlus/core/entity/item/ItemEntityGiantEgg.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/entity/monster/EntityBatKing.java (renamed from src/Java/gtPlusPlus/core/entity/monster/EntityBatKing.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/entity/monster/EntityGiantChickenBase.java (renamed from src/Java/gtPlusPlus/core/entity/monster/EntityGiantChickenBase.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/entity/monster/EntitySickBlaze.java (renamed from src/Java/gtPlusPlus/core/entity/monster/EntitySickBlaze.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/entity/monster/EntityStaballoyConstruct.java (renamed from src/Java/gtPlusPlus/core/entity/monster/EntityStaballoyConstruct.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/entity/projectile/EntityHydrofluoricAcidPotion.java (renamed from src/Java/gtPlusPlus/core/entity/projectile/EntityHydrofluoricAcidPotion.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/entity/projectile/EntityLightningAttack.java (renamed from src/Java/gtPlusPlus/core/entity/projectile/EntityLightningAttack.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/entity/projectile/EntitySulfuricAcidPotion.java (renamed from src/Java/gtPlusPlus/core/entity/projectile/EntitySulfuricAcidPotion.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/entity/projectile/EntityThrowableBomb.java (renamed from src/Java/gtPlusPlus/core/entity/projectile/EntityThrowableBomb.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/entity/projectile/EntityToxinball.java (renamed from src/Java/gtPlusPlus/core/entity/projectile/EntityToxinball.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/entity/projectile/EntityToxinballSmall.java (renamed from src/Java/gtPlusPlus/core/entity/projectile/EntityToxinballSmall.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/fluids/BlockFluidBase.java (renamed from src/Java/gtPlusPlus/core/fluids/BlockFluidBase.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/fluids/FactoryFluid.java (renamed from src/Java/gtPlusPlus/core/fluids/FactoryFluid.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/fluids/FluidFactory.java (renamed from src/Java/gtPlusPlus/core/fluids/FluidFactory.java) | 5 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/fluids/FluidPackage.java (renamed from src/Java/gtPlusPlus/core/fluids/FluidPackage.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/fluids/FluidRegistryHandler.java (renamed from src/Java/gtPlusPlus/core/fluids/FluidRegistryHandler.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/fluids/ItemGenericFluidBucket.java (renamed from src/Java/gtPlusPlus/core/fluids/ItemGenericFluidBucket.java) | 3 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/gui/GUI_Base_Tile_Entity.java (renamed from src/Java/gtPlusPlus/core/gui/GUI_Base_Tile_Entity.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/gui/beta/Gui_ID_Registry.java (renamed from src/Java/gtPlusPlus/core/gui/beta/Gui_ID_Registry.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/gui/beta/Gui_Types.java (renamed from src/Java/gtPlusPlus/core/gui/beta/Gui_Types.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/gui/beta/MU_GuiId.java (renamed from src/Java/gtPlusPlus/core/gui/beta/MU_GuiId.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/gui/item/GuiBaseBackpack.java (renamed from src/Java/gtPlusPlus/core/gui/item/GuiBaseBackpack.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/gui/item/GuiBaseGrindle.java (renamed from src/Java/gtPlusPlus/core/gui/item/GuiBaseGrindle.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/gui/item/GuiScreenGrindle.java (renamed from src/Java/gtPlusPlus/core/gui/item/GuiScreenGrindle.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/gui/item/box/GuiBaseBox.java (renamed from src/Java/gtPlusPlus/core/gui/item/box/GuiBaseBox.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/gui/item/box/LunchBoxGui.java (renamed from src/Java/gtPlusPlus/core/gui/item/box/LunchBoxGui.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/gui/item/box/MagicBagGui.java (renamed from src/Java/gtPlusPlus/core/gui/item/box/MagicBagGui.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/gui/item/box/ToolBoxGui.java (renamed from src/Java/gtPlusPlus/core/gui/item/box/ToolBoxGui.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/gui/machine/GUI_CircuitProgrammer.java (renamed from src/Java/gtPlusPlus/core/gui/machine/GUI_CircuitProgrammer.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/gui/machine/GUI_DecayablesChest.java (renamed from src/Java/gtPlusPlus/core/gui/machine/GUI_DecayablesChest.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/gui/machine/GUI_EggBox.java (renamed from src/Java/gtPlusPlus/core/gui/machine/GUI_EggBox.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/gui/machine/GUI_FishTrap.java (renamed from src/Java/gtPlusPlus/core/gui/machine/GUI_FishTrap.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/gui/machine/GUI_HeliumGenerator.java (renamed from src/Java/gtPlusPlus/core/gui/machine/GUI_HeliumGenerator.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/gui/machine/GUI_ModularityTable.java (renamed from src/Java/gtPlusPlus/core/gui/machine/GUI_ModularityTable.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/gui/machine/GUI_PestKiller.java (renamed from src/Java/gtPlusPlus/core/gui/machine/GUI_PestKiller.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/gui/machine/GUI_ProjectTable.java (renamed from src/Java/gtPlusPlus/core/gui/machine/GUI_ProjectTable.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/gui/machine/GUI_RoundRobinator.java (renamed from src/Java/gtPlusPlus/core/gui/machine/GUI_RoundRobinator.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/gui/machine/GUI_ScrollTest.java (renamed from src/Java/gtPlusPlus/core/gui/machine/GUI_ScrollTest.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/gui/machine/GUI_SuperJukebox.java (renamed from src/Java/gtPlusPlus/core/gui/machine/GUI_SuperJukebox.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/gui/machine/GUI_TradeTable.java (renamed from src/Java/gtPlusPlus/core/gui/machine/GUI_TradeTable.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/gui/machine/GUI_VolumetricFlaskSetter.java | 274 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/gui/machine/GUI_Workbench.java (renamed from src/Java/gtPlusPlus/core/gui/machine/GUI_Workbench.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/gui/machine/GUI_WorkbenchAdvanced.java (renamed from src/Java/gtPlusPlus/core/gui/machine/GUI_WorkbenchAdvanced.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/gui/widget/GuiValueField.java | 98 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/handler/AchievementHandler.java (renamed from src/Java/gtPlusPlus/core/handler/AchievementHandler.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/handler/BookHandler.java (renamed from src/Java/gtPlusPlus/core/handler/BookHandler.java) | 30 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/handler/BurnableFuelHandler.java (renamed from src/Java/gtPlusPlus/core/handler/BurnableFuelHandler.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java (renamed from src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java) | 8 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java (renamed from src/Java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/handler/CraftingManager.java (renamed from src/Java/gtPlusPlus/core/handler/CraftingManager.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/handler/EnumHelperHandler.java (renamed from src/Java/gtPlusPlus/core/handler/EnumHelperHandler.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/handler/GuiHandler.java (renamed from src/Java/gtPlusPlus/core/handler/GuiHandler.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/handler/OldCircuitHandler.java (renamed from src/Java/gtPlusPlus/core/handler/OldCircuitHandler.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/handler/PacketHandler.java (renamed from src/Java/gtPlusPlus/core/handler/PacketHandler.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/handler/Recipes/DecayableRecipe.java (renamed from src/Java/gtPlusPlus/core/handler/Recipes/DecayableRecipe.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/handler/Recipes/LateRegistrationHandler.java (renamed from src/Java/gtPlusPlus/core/handler/Recipes/LateRegistrationHandler.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/handler/Recipes/RegistrationHandler.java (renamed from src/Java/gtPlusPlus/core/handler/Recipes/RegistrationHandler.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/handler/StopAnnoyingFuckingAchievements.java (renamed from src/Java/gtPlusPlus/core/handler/StopAnnoyingFuckingAchievements.java) | 2 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/handler/events/BlockEventHandler.java (renamed from src/Java/gtPlusPlus/core/handler/events/BlockEventHandler.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/handler/events/CustomMovementHandler.java (renamed from src/Java/gtPlusPlus/core/handler/events/CustomMovementHandler.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/handler/events/EnderDragonDeathHandler.java (renamed from src/Java/gtPlusPlus/core/handler/events/EnderDragonDeathHandler.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/handler/events/EntityDeathHandler.java (renamed from src/Java/gtPlusPlus/core/handler/events/EntityDeathHandler.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/handler/events/GeneralTooltipEventHandler.java (renamed from src/Java/gtPlusPlus/core/handler/events/GeneralTooltipEventHandler.java) | 16 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/handler/events/LoginEventHandler.java (renamed from src/Java/gtPlusPlus/core/handler/events/LoginEventHandler.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/handler/events/MissingMappingsEvent.java (renamed from src/Java/gtPlusPlus/core/handler/events/MissingMappingsEvent.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/handler/events/PickaxeBlockBreakEventHandler.java (renamed from src/Java/gtPlusPlus/core/handler/events/PickaxeBlockBreakEventHandler.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/handler/events/PlayerTickHandler.java (renamed from src/Java/gtPlusPlus/core/handler/events/PlayerTickHandler.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/handler/events/SneakManager.java (renamed from src/Java/gtPlusPlus/core/handler/events/SneakManager.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/handler/events/UnbreakableBlockManager.java (renamed from src/Java/gtPlusPlus/core/handler/events/UnbreakableBlockManager.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/handler/events/ZombieBackupSpawnEventHandler.java (renamed from src/Java/gtPlusPlus/core/handler/events/ZombieBackupSpawnEventHandler.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/handler/render/CapeHandler.java (renamed from src/Java/gtPlusPlus/core/handler/render/CapeHandler.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/handler/render/FirepitModel.java (renamed from src/Java/gtPlusPlus/core/handler/render/FirepitModel.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/handler/render/FirepitRender.java (renamed from src/Java/gtPlusPlus/core/handler/render/FirepitRender.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/handler/workbench/Workbench_CraftingHandler.java (renamed from src/Java/gtPlusPlus/core/handler/workbench/Workbench_CraftingHandler.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/handler/workbench/Workbench_RecipeSorter.java (renamed from src/Java/gtPlusPlus/core/handler/workbench/Workbench_RecipeSorter.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/interfaces/IGuiManager.java (renamed from src/Java/gtPlusPlus/core/interfaces/IGuiManager.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/interfaces/IGuiManagerMiscUtils.java (renamed from src/Java/gtPlusPlus/core/interfaces/IGuiManagerMiscUtils.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/interfaces/IItemBlueprint.java (renamed from src/Java/gtPlusPlus/core/interfaces/IItemBlueprint.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/inventories/BaseInventoryBackpack.java (renamed from src/Java/gtPlusPlus/core/inventories/BaseInventoryBackpack.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/inventories/BaseInventoryGrindle.java (renamed from src/Java/gtPlusPlus/core/inventories/BaseInventoryGrindle.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/inventories/InventoryCircuitProgrammer.java (renamed from src/Java/gtPlusPlus/core/inventories/InventoryCircuitProgrammer.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/inventories/InventoryFishTrap.java (renamed from src/Java/gtPlusPlus/core/inventories/InventoryFishTrap.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/inventories/InventoryHeliumGenerator.java (renamed from src/Java/gtPlusPlus/core/inventories/InventoryHeliumGenerator.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/inventories/InventoryPestKiller.java (renamed from src/Java/gtPlusPlus/core/inventories/InventoryPestKiller.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/inventories/InventoryWorkbenchChest.java (renamed from src/Java/gtPlusPlus/core/inventories/InventoryWorkbenchChest.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/inventories/InventoryWorkbenchCrafting.java (renamed from src/Java/gtPlusPlus/core/inventories/InventoryWorkbenchCrafting.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/inventories/InventoryWorkbenchHoloCrafting.java (renamed from src/Java/gtPlusPlus/core/inventories/InventoryWorkbenchHoloCrafting.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/inventories/InventoryWorkbenchHoloSlots.java (renamed from src/Java/gtPlusPlus/core/inventories/InventoryWorkbenchHoloSlots.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/inventories/InventoryWorkbenchTools.java (renamed from src/Java/gtPlusPlus/core/inventories/InventoryWorkbenchTools.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/inventories/InventoryWorkbenchToolsElectric.java (renamed from src/Java/gtPlusPlus/core/inventories/InventoryWorkbenchToolsElectric.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/inventories/Inventory_DecayablesChest.java (renamed from src/Java/gtPlusPlus/core/inventories/Inventory_DecayablesChest.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/inventories/Inventory_EggBox.java (renamed from src/Java/gtPlusPlus/core/inventories/Inventory_EggBox.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/inventories/Inventory_RoundRobinator.java (renamed from src/Java/gtPlusPlus/core/inventories/Inventory_RoundRobinator.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/inventories/Inventory_SuperJukebox.java (renamed from src/Java/gtPlusPlus/core/inventories/Inventory_SuperJukebox.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/inventories/Inventory_VolumetricFlaskSetter.java (renamed from src/Java/gtPlusPlus/core/inventories/Inventory_VolumetricFlaskSetter.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/inventories/box/LunchBoxInventory.java (renamed from src/Java/gtPlusPlus/core/inventories/box/LunchBoxInventory.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/inventories/box/MagicBagInventory.java (renamed from src/Java/gtPlusPlus/core/inventories/box/MagicBagInventory.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/inventories/box/ToolBoxInventory.java (renamed from src/Java/gtPlusPlus/core/inventories/box/ToolBoxInventory.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/inventories/modulartable/InventoryModularMain.java (renamed from src/Java/gtPlusPlus/core/inventories/modulartable/InventoryModularMain.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/inventories/modulartable/InventoryModularOutput.java (renamed from src/Java/gtPlusPlus/core/inventories/modulartable/InventoryModularOutput.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/inventories/projecttable/InventoryProjectMain.java (renamed from src/Java/gtPlusPlus/core/inventories/projecttable/InventoryProjectMain.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/inventories/projecttable/InventoryProjectOutput.java (renamed from src/Java/gtPlusPlus/core/inventories/projecttable/InventoryProjectOutput.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/inventories/tradetable/InventoryTradeMain.java (renamed from src/Java/gtPlusPlus/core/inventories/tradetable/InventoryTradeMain.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/inventories/tradetable/InventoryTradeOutput.java (renamed from src/Java/gtPlusPlus/core/inventories/tradetable/InventoryTradeOutput.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/ModItems.java (renamed from src/Java/gtPlusPlus/core/item/ModItems.java) | 114 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/base/BaseEuItem.java (renamed from src/Java/gtPlusPlus/core/item/base/BaseEuItem.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/base/BaseItemBackpack.java (renamed from src/Java/gtPlusPlus/core/item/base/BaseItemBackpack.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/base/BaseItemBrain.java (renamed from src/Java/gtPlusPlus/core/item/base/BaseItemBrain.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/base/BaseItemBurnable.java (renamed from src/Java/gtPlusPlus/core/item/base/BaseItemBurnable.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/base/BaseItemColourable.java (renamed from src/Java/gtPlusPlus/core/item/base/BaseItemColourable.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java (renamed from src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java) | 16 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/base/BaseItemDamageable.java (renamed from src/Java/gtPlusPlus/core/item/base/BaseItemDamageable.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/base/BaseItemGeneric.java (renamed from src/Java/gtPlusPlus/core/item/base/BaseItemGeneric.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/base/BaseItemLoot.java (renamed from src/Java/gtPlusPlus/core/item/base/BaseItemLoot.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/base/BaseItemTCShard.java (renamed from src/Java/gtPlusPlus/core/item/base/BaseItemTCShard.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/base/BaseItemTickable.java (renamed from src/Java/gtPlusPlus/core/item/base/BaseItemTickable.java) | 1 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/base/BaseItemWithCharge.java (renamed from src/Java/gtPlusPlus/core/item/base/BaseItemWithCharge.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/base/BaseItemWithDamageValue.java (renamed from src/Java/gtPlusPlus/core/item/base/BaseItemWithDamageValue.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/base/BasicSpawnEgg.java (renamed from src/Java/gtPlusPlus/core/item/base/BasicSpawnEgg.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/base/CoreItem.java (renamed from src/Java/gtPlusPlus/core/item/base/CoreItem.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/base/bolts/BaseItemBolt.java (renamed from src/Java/gtPlusPlus/core/item/base/bolts/BaseItemBolt.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/base/cell/BaseItemCell.java (renamed from src/Java/gtPlusPlus/core/item/base/cell/BaseItemCell.java) | 6 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/base/cell/BaseItemPlasmaCell.java (renamed from src/Java/gtPlusPlus/core/item/base/cell/BaseItemPlasmaCell.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java (renamed from src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustAbstract.java (renamed from src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustAbstract.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustEx.java (renamed from src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustEx.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java (renamed from src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/base/dusts/decimal/BaseItemCentidust.java (renamed from src/Java/gtPlusPlus/core/item/base/dusts/decimal/BaseItemCentidust.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/base/dusts/decimal/BaseItemDecidust.java (renamed from src/Java/gtPlusPlus/core/item/base/dusts/decimal/BaseItemDecidust.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/base/foil/BaseItemFoil.java (renamed from src/Java/gtPlusPlus/core/item/base/foil/BaseItemFoil.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/base/foods/BaseItemFood.java (renamed from src/Java/gtPlusPlus/core/item/base/foods/BaseItemFood.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/base/foods/BaseItemHotFood.java (renamed from src/Java/gtPlusPlus/core/item/base/foods/BaseItemHotFood.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/base/gears/BaseItemGear.java (renamed from src/Java/gtPlusPlus/core/item/base/gears/BaseItemGear.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/base/gears/BaseItemSmallGear.java (renamed from src/Java/gtPlusPlus/core/item/base/gears/BaseItemSmallGear.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngot.java (renamed from src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngot.java) | 17 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java (renamed from src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java) | 4 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngot_OLD.java (renamed from src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngot_OLD.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/base/itemblock/FluidItemBlock.java (renamed from src/Java/gtPlusPlus/core/item/base/itemblock/FluidItemBlock.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockBasicTile.java (renamed from src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockBasicTile.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockDoor.java (renamed from src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockDoor.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockEntityBase.java (renamed from src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockEntityBase.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java (renamed from src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtFrameBox.java (renamed from src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtFrameBox.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockMeta.java (renamed from src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockMeta.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockNBT.java (renamed from src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockNBT.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java (renamed from src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockRoundRobinator.java (renamed from src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockRoundRobinator.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockSpawner.java (renamed from src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockSpawner.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/base/misc/BaseItemMisc.java (renamed from src/Java/gtPlusPlus/core/item/base/misc/BaseItemMisc.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/base/misc/BaseItemParticle.java (renamed from src/Java/gtPlusPlus/core/item/base/misc/BaseItemParticle.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/base/nugget/BaseItemNugget.java (renamed from src/Java/gtPlusPlus/core/item/base/nugget/BaseItemNugget.java) | 1 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/base/ore/BaseItemCentrifugedCrushedOre.java (renamed from src/Java/gtPlusPlus/core/item/base/ore/BaseItemCentrifugedCrushedOre.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/base/ore/BaseItemCrushedOre.java (renamed from src/Java/gtPlusPlus/core/item/base/ore/BaseItemCrushedOre.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/base/ore/BaseItemImpureDust.java (renamed from src/Java/gtPlusPlus/core/item/base/ore/BaseItemImpureDust.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/base/ore/BaseItemMilledOre.java (renamed from src/Java/gtPlusPlus/core/item/base/ore/BaseItemMilledOre.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/base/ore/BaseItemPurifiedCrushedOre.java (renamed from src/Java/gtPlusPlus/core/item/base/ore/BaseItemPurifiedCrushedOre.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/base/ore/BaseItemPurifiedDust.java (renamed from src/Java/gtPlusPlus/core/item/base/ore/BaseItemPurifiedDust.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java (renamed from src/Java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java) | 11 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/base/plates/BaseItemPlate.java (renamed from src/Java/gtPlusPlus/core/item/base/plates/BaseItemPlate.java) | 2 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/base/plates/BaseItemPlateDouble.java (renamed from src/Java/gtPlusPlus/core/item/base/plates/BaseItemPlateDouble.java) | 1 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/base/plates/BaseItemPlateHeavy.java (renamed from src/Java/gtPlusPlus/core/item/base/plates/BaseItemPlateHeavy.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/base/plates/BaseItemPlate_OLD.java (renamed from src/Java/gtPlusPlus/core/item/base/plates/BaseItemPlate_OLD.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/base/rings/BaseItemRing.java (renamed from src/Java/gtPlusPlus/core/item/base/rings/BaseItemRing.java) | 1 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/base/rods/BaseItemRod.java | 12 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/base/rods/BaseItemRodLong.java | 18 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/base/rotors/BaseItemRotor.java (renamed from src/Java/gtPlusPlus/core/item/base/rotors/BaseItemRotor.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/base/screws/BaseItemScrew.java | 12 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/bauble/BaseBauble.java (renamed from src/Java/gtPlusPlus/core/item/bauble/BaseBauble.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/bauble/BatteryPackBaseBauble.java (renamed from src/Java/gtPlusPlus/core/item/bauble/BatteryPackBaseBauble.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/bauble/ElectricBaseBauble.java (renamed from src/Java/gtPlusPlus/core/item/bauble/ElectricBaseBauble.java) | 2 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/bauble/FireProtectionBauble.java (renamed from src/Java/gtPlusPlus/core/item/bauble/FireProtectionBauble.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/bauble/HealthBoostBauble.java (renamed from src/Java/gtPlusPlus/core/item/bauble/HealthBoostBauble.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/bauble/ModularBauble.java (renamed from src/Java/gtPlusPlus/core/item/bauble/ModularBauble.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/bauble/MonsterKillerBaseBauble.java (renamed from src/Java/gtPlusPlus/core/item/bauble/MonsterKillerBaseBauble.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java (renamed from src/Java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java) | 4 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/chemistry/CoalTar.java (renamed from src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java) | 45 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java (renamed from src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java) | 72 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/chemistry/IonParticles.java (renamed from src/Java/gtPlusPlus/core/item/chemistry/IonParticles.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java (renamed from src/Java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java) | 46 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/chemistry/NuclearChem.java (renamed from src/Java/gtPlusPlus/core/item/chemistry/NuclearChem.java) | 64 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/chemistry/OilChem.java (renamed from src/Java/gtPlusPlus/core/item/chemistry/OilChem.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/chemistry/RocketFuels.java (renamed from src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java) | 49 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/chemistry/StandardBaseParticles.java (renamed from src/Java/gtPlusPlus/core/item/chemistry/StandardBaseParticles.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java (renamed from src/Java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java) | 3 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/chemistry/general/ItemNuclearChemBase.java | 152 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/circuit/ItemAdvancedChip.java (renamed from src/Java/gtPlusPlus/core/item/circuit/ItemAdvancedChip.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/crafting/ItemDummyResearch.java (renamed from src/Java/gtPlusPlus/core/item/crafting/ItemDummyResearch.java) | 3 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/effects/RarityEffect.java (renamed from src/Java/gtPlusPlus/core/item/effects/RarityEffect.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/effects/RarityEpic.java (renamed from src/Java/gtPlusPlus/core/item/effects/RarityEpic.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/effects/RarityRare.java (renamed from src/Java/gtPlusPlus/core/item/effects/RarityRare.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/effects/RarityUncommon.java (renamed from src/Java/gtPlusPlus/core/item/effects/RarityUncommon.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/food/BaseItemMetaFood.java (renamed from src/Java/gtPlusPlus/core/item/food/BaseItemMetaFood.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/general/BaseItemGrindle.java (renamed from src/Java/gtPlusPlus/core/item/general/BaseItemGrindle.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/general/BedLocator_Base.java (renamed from src/Java/gtPlusPlus/core/item/general/BedLocator_Base.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/general/BufferCore.java (renamed from src/Java/gtPlusPlus/core/item/general/BufferCore.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/general/ItemAirFilter.java (renamed from src/Java/gtPlusPlus/core/item/general/ItemAirFilter.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/general/ItemAreaClear.java (renamed from src/Java/gtPlusPlus/core/item/general/ItemAreaClear.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/general/ItemBasicFirestarter.java (renamed from src/Java/gtPlusPlus/core/item/general/ItemBasicFirestarter.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/general/ItemBasicScrubberTurbine.java (renamed from src/Java/gtPlusPlus/core/item/general/ItemBasicScrubberTurbine.java) | 12 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/general/ItemBlueprint.java (renamed from src/Java/gtPlusPlus/core/item/general/ItemBlueprint.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/general/ItemCloakingDevice.java (renamed from src/Java/gtPlusPlus/core/item/general/ItemCloakingDevice.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/general/ItemControlCore.java (renamed from src/Java/gtPlusPlus/core/item/general/ItemControlCore.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/general/ItemCreativeTab.java (renamed from src/Java/gtPlusPlus/core/item/general/ItemCreativeTab.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/general/ItemEmpty.java (renamed from src/Java/gtPlusPlus/core/item/general/ItemEmpty.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/general/ItemGemShards.java (renamed from src/Java/gtPlusPlus/core/item/general/ItemGemShards.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/general/ItemGenericToken.java (renamed from src/Java/gtPlusPlus/core/item/general/ItemGenericToken.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/general/ItemGiantEgg.java (renamed from src/Java/gtPlusPlus/core/item/general/ItemGiantEgg.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/general/ItemHalfCompleteCasings.java (renamed from src/Java/gtPlusPlus/core/item/general/ItemHalfCompleteCasings.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/general/ItemHealingDevice.java (renamed from src/Java/gtPlusPlus/core/item/general/ItemHealingDevice.java) | 2 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/general/ItemLavaFilter.java (renamed from src/Java/gtPlusPlus/core/item/general/ItemLavaFilter.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/general/ItemSlowBuildingRing.java (renamed from src/Java/gtPlusPlus/core/item/general/ItemSlowBuildingRing.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/general/NuclearFuelRodBase.java (renamed from src/Java/gtPlusPlus/core/item/general/NuclearFuelRodBase.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/general/RF2EU_Battery.java (renamed from src/Java/gtPlusPlus/core/item/general/RF2EU_Battery.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/general/books/ItemBaseBook.java (renamed from src/Java/gtPlusPlus/core/item/general/books/ItemBaseBook.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/general/capture/ItemEntityCatcher.java (renamed from src/Java/gtPlusPlus/core/item/general/capture/ItemEntityCatcher.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/general/chassis/ItemBoilerChassis.java (renamed from src/Java/gtPlusPlus/core/item/general/chassis/ItemBoilerChassis.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoil.java (renamed from src/Java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoil.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoilWire.java (renamed from src/Java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoilWire.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/general/fuelrods/FuelRod_Base.java (renamed from src/Java/gtPlusPlus/core/item/general/fuelrods/FuelRod_Base.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/general/fuelrods/FuelRod_Thorium.java (renamed from src/Java/gtPlusPlus/core/item/general/fuelrods/FuelRod_Thorium.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/general/rfchargingpack/ChargingPackBase.java (renamed from src/Java/gtPlusPlus/core/item/general/rfchargingpack/ChargingPackBase.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/general/spawn/ItemCustomSpawnEgg.java (renamed from src/Java/gtPlusPlus/core/item/general/spawn/ItemCustomSpawnEgg.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/general/throwables/ItemHydrofluoricAcidPotion.java (renamed from src/Java/gtPlusPlus/core/item/general/throwables/ItemHydrofluoricAcidPotion.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/general/throwables/ItemSulfuricAcidPotion.java (renamed from src/Java/gtPlusPlus/core/item/general/throwables/ItemSulfuricAcidPotion.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/general/throwables/ItemThrowableBomb.java (renamed from src/Java/gtPlusPlus/core/item/general/throwables/ItemThrowableBomb.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/init/ItemsFoods.java (renamed from src/Java/gtPlusPlus/core/item/init/ItemsFoods.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/init/ItemsMultiTools.java (renamed from src/Java/gtPlusPlus/core/item/init/ItemsMultiTools.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/materials/DustDecayable.java (renamed from src/Java/gtPlusPlus/core/item/materials/DustDecayable.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/materials/MaterialHandler.java (renamed from src/Java/gtPlusPlus/core/item/materials/MaterialHandler.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/tool/misc/ConnectedBlockFinder.java (renamed from src/Java/gtPlusPlus/core/item/tool/misc/ConnectedBlockFinder.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/tool/misc/DebugScanner.java (renamed from src/Java/gtPlusPlus/core/item/tool/misc/DebugScanner.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/tool/misc/FakeGregtechTool.java (renamed from src/Java/gtPlusPlus/core/item/tool/misc/FakeGregtechTool.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/tool/misc/GregtechPump.java (renamed from src/Java/gtPlusPlus/core/item/tool/misc/GregtechPump.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/tool/misc/SandstoneHammer.java (renamed from src/Java/gtPlusPlus/core/item/tool/misc/SandstoneHammer.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/tool/misc/box/AutoLunchBox.java (renamed from src/Java/gtPlusPlus/core/item/tool/misc/box/AutoLunchBox.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/tool/misc/box/BaseBoxItem.java (renamed from src/Java/gtPlusPlus/core/item/tool/misc/box/BaseBoxItem.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/tool/misc/box/ContainerBoxBase.java (renamed from src/Java/gtPlusPlus/core/item/tool/misc/box/ContainerBoxBase.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/tool/misc/box/CustomBoxInventory.java (renamed from src/Java/gtPlusPlus/core/item/tool/misc/box/CustomBoxInventory.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/tool/misc/box/MagicToolBag.java (renamed from src/Java/gtPlusPlus/core/item/tool/misc/box/MagicToolBag.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/tool/misc/box/UniversalToolBox.java (renamed from src/Java/gtPlusPlus/core/item/tool/misc/box/UniversalToolBox.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java (renamed from src/Java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/tool/staballoy/MultiSpadeBase.java (renamed from src/Java/gtPlusPlus/core/item/tool/staballoy/MultiSpadeBase.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoyAxe.java (renamed from src/Java/gtPlusPlus/core/item/tool/staballoy/StaballoyAxe.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoyPickaxe.java (renamed from src/Java/gtPlusPlus/core/item/tool/staballoy/StaballoyPickaxe.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoySpade.java (renamed from src/Java/gtPlusPlus/core/item/tool/staballoy/StaballoySpade.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/wearable/WearableLoader.java (renamed from src/Java/gtPlusPlus/core/item/wearable/WearableLoader.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/wearable/armour/ArmourLoader.java (renamed from src/Java/gtPlusPlus/core/item/wearable/armour/ArmourLoader.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/wearable/armour/base/BaseArmour.java (renamed from src/Java/gtPlusPlus/core/item/wearable/armour/base/BaseArmour.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/wearable/armour/base/BaseArmourBoots.java (renamed from src/Java/gtPlusPlus/core/item/wearable/armour/base/BaseArmourBoots.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/wearable/armour/base/BaseArmourChest.java (renamed from src/Java/gtPlusPlus/core/item/wearable/armour/base/BaseArmourChest.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/wearable/armour/base/BaseArmourHelm.java (renamed from src/Java/gtPlusPlus/core/item/wearable/armour/base/BaseArmourHelm.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/wearable/armour/base/BaseArmourLegs.java (renamed from src/Java/gtPlusPlus/core/item/wearable/armour/base/BaseArmourLegs.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/wearable/armour/hazmat/ArmourHazmat.java (renamed from src/Java/gtPlusPlus/core/item/wearable/armour/hazmat/ArmourHazmat.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/wearable/armour/tinfoil/ArmourTinFoilHat.java (renamed from src/Java/gtPlusPlus/core/item/wearable/armour/tinfoil/ArmourTinFoilHat.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/wearable/base/BaseItemWearable.java (renamed from src/Java/gtPlusPlus/core/item/wearable/base/BaseItemWearable.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/item/wearable/hazmat/ItemArmorHazmatEx.java (renamed from src/Java/gtPlusPlus/core/item/wearable/hazmat/ItemArmorHazmatEx.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/lib/CORE.java (renamed from src/Java/gtPlusPlus/core/lib/CORE.java) | 22 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/lib/LoadedMods.java (renamed from src/Java/gtPlusPlus/core/lib/LoadedMods.java) | 6 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/lib/VanillaColours.java (renamed from src/Java/gtPlusPlus/core/lib/VanillaColours.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/material/ALLOY.java (renamed from src/Java/gtPlusPlus/core/material/ALLOY.java) | 40 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/material/ELEMENT.java (renamed from src/Java/gtPlusPlus/core/material/ELEMENT.java) | 23 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/material/Ion.java (renamed from src/Java/gtPlusPlus/core/material/Ion.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/material/MISC_MATERIALS.java (renamed from src/Java/gtPlusPlus/core/material/MISC_MATERIALS.java) | 40 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/material/Material.java (renamed from src/Java/gtPlusPlus/core/material/Material.java) | 163 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/material/MaterialGenerator.java (renamed from src/Java/gtPlusPlus/core/material/MaterialGenerator.java) | 132 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/material/MaterialStack.java (renamed from src/Java/gtPlusPlus/core/material/MaterialStack.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/material/NONMATERIAL.java (renamed from src/Java/gtPlusPlus/core/material/NONMATERIAL.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/material/ORES.java (renamed from src/Java/gtPlusPlus/core/material/ORES.java) | 889 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/material/Particle.java (renamed from src/Java/gtPlusPlus/core/material/Particle.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/material/gregtech/CustomGTMaterials.java (renamed from src/Java/gtPlusPlus/core/material/gregtech/CustomGTMaterials.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/material/nuclear/FLUORIDES.java (renamed from src/Java/gtPlusPlus/core/material/nuclear/FLUORIDES.java) | 18 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/material/nuclear/NUCLIDE.java | 376 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/material/state/MaterialState.java (renamed from src/Java/gtPlusPlus/core/material/state/MaterialState.java) | 3 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/network/handler/AbstractClientMessageHandler.java (renamed from src/Java/gtPlusPlus/core/network/handler/AbstractClientMessageHandler.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/network/handler/AbstractMessageHandler.java (renamed from src/Java/gtPlusPlus/core/network/handler/AbstractMessageHandler.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/network/handler/AbstractServerMessageHandler.java (renamed from src/Java/gtPlusPlus/core/network/handler/AbstractServerMessageHandler.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/network/packet/AbstractPacket.java (renamed from src/Java/gtPlusPlus/core/network/packet/AbstractPacket.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/network/packet/Packet_VolumetricFlaskGui.java (renamed from src/Java/gtPlusPlus/core/network/packet/Packet_VolumetricFlaskGui.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/network/packet/Packet_VolumetricFlaskGui2.java (renamed from src/Java/gtPlusPlus/core/network/packet/Packet_VolumetricFlaskGui2.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/players/FakeFarmer.java (renamed from src/Java/gtPlusPlus/core/players/FakeFarmer.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/proxy/ClientProxy.java (renamed from src/Java/gtPlusPlus/core/proxy/ClientProxy.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/proxy/ServerProxy.java (renamed from src/Java/gtPlusPlus/core/proxy/ServerProxy.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/recipe/Gregtech_Recipe_Adder.java (renamed from src/Java/gtPlusPlus/core/recipe/Gregtech_Recipe_Adder.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/recipe/LOADER_Machine_Components.java (renamed from src/Java/gtPlusPlus/core/recipe/LOADER_Machine_Components.java) | 27 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/recipe/RECIPES_Extruder.java (renamed from src/Java/gtPlusPlus/core/recipe/RECIPES_Extruder.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java (renamed from src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java) | 942 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java (renamed from src/Java/gtPlusPlus/core/recipe/RECIPES_General.java) | 12 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java (renamed from src/Java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/recipe/RECIPES_MTWRAPPER.java (renamed from src/Java/gtPlusPlus/core/recipe/RECIPES_MTWRAPPER.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java (renamed from src/Java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java (renamed from src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java) | 460 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/recipe/RECIPES_Old_Circuits.java (renamed from src/Java/gtPlusPlus/core/recipe/RECIPES_Old_Circuits.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/recipe/RECIPES_RareEarthProcessing.java (renamed from src/Java/gtPlusPlus/core/recipe/RECIPES_RareEarthProcessing.java) | 77 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/recipe/RECIPES_SeleniumProcessing.java | 222 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/recipe/RECIPES_Shapeless.java (renamed from src/Java/gtPlusPlus/core/recipe/RECIPES_Shapeless.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/recipe/RECIPES_Tools.java (renamed from src/Java/gtPlusPlus/core/recipe/RECIPES_Tools.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/recipe/RECIPE_Batteries.java (renamed from src/Java/gtPlusPlus/core/recipe/RECIPE_Batteries.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/recipe/ShapedRecipeObject.java (renamed from src/Java/gtPlusPlus/core/recipe/ShapedRecipeObject.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/recipe/common/CI.java (renamed from src/Java/gtPlusPlus/core/recipe/common/CI.java) | 53 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/slots/SlotAirFilter.java (renamed from src/Java/gtPlusPlus/core/slots/SlotAirFilter.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/slots/SlotBlueprint.java (renamed from src/Java/gtPlusPlus/core/slots/SlotBlueprint.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/slots/SlotBuzzSaw.java (renamed from src/Java/gtPlusPlus/core/slots/SlotBuzzSaw.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/slots/SlotChemicalPlantInput.java (renamed from src/Java/gtPlusPlus/core/slots/SlotChemicalPlantInput.java) | 4 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/slots/SlotCrafting.java (renamed from src/Java/gtPlusPlus/core/slots/SlotCrafting.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/slots/SlotCraftingNoCollect.java (renamed from src/Java/gtPlusPlus/core/slots/SlotCraftingNoCollect.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/slots/SlotDataStick.java (renamed from src/Java/gtPlusPlus/core/slots/SlotDataStick.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/slots/SlotElectric.java (renamed from src/Java/gtPlusPlus/core/slots/SlotElectric.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/slots/SlotFrame.java (renamed from src/Java/gtPlusPlus/core/slots/SlotFrame.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/slots/SlotFuelRod.java (renamed from src/Java/gtPlusPlus/core/slots/SlotFuelRod.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/slots/SlotGeneric.java (renamed from src/Java/gtPlusPlus/core/slots/SlotGeneric.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/slots/SlotGtTool.java (renamed from src/Java/gtPlusPlus/core/slots/SlotGtTool.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/slots/SlotGtToolElectric.java (renamed from src/Java/gtPlusPlus/core/slots/SlotGtToolElectric.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/slots/SlotIntegratedCircuit.java (renamed from src/Java/gtPlusPlus/core/slots/SlotIntegratedCircuit.java) | 2 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/slots/SlotItemBackpackInv.java (renamed from src/Java/gtPlusPlus/core/slots/SlotItemBackpackInv.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/slots/SlotJukebox.java (renamed from src/Java/gtPlusPlus/core/slots/SlotJukebox.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/slots/SlotLockedInput.java (renamed from src/Java/gtPlusPlus/core/slots/SlotLockedInput.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/slots/SlotLunchBox.java (renamed from src/Java/gtPlusPlus/core/slots/SlotLunchBox.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/slots/SlotMagicToolBag.java (renamed from src/Java/gtPlusPlus/core/slots/SlotMagicToolBag.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/slots/SlotModularBauble.java (renamed from src/Java/gtPlusPlus/core/slots/SlotModularBauble.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/slots/SlotModularBaubleUpgrades.java (renamed from src/Java/gtPlusPlus/core/slots/SlotModularBaubleUpgrades.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/slots/SlotNoInput.java (renamed from src/Java/gtPlusPlus/core/slots/SlotNoInput.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/slots/SlotNoInputLogging.java (renamed from src/Java/gtPlusPlus/core/slots/SlotNoInputLogging.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/slots/SlotOutput.java (renamed from src/Java/gtPlusPlus/core/slots/SlotOutput.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/slots/SlotPollutionScrubber.java (renamed from src/Java/gtPlusPlus/core/slots/SlotPollutionScrubber.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/slots/SlotRTG.java (renamed from src/Java/gtPlusPlus/core/slots/SlotRTG.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/slots/SlotToolBox.java (renamed from src/Java/gtPlusPlus/core/slots/SlotToolBox.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/slots/SlotVolumetricFlask.java (renamed from src/Java/gtPlusPlus/core/slots/SlotVolumetricFlask.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/tileentities/ModTileEntities.java (renamed from src/Java/gtPlusPlus/core/tileentities/ModTileEntities.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/tileentities/base/TILE_ENTITY_BASE.java (renamed from src/Java/gtPlusPlus/core/tileentities/base/TILE_ENTITY_BASE.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/tileentities/base/TileBasicTank.java (renamed from src/Java/gtPlusPlus/core/tileentities/base/TileBasicTank.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/tileentities/base/TileEntityBase.java (renamed from src/Java/gtPlusPlus/core/tileentities/base/TileEntityBase.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/tileentities/base/TilePoweredGT.java (renamed from src/Java/gtPlusPlus/core/tileentities/base/TilePoweredGT.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/tileentities/general/TileEntityCircuitProgrammer.java (renamed from src/Java/gtPlusPlus/core/tileentities/general/TileEntityCircuitProgrammer.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/tileentities/general/TileEntityDecayablesChest.java (renamed from src/Java/gtPlusPlus/core/tileentities/general/TileEntityDecayablesChest.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/tileentities/general/TileEntityEggBox.java (renamed from src/Java/gtPlusPlus/core/tileentities/general/TileEntityEggBox.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/tileentities/general/TileEntityFirepit.java (renamed from src/Java/gtPlusPlus/core/tileentities/general/TileEntityFirepit.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/tileentities/general/TileEntityFishTrap.java (renamed from src/Java/gtPlusPlus/core/tileentities/general/TileEntityFishTrap.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/tileentities/general/TileEntityHeliumGenerator.java (renamed from src/Java/gtPlusPlus/core/tileentities/general/TileEntityHeliumGenerator.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/tileentities/general/TileEntityInfiniteFluid.java (renamed from src/Java/gtPlusPlus/core/tileentities/general/TileEntityInfiniteFluid.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/tileentities/general/TileEntityPlayerDoorBase.java (renamed from src/Java/gtPlusPlus/core/tileentities/general/TileEntityPlayerDoorBase.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/tileentities/general/TileEntityReverter.java (renamed from src/Java/gtPlusPlus/core/tileentities/general/TileEntityReverter.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/tileentities/general/TileEntityVolumetricFlaskSetter.java (renamed from src/Java/gtPlusPlus/core/tileentities/general/TileEntityVolumetricFlaskSetter.java) | 22 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/tileentities/general/TileEntityXpConverter.java (renamed from src/Java/gtPlusPlus/core/tileentities/general/TileEntityXpConverter.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/tileentities/general/redstone/TileEntityRedstoneHandler.java (renamed from src/Java/gtPlusPlus/core/tileentities/general/redstone/TileEntityRedstoneHandler.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityAdvPooCollector.java (renamed from src/Java/gtPlusPlus/core/tileentities/machines/TileEntityAdvPooCollector.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityBaseFluidCollector.java (renamed from src/Java/gtPlusPlus/core/tileentities/machines/TileEntityBaseFluidCollector.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityModularityTable.java (renamed from src/Java/gtPlusPlus/core/tileentities/machines/TileEntityModularityTable.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityPestKiller.java (renamed from src/Java/gtPlusPlus/core/tileentities/machines/TileEntityPestKiller.java) | 4 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityPooCollector.java (renamed from src/Java/gtPlusPlus/core/tileentities/machines/TileEntityPooCollector.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityProjectTable.java (renamed from src/Java/gtPlusPlus/core/tileentities/machines/TileEntityProjectTable.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityRoundRobinator.java (renamed from src/Java/gtPlusPlus/core/tileentities/machines/TileEntityRoundRobinator.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityTradeTable.java (renamed from src/Java/gtPlusPlus/core/tileentities/machines/TileEntityTradeTable.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityWorkbench.java (renamed from src/Java/gtPlusPlus/core/tileentities/machines/TileEntityWorkbench.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityWorkbenchAdvanced.java (renamed from src/Java/gtPlusPlus/core/tileentities/machines/TileEntityWorkbenchAdvanced.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/util/Utils.java (renamed from src/Java/gtPlusPlus/core/util/Utils.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/util/data/AES.java (renamed from src/Java/gtPlusPlus/core/util/data/AES.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/util/data/ArrayUtils.java (renamed from src/Java/gtPlusPlus/core/util/data/ArrayUtils.java) | 12 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/util/data/EnumUtils.java (renamed from src/Java/gtPlusPlus/core/util/data/EnumUtils.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/util/data/FileUtils.java (renamed from src/Java/gtPlusPlus/core/util/data/FileUtils.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/util/data/LocaleUtils.java (renamed from src/Java/gtPlusPlus/core/util/data/LocaleUtils.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/util/data/LoggingUtils.java (renamed from src/Java/gtPlusPlus/core/util/data/LoggingUtils.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/util/data/StringUtils.java (renamed from src/Java/gtPlusPlus/core/util/data/StringUtils.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/util/data/UUIDUtils.java (renamed from src/Java/gtPlusPlus/core/util/data/UUIDUtils.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/util/debug/DEBUG_INIT.java (renamed from src/Java/gtPlusPlus/core/util/debug/DEBUG_INIT.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/util/debug/DEBUG_ITEM_ShapeSpawner.java (renamed from src/Java/gtPlusPlus/core/util/debug/DEBUG_ITEM_ShapeSpawner.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/util/debug/DEBUG_MULTIBLOCK_ShapeSpawner.java (renamed from src/Java/gtPlusPlus/core/util/debug/DEBUG_MULTIBLOCK_ShapeSpawner.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/util/debug/DEBUG_ScreenOverlay.java (renamed from src/Java/gtPlusPlus/core/util/debug/DEBUG_ScreenOverlay.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/util/debug/DEBUG_TimerThread.java (renamed from src/Java/gtPlusPlus/core/util/debug/DEBUG_TimerThread.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/util/debug/UtilityGL11Debug.java (renamed from src/Java/gtPlusPlus/core/util/debug/UtilityGL11Debug.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/util/math/MathUtils.java (renamed from src/Java/gtPlusPlus/core/util/math/MathUtils.java) | 16 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/util/minecraft/ClientUtils.java (renamed from src/Java/gtPlusPlus/core/util/minecraft/ClientUtils.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/util/minecraft/EnchantingUtils.java (renamed from src/Java/gtPlusPlus/core/util/minecraft/EnchantingUtils.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/util/minecraft/EnergyUtils.java (renamed from src/Java/gtPlusPlus/core/util/minecraft/EnergyUtils.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/util/minecraft/EntityUtils.java (renamed from src/Java/gtPlusPlus/core/util/minecraft/EntityUtils.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/util/minecraft/FluidUtils.java (renamed from src/Java/gtPlusPlus/core/util/minecraft/FluidUtils.java) | 115 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/util/minecraft/FoodUtils.java (renamed from src/Java/gtPlusPlus/core/util/minecraft/FoodUtils.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/util/minecraft/HazmatUtils.java (renamed from src/Java/gtPlusPlus/core/util/minecraft/HazmatUtils.java) | 4 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/util/minecraft/InventoryUtils.java (renamed from src/Java/gtPlusPlus/core/util/minecraft/InventoryUtils.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java (renamed from src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java) | 55 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/util/minecraft/LangUtils.java (renamed from src/Java/gtPlusPlus/core/util/minecraft/LangUtils.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/util/minecraft/MaterialUtils.java (renamed from src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java) | 7 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/util/minecraft/MiningUtils.java (renamed from src/Java/gtPlusPlus/core/util/minecraft/MiningUtils.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/util/minecraft/ModularArmourUtils.java (renamed from src/Java/gtPlusPlus/core/util/minecraft/ModularArmourUtils.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/util/minecraft/NBTUtils.java (renamed from src/Java/gtPlusPlus/core/util/minecraft/NBTUtils.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/util/minecraft/OreDictUtils.java (renamed from src/Java/gtPlusPlus/core/util/minecraft/OreDictUtils.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/util/minecraft/PlayerUtils.java (renamed from src/Java/gtPlusPlus/core/util/minecraft/PlayerUtils.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/util/minecraft/RecipeUtils.java (renamed from src/Java/gtPlusPlus/core/util/minecraft/RecipeUtils.java) | 41 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/util/minecraft/ShapelessUtils.java (renamed from src/Java/gtPlusPlus/core/util/minecraft/ShapelessUtils.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/util/minecraft/gregtech/PollutionUtils.java (renamed from src/Java/gtPlusPlus/core/util/minecraft/gregtech/PollutionUtils.java) | 174 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/util/minecraft/gregtech/material/MaterialBuilder.java (renamed from src/Java/gtPlusPlus/core/util/minecraft/gregtech/material/MaterialBuilder.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/util/minecraft/gregtech/recipehandlers/GregtechRecipe.java (renamed from src/Java/gtPlusPlus/core/util/minecraft/gregtech/recipehandlers/GregtechRecipe.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/util/minecraft/network/CustomPacket.java (renamed from src/Java/gtPlusPlus/core/util/minecraft/network/CustomPacket.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/util/minecraft/network/PacketBuilder.java (renamed from src/Java/gtPlusPlus/core/util/minecraft/network/PacketBuilder.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/util/minecraft/network/PacketDispatcher.java (renamed from src/Java/gtPlusPlus/core/util/minecraft/network/PacketDispatcher.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/util/minecraft/network/PacketHandler.java (renamed from src/Java/gtPlusPlus/core/util/minecraft/network/PacketHandler.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/util/minecraft/network/PacketTileEntity.java (renamed from src/Java/gtPlusPlus/core/util/minecraft/network/PacketTileEntity.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/util/minecraft/particles/BlockBreakParticles.java (renamed from src/Java/gtPlusPlus/core/util/minecraft/particles/BlockBreakParticles.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/util/minecraft/particles/EntityParticleFXMysterious.java (renamed from src/Java/gtPlusPlus/core/util/minecraft/particles/EntityParticleFXMysterious.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/util/player/PlayerCache.java (renamed from src/Java/gtPlusPlus/core/util/player/PlayerCache.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/util/reflect/AddGregtechRecipe.java (renamed from src/Java/gtPlusPlus/core/util/reflect/AddGregtechRecipe.java) | 61 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/util/reflect/ProxyFinder.java (renamed from src/Java/gtPlusPlus/core/util/reflect/ProxyFinder.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/util/reflect/ReflectionUtils.java (renamed from src/Java/gtPlusPlus/core/util/reflect/ReflectionUtils.java) | 18 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/util/sys/KeyboardUtils.java (renamed from src/Java/gtPlusPlus/core/util/sys/KeyboardUtils.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/util/sys/Log.java (renamed from src/Java/gtPlusPlus/core/util/sys/Log.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/util/sys/SystemUtils.java (renamed from src/Java/gtPlusPlus/core/util/sys/SystemUtils.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/world/damage/BaseCustomDamageSource.java (renamed from src/Java/gtPlusPlus/core/world/damage/BaseCustomDamageSource.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/world/explosions/ExplosionHandler.java (renamed from src/Java/gtPlusPlus/core/world/explosions/ExplosionHandler.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/core/world/explosions/MiningExplosion.java (renamed from src/Java/gtPlusPlus/core/world/explosions/MiningExplosion.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/everglades/GTplusplus_Everglades.java (renamed from src/Java/gtPlusPlus/everglades/GTplusplus_Everglades.java) | 30 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/everglades/biome/BiomeGenerator_Custom.java (renamed from src/Java/gtPlusPlus/everglades/biome/BiomeGenerator_Custom.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/everglades/biome/Biome_Everglades.java (renamed from src/Java/gtPlusPlus/everglades/biome/Biome_Everglades.java) | 18 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/everglades/biome/GenLayerBiomes.java (renamed from src/Java/gtPlusPlus/everglades/biome/GenLayerBiomes.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/everglades/biome/GenLayerEverglades.java (renamed from src/Java/gtPlusPlus/everglades/biome/GenLayerEverglades.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldGround.java (renamed from src/Java/gtPlusPlus/everglades/block/BlockDarkWorldGround.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldPollutedDirt.java (renamed from src/Java/gtPlusPlus/everglades/block/BlockDarkWorldPollutedDirt.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldPortalFrame.java (renamed from src/Java/gtPlusPlus/everglades/block/BlockDarkWorldPortalFrame.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldSludgeFluid.java (renamed from src/Java/gtPlusPlus/everglades/block/BlockDarkWorldSludgeFluid.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/everglades/block/BlockEvergladesPortal.java (renamed from src/Java/gtPlusPlus/everglades/block/BlockEvergladesPortal.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/everglades/block/DarkWorldContentLoader.java (renamed from src/Java/gtPlusPlus/everglades/block/DarkWorldContentLoader.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/everglades/chunk/ChunkProviderModded.java (renamed from src/Java/gtPlusPlus/everglades/chunk/ChunkProviderModded.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/everglades/dimension/Dimension_Everglades.java (renamed from src/Java/gtPlusPlus/everglades/dimension/Dimension_Everglades.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/everglades/gen/WorldGenDeadLilly.java (renamed from src/Java/gtPlusPlus/everglades/gen/WorldGenDeadLilly.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/everglades/gen/WorldGenMinable_Custom.java (renamed from src/Java/gtPlusPlus/everglades/gen/WorldGenMinable_Custom.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT.java (renamed from src/Java/gtPlusPlus/everglades/gen/gt/WorldGen_GT.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Base.java (renamed from src/Java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Base.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Ore_Layer.java (renamed from src/Java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Ore_Layer.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_Ores.java (renamed from src/Java/gtPlusPlus/everglades/gen/gt/WorldGen_Ores.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/everglades/item/ItemBlockToxicEverglades.java (renamed from src/Java/gtPlusPlus/everglades/item/ItemBlockToxicEverglades.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/everglades/item/ItemEvergladesPortalTrigger.java (renamed from src/Java/gtPlusPlus/everglades/item/ItemEvergladesPortalTrigger.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/everglades/object/BoxedQuad.java (renamed from src/Java/gtPlusPlus/everglades/object/BoxedQuad.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/everglades/world/CustomWorldType.java (renamed from src/Java/gtPlusPlus/everglades/world/CustomWorldType.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/everglades/world/EvergladesPortalPosition.java (renamed from src/Java/gtPlusPlus/everglades/world/EvergladesPortalPosition.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/everglades/world/TeleporterDimensionMod.java (renamed from src/Java/gtPlusPlus/everglades/world/TeleporterDimensionMod.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/everglades/world/WorldChunkManagerCustom.java (renamed from src/Java/gtPlusPlus/everglades/world/WorldChunkManagerCustom.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/everglades/world/WorldProviderMod.java (renamed from src/Java/gtPlusPlus/everglades/world/WorldProviderMod.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/nei/DecayableRecipeHandler.java (renamed from src/Java/gtPlusPlus/nei/DecayableRecipeHandler.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/nei/GTPP_NEI_DefaultHandler.java | 943 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/nei/GT_NEI_FlotationCell.java | 100 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/nei/GT_NEI_FluidReactor.java | 195 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/nei/GT_NEI_LFTR.java | 118 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/nei/GT_NEI_LFTR_Sparging.java | 372 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/nei/GT_NEI_MillingMachine.java | 136 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/nei/GT_NEI_MultiNoCell.java | 58 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/nei/NEI_GT_Config.java (renamed from src/Java/gtPlusPlus/nei/NEI_GT_Config.java) | 74 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/nei/NEI_IMC_Sender.java (renamed from src/Java/gtPlusPlus/nei/NEI_IMC_Sender.java) | 27 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/nei/handlers/NeiTextureHandler.java (renamed from src/Java/gtPlusPlus/nei/handlers/NeiTextureHandler.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/plugin/agrichem/AlgaeDefinition.java (renamed from src/Java/gtPlusPlus/plugin/agrichem/AlgaeDefinition.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/plugin/agrichem/AlgaeUtils.java (renamed from src/Java/gtPlusPlus/plugin/agrichem/AlgaeUtils.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java (renamed from src/Java/gtPlusPlus/plugin/agrichem/BioRecipes.java) | 23 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/plugin/agrichem/Core_Agrichem.java (renamed from src/Java/gtPlusPlus/plugin/agrichem/Core_Agrichem.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/plugin/agrichem/IAlgalItem.java (renamed from src/Java/gtPlusPlus/plugin/agrichem/IAlgalItem.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/plugin/agrichem/block/AgrichemFluids.java (renamed from src/Java/gtPlusPlus/plugin/agrichem/block/AgrichemFluids.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/plugin/agrichem/fluids/FluidLoader.java (renamed from src/Java/gtPlusPlus/plugin/agrichem/fluids/FluidLoader.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAgrichemBase.java (renamed from src/Java/gtPlusPlus/plugin/agrichem/item/algae/ItemAgrichemBase.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAlgaeBase.java (renamed from src/Java/gtPlusPlus/plugin/agrichem/item/algae/ItemAlgaeBase.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemBioChip.java (renamed from src/Java/gtPlusPlus/plugin/agrichem/item/algae/ItemBioChip.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/plugin/agrichem/logic/AlgaeGeneticData.java (renamed from src/Java/gtPlusPlus/plugin/agrichem/logic/AlgaeGeneticData.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/plugin/agrichem/logic/AlgaeGrowthRequirement.java (renamed from src/Java/gtPlusPlus/plugin/agrichem/logic/AlgaeGrowthRequirement.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/plugin/fishing/Core_Fishing.java (renamed from src/Java/gtPlusPlus/plugin/fishing/Core_Fishing.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/plugin/fishing/block/BlockFishEggs.java (renamed from src/Java/gtPlusPlus/plugin/fishing/block/BlockFishEggs.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/plugin/fishing/item/BaseFish.java (renamed from src/Java/gtPlusPlus/plugin/fishing/item/BaseFish.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/plugin/fishing/misc/BaseFishTypes.java (renamed from src/Java/gtPlusPlus/plugin/fishing/misc/BaseFishTypes.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/plugin/fixes/interfaces/IBugFix.java (renamed from src/Java/gtPlusPlus/plugin/fixes/interfaces/IBugFix.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/plugin/fixes/vanilla/Core_VanillaFixes.java (renamed from src/Java/gtPlusPlus/plugin/fixes/vanilla/Core_VanillaFixes.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/plugin/fixes/vanilla/VanillaBackgroundMusicFix.java (renamed from src/Java/gtPlusPlus/plugin/fixes/vanilla/VanillaBackgroundMusicFix.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/plugin/fixes/vanilla/VanillaBedHeightFix.java (renamed from src/Java/gtPlusPlus/plugin/fixes/vanilla/VanillaBedHeightFix.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/plugin/fixes/vanilla/music/MusicTocker.java (renamed from src/Java/gtPlusPlus/plugin/fixes/vanilla/music/MusicTocker.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/plugin/manager/Core_Manager.java (renamed from src/Java/gtPlusPlus/plugin/manager/Core_Manager.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/plugin/sulfurchem/Core_SulfuricChemistry.java (renamed from src/Java/gtPlusPlus/plugin/sulfurchem/Core_SulfuricChemistry.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/plugin/villagers/Core_VillagerAdditions.java (renamed from src/Java/gtPlusPlus/plugin/villagers/Core_VillagerAdditions.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/plugin/villagers/NameLists.java (renamed from src/Java/gtPlusPlus/plugin/villagers/NameLists.java) | 2 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/plugin/villagers/VillagerEventHandler.java (renamed from src/Java/gtPlusPlus/plugin/villagers/VillagerEventHandler.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/plugin/villagers/VillagerObject.java (renamed from src/Java/gtPlusPlus/plugin/villagers/VillagerObject.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/plugin/villagers/VillagerUtils.java (renamed from src/Java/gtPlusPlus/plugin/villagers/VillagerUtils.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/plugin/villagers/block/BlockGenericSpawner.java (renamed from src/Java/gtPlusPlus/plugin/villagers/block/BlockGenericSpawner.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/plugin/villagers/entity/EntityBaseVillager.java (renamed from src/Java/gtPlusPlus/plugin/villagers/entity/EntityBaseVillager.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/plugin/villagers/entity/EntityNativeAustralian.java (renamed from src/Java/gtPlusPlus/plugin/villagers/entity/EntityNativeAustralian.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/plugin/villagers/entity/trade/BaseVillagerTrade.java (renamed from src/Java/gtPlusPlus/plugin/villagers/entity/trade/BaseVillagerTrade.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/plugin/villagers/tile/MobSpawnerCustomLogic.java (renamed from src/Java/gtPlusPlus/plugin/villagers/tile/MobSpawnerCustomLogic.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/plugin/villagers/tile/TileEntityGenericSpawner.java (renamed from src/Java/gtPlusPlus/plugin/villagers/tile/TileEntityGenericSpawner.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/plugin/villagers/trade/TradeHandlerAboriginal.java (renamed from src/Java/gtPlusPlus/plugin/villagers/trade/TradeHandlerAboriginal.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/plugin/villagers/trade/TradeHandlerBanker.java (renamed from src/Java/gtPlusPlus/plugin/villagers/trade/TradeHandlerBanker.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/plugin/villagers/trade/TradeHandlerBase.java (renamed from src/Java/gtPlusPlus/plugin/villagers/trade/TradeHandlerBase.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/plugin/villagers/trade/TradeHandlerTechnician.java (renamed from src/Java/gtPlusPlus/plugin/villagers/trade/TradeHandlerTechnician.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/plugin/villagers/trade/TradeHandlerTrader.java (renamed from src/Java/gtPlusPlus/plugin/villagers/trade/TradeHandlerTrader.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/plugin/waila/Core_WailaPlugin.java (renamed from src/Java/gtPlusPlus/plugin/waila/Core_WailaPlugin.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/preloader/CORE_Preloader.java (renamed from src/Java/gtPlusPlus/preloader/CORE_Preloader.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/preloader/ChunkDebugger.java (renamed from src/Java/gtPlusPlus/preloader/ChunkDebugger.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/preloader/CustomClassLoader.java (renamed from src/Java/gtPlusPlus/preloader/CustomClassLoader.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/preloader/DevHelper.java (renamed from src/Java/gtPlusPlus/preloader/DevHelper.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/preloader/Preloader_GT_OreDict.java (renamed from src/Java/gtPlusPlus/preloader/Preloader_GT_OreDict.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/preloader/Preloader_Logger.java (renamed from src/Java/gtPlusPlus/preloader/Preloader_Logger.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/preloader/asm/AsmConfig.java (renamed from src/Java/gtPlusPlus/preloader/asm/AsmConfig.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/preloader/asm/ClassesToTransform.java (renamed from src/Java/gtPlusPlus/preloader/asm/ClassesToTransform.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/preloader/asm/Preloader_DummyContainer.java (renamed from src/Java/gtPlusPlus/preloader/asm/Preloader_DummyContainer.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/preloader/asm/Preloader_FMLLoadingPlugin.java (renamed from src/Java/gtPlusPlus/preloader/asm/Preloader_FMLLoadingPlugin.java) | 8 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/preloader/asm/Preloader_SetupClass.java (renamed from src/Java/gtPlusPlus/preloader/asm/Preloader_SetupClass.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/preloader/asm/helpers/MethodHelper_CC.java (renamed from src/Java/gtPlusPlus/preloader/asm/helpers/MethodHelper_CC.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/preloader/asm/helpers/MethodHelper_GT.java (renamed from src/Java/gtPlusPlus/preloader/asm/helpers/MethodHelper_GT.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_CC_GuiContainerManager.java (renamed from src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_CC_GuiContainerManager.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_COFH_OreDictionaryArbiter.java (renamed from src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_COFH_OreDictionaryArbiter.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_Forge_ChunkLoading.java (renamed from src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_Forge_ChunkLoading.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_Forge_EntityLivingBase_SetHealth.java (renamed from src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_Forge_EntityLivingBase_SetHealth.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GC_EntityAutoRocket.java (renamed from src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GC_EntityAutoRocket.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GC_FluidUtil.java (renamed from src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GC_FluidUtil.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GC_FuelLoader.java (renamed from src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GC_FuelLoader.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_Achievements.java (renamed from src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_Achievements.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_Achievements_CrashFix.java (renamed from src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_Achievements_CrashFix.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_BaseMetaTileEntity.java (renamed from src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_BaseMetaTileEntity.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_BlockMachines_MetaPipeEntity.java (renamed from src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_BlockMachines_MetaPipeEntity.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_BlockMachines_NBT.java (renamed from src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_BlockMachines_NBT.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_CharcoalPit.java (renamed from src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_CharcoalPit.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_Client.java (renamed from src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_Client.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_EnergyHatchPatch.java (renamed from src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_EnergyHatchPatch.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_ItemMachines_Tooltip.java (renamed from src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_ItemMachines_Tooltip.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_MetaGenerated_Tool.java (renamed from src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_MetaGenerated_Tool.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_Packet_TileEntity.java (renamed from src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_Packet_TileEntity.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_Utility.java (renamed from src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_Utility.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_IC2_GetHarvestTool.java (renamed from src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_IC2_GetHarvestTool.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_IC2_Hazmat.java (renamed from src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_IC2_Hazmat.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_LWJGL_Keyboard.java (renamed from src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_LWJGL_Keyboard.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_Railcraft_FluidCartHandling.java (renamed from src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_Railcraft_FluidCartHandling.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_Railcraft_FluidHelper.java (renamed from src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_Railcraft_FluidHelper.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_Railcraft_InvTools.java (renamed from src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_Railcraft_InvTools.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TC_ItemWispEssence.java (renamed from src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TC_ItemWispEssence.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TT_ThaumicRestorer.java (renamed from src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TT_ThaumicRestorer.java) | 2 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TiConFluids.java (renamed from src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TiConFluids.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_ClassTransformer.java (renamed from src/Java/gtPlusPlus/preloader/asm/transformers/Preloader_ClassTransformer.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_ClassTransformer2.java (renamed from src/Java/gtPlusPlus/preloader/asm/transformers/Preloader_ClassTransformer2.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java (renamed from src/Java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java) | 8 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/preloader/keyboard/BetterKeyboard.java (renamed from src/Java/gtPlusPlus/preloader/keyboard/BetterKeyboard.java) | 6 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/bartcrops/HANDLER_CropsPlusPlus.java (renamed from src/Java/gtPlusPlus/xmod/bartcrops/HANDLER_CropsPlusPlus.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/bartcrops/LoaderOfTheCrops.java (renamed from src/Java/gtPlusPlus/xmod/bartcrops/LoaderOfTheCrops.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseAestheticCrop.java (renamed from src/Java/gtPlusPlus/xmod/bartcrops/abstracts/BaseAestheticCrop.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseCrop.java (renamed from src/Java/gtPlusPlus/xmod/bartcrops/abstracts/BaseCrop.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseHarvestableCrop.java (renamed from src/Java/gtPlusPlus/xmod/bartcrops/abstracts/BaseHarvestableCrop.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/bartcrops/crops/Crop_Hemp.java (renamed from src/Java/gtPlusPlus/xmod/bartcrops/crops/Crop_Hemp.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/bop/HANDLER_BiomesOPlenty.java (renamed from src/Java/gtPlusPlus/xmod/bop/HANDLER_BiomesOPlenty.java) | 26 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/bop/blocks/BOP_Block_Registrator.java (renamed from src/Java/gtPlusPlus/xmod/bop/blocks/BOP_Block_Registrator.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/bop/blocks/base/LeavesBase.java (renamed from src/Java/gtPlusPlus/xmod/bop/blocks/base/LeavesBase.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/bop/blocks/base/LogBase.java (renamed from src/Java/gtPlusPlus/xmod/bop/blocks/base/LogBase.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/bop/blocks/base/SaplingBase.java (renamed from src/Java/gtPlusPlus/xmod/bop/blocks/base/SaplingBase.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/bop/blocks/pine/LeavesPineTree.java (renamed from src/Java/gtPlusPlus/xmod/bop/blocks/pine/LeavesPineTree.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/bop/blocks/pine/LogPineTree.java (renamed from src/Java/gtPlusPlus/xmod/bop/blocks/pine/LogPineTree.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/bop/blocks/pine/SaplingPineTree.java (renamed from src/Java/gtPlusPlus/xmod/bop/blocks/pine/SaplingPineTree.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/bop/blocks/rainforest/LeavesRainforestTree.java (renamed from src/Java/gtPlusPlus/xmod/bop/blocks/rainforest/LeavesRainforestTree.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/bop/blocks/rainforest/LogRainforestTree.java (renamed from src/Java/gtPlusPlus/xmod/bop/blocks/rainforest/LogRainforestTree.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/bop/blocks/rainforest/SaplingRainforestTree.java (renamed from src/Java/gtPlusPlus/xmod/bop/blocks/rainforest/SaplingRainforestTree.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/bop/creative/MiscUtilsBOPTab.java (renamed from src/Java/gtPlusPlus/xmod/bop/creative/MiscUtilsBOPTab.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/bop/world/features/trees/WorldGenPineTree.java (renamed from src/Java/gtPlusPlus/xmod/bop/world/features/trees/WorldGenPineTree.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/bop/world/features/trees/WorldGenRainForestTree_Ex.java (renamed from src/Java/gtPlusPlus/xmod/bop/world/features/trees/WorldGenRainForestTree_Ex.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/cofh/HANDLER_COFH.java (renamed from src/Java/gtPlusPlus/xmod/cofh/HANDLER_COFH.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/computronics/HANDLER_Computronics.java (renamed from src/Java/gtPlusPlus/xmod/computronics/HANDLER_Computronics.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/eio/handler/HandlerTooltip_EIO.java (renamed from src/Java/gtPlusPlus/xmod/eio/handler/HandlerTooltip_EIO.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/eio/material/MaterialEIO.java (renamed from src/Java/gtPlusPlus/xmod/eio/material/MaterialEIO.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/forestry/HANDLER_FR.java (renamed from src/Java/gtPlusPlus/xmod/forestry/HANDLER_FR.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/forestry/bees/blocks/BlockDenseBeeHouse.java (renamed from src/Java/gtPlusPlus/xmod/forestry/bees/blocks/BlockDenseBeeHouse.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/forestry/bees/blocks/FR_BlockRegistry.java (renamed from src/Java/gtPlusPlus/xmod/forestry/bees/blocks/FR_BlockRegistry.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/forestry/bees/custom/CustomCombs.java (renamed from src/Java/gtPlusPlus/xmod/forestry/bees/custom/CustomCombs.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bee_Definition.java (renamed from src/Java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bee_Definition.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bees.java (renamed from src/Java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bees.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Branch_Definition.java (renamed from src/Java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Branch_Definition.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/forestry/bees/custom/ItemCustomComb.java (renamed from src/Java/gtPlusPlus/xmod/forestry/bees/custom/ItemCustomComb.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/forestry/bees/gui/ContainerBeeHouse.java (renamed from src/Java/gtPlusPlus/xmod/forestry/bees/gui/ContainerBeeHouse.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/forestry/bees/gui/GuiBeeHouse.java (renamed from src/Java/gtPlusPlus/xmod/forestry/bees/gui/GuiBeeHouse.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/forestry/bees/inventory/InventoryDenseBeeHouse.java (renamed from src/Java/gtPlusPlus/xmod/forestry/bees/inventory/InventoryDenseBeeHouse.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/forestry/bees/items/FR_CustomBee.java (renamed from src/Java/gtPlusPlus/xmod/forestry/bees/items/FR_CustomBee.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java (renamed from src/Java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/forestry/bees/items/FR_StringUtil.java (renamed from src/Java/gtPlusPlus/xmod/forestry/bees/items/FR_StringUtil.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/forestry/bees/items/MB_FrameType.java (renamed from src/Java/gtPlusPlus/xmod/forestry/bees/items/MB_FrameType.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/forestry/bees/items/MB_ItemFrame.java (renamed from src/Java/gtPlusPlus/xmod/forestry/bees/items/MB_ItemFrame.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/forestry/bees/recipe/FR_Gregtech_Recipes.java (renamed from src/Java/gtPlusPlus/xmod/forestry/bees/recipe/FR_Gregtech_Recipes.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/forestry/bees/tileentities/TileDenseBeeHouse.java (renamed from src/Java/gtPlusPlus/xmod/forestry/bees/tileentities/TileDenseBeeHouse.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/galacticraft/HANDLER_GalactiCraft.java (renamed from src/Java/gtPlusPlus/xmod/galacticraft/HANDLER_GalactiCraft.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/galacticraft/handler/HandlerTooltip_GC.java (renamed from src/Java/gtPlusPlus/xmod/galacticraft/handler/HandlerTooltip_GC.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/galacticraft/util/GalacticUtils.java (renamed from src/Java/gtPlusPlus/xmod/galacticraft/util/GalacticUtils.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/energy/IC2ElectricItem.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/energy/IC2ElectricItem.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/energy/IC2ElectricItemManager.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/energy/IC2ElectricItemManager.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/enums/CustomGtTextures.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/enums/CustomGtTextures.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/enums/CustomOrePrefix.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/enums/CustomOrePrefix.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java) | 37 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOreDictNames.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOreDictNames.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechTextureSet.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechTextureSet.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechTextures.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechTextures.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechToolDictNames.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechToolDictNames.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_AdvancedBoiler.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_AdvancedBoiler.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_Cyclotron.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_Cyclotron.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_DeluxeTank.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_DeluxeTank.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_Hatch_Muffler_Advanced.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_Hatch_Muffler_Advanced.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_IndustrialCentrifuge.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_IndustrialCentrifuge.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_IronBlastFurnace.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_IronBlastFurnace.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_MatterFab.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_MatterFab.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_MetaTileMachineLong.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_MetaTileMachineLong.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_MultiMachine.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_MultiMachine.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_MultiMachine_NoPlayerInventory.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_MultiMachine_NoPlayerInventory.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_PowerSubStation.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_PowerSubStation.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_SafeBlock.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_SafeBlock.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_SolarGenerator.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_SolarGenerator.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_SteamCondenser.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_SteamCondenser.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_SuperChest.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_SuperChest.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_TreeFarmer.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_TreeFarmer.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_AdvancedBoiler.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_AdvancedBoiler.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_Cyclotron.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_Cyclotron.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_DeluxeTank.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_DeluxeTank.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_Hatch_Muffler_Advanced.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_Hatch_Muffler_Advanced.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_IndustrialCentrifuge.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_IndustrialCentrifuge.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_IronBlastFurnace.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_IronBlastFurnace.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_MatterFab.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_MatterFab.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_MultiMachine.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_MultiMachine.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_MultiMachine_Default.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_MultiMachine_Default.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_Multi_Basic_Slotted.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_Multi_Basic_Slotted.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_PowerSubStation.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_PowerSubStation.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_SafeBlock.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_SafeBlock.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_SolarGenerator.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_SolarGenerator.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_SteamCondenser.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_SteamCondenser.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_SuperChest.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_SuperChest.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_TreeFarmer.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_TreeFarmer.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/gui/basic/CONTAINER_PollutionCleaner.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/gui/basic/CONTAINER_PollutionCleaner.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/gui/basic/GUI_PollutionCleaner.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/gui/basic/GUI_PollutionCleaner.java) | 2 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/gui/fluidreactor/Container_FluidReactor.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/gui/fluidreactor/Container_FluidReactor.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/gui/fluidreactor/GUI_FluidReactor.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/gui/fluidreactor/GUI_FluidReactor.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/gui/hatches/CONTAINER_1by1_Turbine.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/gui/hatches/CONTAINER_1by1_Turbine.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/gui/hatches/CONTAINER_2by2.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/gui/hatches/CONTAINER_2by2.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/gui/hatches/CONTAINER_4by4.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/gui/hatches/CONTAINER_4by4.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/gui/hatches/CONTAINER_HatchNbtConsumable.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/gui/hatches/CONTAINER_HatchNbtConsumable.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/gui/hatches/GUI_1by1_Turbine.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/gui/hatches/GUI_1by1_Turbine.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/gui/hatches/GUI_2by2.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/gui/hatches/GUI_2by2.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/gui/hatches/GUI_4by4.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/gui/hatches/GUI_4by4.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/gui/hatches/GUI_HatchNbtConsumable.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/gui/hatches/GUI_HatchNbtConsumable.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/gui/hatches/charge/CONTAINER_Electric_2by2.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/gui/hatches/charge/CONTAINER_Electric_2by2.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/gui/hatches/charge/CONTAINER_Electric_4by4.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/gui/hatches/charge/CONTAINER_Electric_4by4.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/gui/hatches/charge/GUI_Electric_2by2.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/gui/hatches/charge/GUI_Electric_2by2.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/gui/hatches/charge/GUI_Electric_4by4.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/gui/hatches/charge/GUI_Electric_4by4.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/gui/power/CONTAINER_BasicTank.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/gui/power/CONTAINER_BasicTank.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/gui/power/GUI_BasicTank.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/gui/power/GUI_BasicTank.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/GregtechItemContainer.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/GregtechItemContainer.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/IHeatEntity.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/IHeatEntity.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/IHeatSink.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/IHeatSink.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/IMetaTileEntityHeatPipe.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/IMetaTileEntityHeatPipe.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java) | 56 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_IconContainer.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_IconContainer.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_ItemBehaviour.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_ItemBehaviour.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_OreRecipeRegistrator.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_OreRecipeRegistrator.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_OreRecipeRegistrator_GT.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_OreRecipeRegistrator_GT.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_Texture.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_Texture.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_ToolStats.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_ToolStats.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_Generic_Item.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_Generic_Item.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem_Base.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem_Base.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem_X32.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem_X32.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaTool.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaTool.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/items/tools/GT_MetaGenTool.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/items/tools/GT_MetaGenTool.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/items/types/ToolType_Base.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/items/types/ToolType_Base.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/items/types/ToolType_HardHammer.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/items/types/ToolType_HardHammer.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/items/types/ToolType_Pump.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/items/types/ToolType_Pump.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/items/types/ToolType_Wrench.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/items/types/ToolType_Wrench.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/BaseCustomTileEntity.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/BaseCustomTileEntity.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/BaseCustomPower_MTE.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/BaseCustomPower_MTE.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/GTPP_MTE_BasicLosslessGenerator.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/GTPP_MTE_BasicLosslessGenerator.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/GTPP_MTE_BasicMachine.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/GTPP_MTE_BasicMachine.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/GTPP_MTE_BasicTank.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/GTPP_MTE_BasicTank.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/GTPP_MTE_TieredMachineBlock.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/GTPP_MTE_TieredMachineBlock.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/MetaTileEntityCustomPower.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/MetaTileEntityCustomPower.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicBreaker.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicBreaker.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GTPP_Recipe.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GTPP_Recipe.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Dehydrator.java | 163 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_DeluxeMachine.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_DeluxeMachine.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_DeluxeTank.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_DeluxeTank.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_AirIntake.java | 110 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_AirIntake_Extreme.java | 32 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ControlCore.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ControlCore.java) | 8 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_DynamoBuffer.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_DynamoBuffer.java) | 14 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ElementalDataOrbHolder.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ElementalDataOrbHolder.java) | 32 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Energy_RTG.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Energy_RTG.java) | 9 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_FluidGenerator.java | 252 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_InputBattery.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_InputBattery.java) | 3 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler_Adv.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler_Adv.java) | 6 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Naquadah.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Naquadah.java) | 4 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_OutputBattery.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_OutputBattery.java) | 3 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Plasma.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Plasma.java) | 3 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Reservoir.java | 123 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Steam_BusInput.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Steam_BusInput.java) | 4 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Steam_BusOutput.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Steam_BusOutput.java) | 4 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Turbine.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Turbine.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_TurbineProvider.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_TurbineProvider.java) | 10 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_SuperBus_Input.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_SuperBus_Input.java) | 2 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_SuperBus_Output.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_SuperBus_Output.java) | 2 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntityFluid.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntityFluid.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntity_Cable.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntity_Cable.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaTreeFarmerStructural.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaTreeFarmerStructural.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/CustomMetaTileBase.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/CustomMetaTileBase.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GT_MetaTileEntity_Hatch_CustomFluidBase.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GT_MetaTileEntity_Hatch_CustomFluidBase.java) | 4 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaPipeEntityBase_Cable.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaPipeEntityBase_Cable.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaTileEntity.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaTileEntity.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaTransformerHiAmp.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaTransformerHiAmp.java) | 4 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java) | 283 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_SteamMultiBase.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_SteamMultiBase.java) | 26 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechDoubleFuelGeneratorBase.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechDoubleFuelGeneratorBase.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechMetaBoilerBase.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechMetaBoilerBase.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechMetaSolarGenerator.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechMetaSolarGenerator.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechRocketFuelGeneratorBase.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechRocketFuelGeneratorBase.java) | 25 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaSafeBlockBase.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaSafeBlockBase.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaTreeFarmerBase.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaTreeFarmerBase.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_Catalysts.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_Catalysts.java) | 8 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_MillingBalls.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_MillingBalls.java) | 8 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_NbtConsumable.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_NbtConsumable.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechFluid.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/objects/GregtechFluid.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechItemData.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/objects/GregtechItemData.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechMaterialStack.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/objects/GregtechMaterialStack.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/objects/MultiblockBlueprint.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/objects/MultiblockBlueprint.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/objects/MultiblockLayer.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/objects/MultiblockLayer.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/objects/MultiblockRequirements.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/objects/MultiblockRequirements.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/recipe/ProcessingSkookumChoocherToolRecipes.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/recipe/ProcessingSkookumChoocherToolRecipes.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/util/GTPP_Config.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/util/GTPP_Config.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/util/GregtechOreDictUnificator.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/util/GregtechOreDictUnificator.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/util/SpecialBehaviourTooltipHandler.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/util/SpecialBehaviourTooltipHandler.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Boulder.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Boulder.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_GT_Ore_Layer.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_GT_Ore_Layer.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Handler.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Handler.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Ore.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Ore.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Ore_Normal.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Ore_Normal.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/world/GT_OreVein_Object.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/world/GT_OreVein_Object.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/api/world/WorldGenUtils.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/api/world/WorldGenUtils.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/Meta_GT_Proxy.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/Meta_GT_Proxy.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/StaticFields59.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/StaticFields59.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GTPP_Block_Machines.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GTPP_Block_Machines.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GTPP_Item_Machines.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GTPP_Item_Machines.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks2.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks2.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java) | 4 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks4.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks4.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks5.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks5.java) | 21 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocksAbstract.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocksAbstract.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingItems.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingItems.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaItemCasings1.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaItemCasings1.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaItemCasingsAbstract.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaItemCasingsAbstract.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMachineCasings.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMachineCasings.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings.java) | 3 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaTieredCasingBlocks1.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaTieredCasingBlocks1.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler2.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler2.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesCentrifugeMultiblock.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesCentrifugeMultiblock.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGregtech58.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGregtech58.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGregtech59.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGregtech59.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGrinderMultiblock.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGrinderMultiblock.java) | 2 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java) | 37 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtCutomCovers.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtCutomCovers.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtTools.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtTools.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/turbine/LargeTurbineTextureHandler.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/turbine/LargeTurbineTextureHandler.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/blueprint/Blueprint_Generic_3x3.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/blueprint/Blueprint_Generic_3x3.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/blueprint/Blueprint_LFTR.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/blueprint/Blueprint_LFTR.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/covers/CoverManager.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/covers/CoverManager.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_Overflow.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_Overflow.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_Overflow_Item.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_Overflow_Item.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_ToggleVisual.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_ToggleVisual.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/ChargingHelper.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/helpers/ChargingHelper.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/CraftingHelper.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/helpers/CraftingHelper.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/FlotationRecipeHandler.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/helpers/FlotationRecipeHandler.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/GT_MethodHelper.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/helpers/GT_MethodHelper.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/MachineUpdateHandler.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/helpers/MachineUpdateHandler.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/TreeFarmHelper.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/helpers/TreeFarmHelper.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/VolumetricFlaskHelper.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/helpers/VolumetricFlaskHelper.java) | 20 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/autocrafter/AC_Helper_Container.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/helpers/autocrafter/AC_Helper_Container.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/autocrafter/AC_Helper_Utils.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/helpers/autocrafter/AC_Helper_Utils.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/tesseract/TesseractHelper.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/helpers/tesseract/TesseractHelper.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/treefarm/TreeGenerator.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/helpers/treefarm/TreeGenerator.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaCustomCoverItem.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaCustomCoverItem.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechTools.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechTools.java) | 4 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Choocher.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Choocher.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Electric_Lighter.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Electric_Lighter.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Grinder.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Grinder.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Prospecting_Ex.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Prospecting_Ex.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/items/covers/MetaItemCoverCasings.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/items/covers/MetaItemCoverCasings.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_CapeRenderer.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/render/GTPP_CapeRenderer.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_FlaskRenderer.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/render/GTPP_FlaskRenderer.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_Render_MachineBlock.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/render/GTPP_Render_MachineBlock.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/requirements/RequirementsBasicCubic.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/requirements/RequirementsBasicCubic.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java) | 3 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractTerminal.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractTerminal.java) | 3 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java) | 3 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_HV.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_HV.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_LV.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_LV.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_MV.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_MV.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Solar.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Solar.java) | 9 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_RfConvertor.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_RfConvertor.java) | 6 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_SemiFluidGenerator.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_SemiFluidGenerator.java) | 6 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityDoubleFuelGeneratorBase.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityDoubleFuelGeneratorBase.java) | 11 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityGeothermalGenerator.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityGeothermalGenerator.java) | 8 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityRocketFuelGenerator.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityRocketFuelGenerator.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntitySolarGenerator.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntitySolarGenerator.java) | 10 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntity_RTG.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntity_RTG.java) | 1 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_CombustionGenerator.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_CombustionGenerator.java) | 17 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_GasTurbine.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_GasTurbine.java) | 18 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_SteamTurbine.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_SteamTurbine.java) | 18 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/creative/GregtechMetaCreativeEnergyBuffer.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/creative/GregtechMetaCreativeEnergyBuffer.java) | 6 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_WorldAccelerator.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_WorldAccelerator.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaAtmosphericReconditioner.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaAtmosphericReconditioner.java) | 206 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaCondensor.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaCondensor.java) | 2 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaGarbageCollector.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaGarbageCollector.java) | 7 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionCreator.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionCreator.java) | 16 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionDetector.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionDetector.java) | 17 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityChunkLoader.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityChunkLoader.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityThaumcraftResearcher.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityThaumcraftResearcher.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_AutoChisel.java | 155 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_BasicWasher.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_BasicWasher.java) | 3 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ChemicalReactor.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ChemicalReactor.java) | 2 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_CompactFusionReactor.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_CompactFusionReactor.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_PocketFusion.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_PocketFusion.java) | 2 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ReactorColdTrap.java | 67 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ReactorProcessingUnit.java | 67 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaWirelessCharger.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaWirelessCharger.java) | 1 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GMTE_AmazonPackager.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GMTE_AmazonPackager.java) | 15 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GregtechMTE_TeslaTower.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GregtechMTE_TeslaTower.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialAlloySmelter.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialAlloySmelter.java) | 20 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialArcFurnace.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialArcFurnace.java) | 57 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCentrifuge.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCentrifuge.java) | 23 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialChisel.java | 474 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCokeOven.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCokeOven.java) | 25 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCuttingMachine.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCuttingMachine.java) | 20 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialDehydrator.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialDehydrator.java) | 24 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialElectrolyzer.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialElectrolyzer.java) | 23 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialExtruder.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialExtruder.java) | 17 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMacerator.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMacerator.java) | 17 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMixer.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMixer.java) | 23 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java) | 26 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialPlatePress.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialPlatePress.java) | 17 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialSifter.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialSifter.java) | 17 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialSinter.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialSinter.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialThermalCentrifuge.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialThermalCentrifuge.java) | 17 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialVacuumFreezer.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialVacuumFreezer.java) | 26 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWashPlant.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWashPlant.java) | 20 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWireMill.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWireMill.java) | 17 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IronBlastFurnace.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IronBlastFurnace.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IsaMill.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IsaMill.java) | 44 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_SpargeTower.java | 414 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_AssemblyLine.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_AssemblyLine.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_DistillationTower.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_DistillationTower.java) | 26 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java) | 27 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Fusion_MK4.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Fusion_MK4.java) | 3 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Implosion.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Implosion.java) | 17 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamMacerator.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamMacerator.java) | 12 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_AutoCrafter.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_AutoCrafter.java) | 20 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_ThermalBoiler.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_ThermalBoiler.java) | 20 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_ElementalDuplicator.java | 744 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_FastNeutronReactor.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_FastNeutronReactor.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_FrothFlotationCell.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_FrothFlotationCell.java) | 18 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_LargeNaqReactor.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_LargeNaqReactor.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_MiniFusionPlant.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_MiniFusionPlant.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java | 523 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityGeneratorArray.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityGeneratorArray.java) | 21 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java) | 2 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_AlloyBlastSmelter.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_AlloyBlastSmelter.java) | 22 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Cyclotron.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Cyclotron.java) | 20 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialFishingPond.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialFishingPond.java) | 20 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialRockBreaker.java | 559 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_LargeRocketEngine.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_LargeRocketEngine.java) | 38 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_LargeSemifluidGenerator.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_LargeSemifluidGenerator.java) | 16 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_MassFabricator.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_MassFabricator.java) | 23 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Refinery.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Refinery.java) | 24 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_SolarTower.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_SolarTower.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/algae/GregtechMTE_AlgaePondBase.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/algae/GregtechMTE_AlgaePondBase.java) | 12 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/bedrock/GregtechMetaTileEntity_BedrockMiningPlatform1.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/bedrock/GregtechMetaTileEntity_BedrockMiningPlatform1.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/bedrock/GregtechMetaTileEntity_BedrockMiningPlatform2.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/bedrock/GregtechMetaTileEntity_BedrockMiningPlatform2.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/bedrock/GregtechMetaTileEntity_BedrockMiningPlatformBase.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/bedrock/GregtechMetaTileEntity_BedrockMiningPlatformBase.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java) | 67 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_SHSteam.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_SHSteam.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Steam.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Steam.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GregtechMetaTileEntity_LargerTurbineBase.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GregtechMetaTileEntity_LargerTurbineBase.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_MultiTank.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_MultiTank.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java) | 228 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/misc/TileEntitySolarHeater.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/misc/TileEntitySolarHeater.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_ConnectableCrate.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_ConnectableCrate.java) | 8 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredChest.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredChest.java) | 9 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredTank.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredTank.java) | 8 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GregtechMetaEnergyBuffer.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GregtechMetaEnergyBuffer.java) | 6 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GregtechMetaSafeBlock.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GregtechMetaSafeBlock.java) | 12 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/creative/GT_MetaTileEntity_InfiniteItemHolder.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/creative/GT_MetaTileEntity_InfiniteItemHolder.java) | 9 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Compartment.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Compartment.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Desk.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Desk.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_FileCabinet.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_FileCabinet.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Iron.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Iron.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Large.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Large.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_AngleGrinder.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_AngelGrinder.java) | 4 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_Base.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_Base.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_Choocher.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_Choocher.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricButcherKnife.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricButcherKnife.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricLighter.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricLighter.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricSnips.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricSnips.java) | 5 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/loaders/GT_Material_Loader.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/loaders/GT_Material_Loader.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/loaders/Gregtech_Blocks.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/loaders/Gregtech_Blocks.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingAngleGrinder.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/loaders/ProcessingAngleGrinder.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricButcherKnife.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricButcherKnife.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricLighter.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricLighter.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricSnips.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricSnips.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingToolHeadChoocher.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/loaders/ProcessingToolHeadChoocher.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/loaders/Processing_Textures_Items.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/loaders/Processing_Textures_Items.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_AlloySmelter.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_AlloySmelter.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Assembler.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Assembler.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Base.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Base.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java) | 20 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT_Ex.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT_Ex.java) | 6 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT_GTNH.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT_GTNH.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java) | 71 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Extruder.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Extruder.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_FluidCanning.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_FluidCanning.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java) | 34 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluorite.java | 224 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MaterialProcessing.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MaterialProcessing.java) | 71 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MetalRecipe.java | 119 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MultisUsingFluidInsteadOfCells.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MultisUsingFluidInsteadOfCells.java) | 5 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java) | 29 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plasma.java | 42 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plates.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plates.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Recycling.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Recycling.java) | 4 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/loaders/misc/AddCustomMachineToPA.java | 28 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/loaders/misc/AssLineAchievements.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/loaders/misc/AssLineAchievements.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_AlgaeFarm.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_AlgaeFarm.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_GTNH.java | 22 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_LFTR.java | 173 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_Nuclear.java | 695 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_NuclearFuelProcessing.java | 372 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java) | 304 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/recipes/RecipesToRemove.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/recipes/RecipesToRemove.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_AssemblyLine.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_AssemblyLine.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_CokeOven.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_CokeOven.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_Dehydrator.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_Dehydrator.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_MatterFabricator.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_MatterFabricator.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedBoilers.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedBoilers.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedMixer.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedMixer.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAlgaeContent.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAlgaeContent.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAmazonWarehouse.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAmazonWarehouse.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechBedrockPlatforms.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechBedrockPlatforms.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechBufferDynamos.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechBufferDynamos.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechComponentAssembler.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechComponentAssembler.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java) | 5 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCyclotron.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCyclotron.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java) | 97 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechFactoryGradeReplacementMultis.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechFactoryGradeReplacementMultis.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechFluidReactor.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechFluidReactor.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeneratorsULV (renamed from src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeneratorsULV) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeneratorsULV.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeneratorsULV.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechHiAmpTransformer.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechHiAmpTransformer.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialAlloySmelter.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialAlloySmelter.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialArcFurnace.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialArcFurnace.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialBlastSmelter.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialBlastSmelter.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCentrifuge.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCentrifuge.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialChisel.java | 25 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCokeOven.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCokeOven.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCuttingFactory.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCuttingFactory.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElectrolyzer.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElectrolyzer.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElementDuplicator.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElementDuplicator.java) | 4 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialExtruder.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialExtruder.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFishPond.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFishPond.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFuelRefinery.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFuelRefinery.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialGeneratorArray.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialGeneratorArray.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMacerator.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMacerator.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMixer.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMixer.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMultiMachine.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMultiMachine.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMultiTank.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMultiTank.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialPlatePress.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialPlatePress.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialRockBreaker.java | 13 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialSifter.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialSifter.java) | 1 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialThermalCentrifuge.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialThermalCentrifuge.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialTreeFarm.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialTreeFarm.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWashPlant.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWashPlant.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWiremill.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWiremill.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIronBlastFurnace.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIronBlastFurnace.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIsaMill.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIsaMill.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLFTR.java | 36 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLargeTurbinesAndHeatExchanger.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLargeTurbinesAndHeatExchanger.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechMiniRaFusion.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechMiniRaFusion.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechNaqReactor.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechNaqReactor.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechNitroDieselFix.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechNitroDieselFix.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPollutionDevices.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPollutionDevices.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPowerBreakers.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPowerBreakers.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPowerSubStation.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPowerSubStation.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRTG.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRTG.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRocketFuelGenerator.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRocketFuelGenerator.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSafeBlock.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSafeBlock.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSemiFluidgenerators.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSemiFluidgenerators.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSimpleWasher.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSimpleWasher.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSolarGenerators.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSolarGenerators.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSolarTower.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSolarTower.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSteamCondenser.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSteamCondenser.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSteamMultis.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSteamMultis.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSuperChests.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSuperChests.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSuperConductionPoint.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSuperConductionPoint.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTeslaTower.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTeslaTower.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechThaumcraftDevices.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechThaumcraftDevices.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechThreadedBuffers.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechThreadedBuffers.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredChunkloaders.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredChunkloaders.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredFluidTanks.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredFluidTanks.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTreeFarmerTE.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTreeFarmerTE.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechWirelessChargers.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechWirelessChargers.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/NewHorizonsAccelerator.java (renamed from src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/NewHorizonsAccelerator.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/growthcraft/HANDLER_GC.java (renamed from src/Java/gtPlusPlus/xmod/growthcraft/HANDLER_GC.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/growthcraft/fishtrap/FishTrapHandler.java (renamed from src/Java/gtPlusPlus/xmod/growthcraft/fishtrap/FishTrapHandler.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/growthcraft/fishtrap/Growthcraft_New.java (renamed from src/Java/gtPlusPlus/xmod/growthcraft/fishtrap/Growthcraft_New.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/growthcraft/fishtrap/Growthcraft_Old.java (renamed from src/Java/gtPlusPlus/xmod/growthcraft/fishtrap/Growthcraft_Old.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/ic2/CustomInternalName.java (renamed from src/Java/gtPlusPlus/xmod/ic2/CustomInternalName.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/ic2/HANDLER_IC2.java (renamed from src/Java/gtPlusPlus/xmod/ic2/HANDLER_IC2.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/BlockRTG.java (renamed from src/Java/gtPlusPlus/xmod/ic2/block/RTGGenerator/BlockRTG.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/TileEntityRTG.java (renamed from src/Java/gtPlusPlus/xmod/ic2/block/RTGGenerator/TileEntityRTG.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/gui/CONTAINER_RTG.java (renamed from src/Java/gtPlusPlus/xmod/ic2/block/RTGGenerator/gui/CONTAINER_RTG.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/gui/GUI_RTG.java (renamed from src/Java/gtPlusPlus/xmod/ic2/block/RTGGenerator/gui/GUI_RTG.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/IC2_BlockKineticGenerator.java (renamed from src/Java/gtPlusPlus/xmod/ic2/block/kieticgenerator/IC2_BlockKineticGenerator.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/IC2_TEComponent.java (renamed from src/Java/gtPlusPlus/xmod/ic2/block/kieticgenerator/IC2_TEComponent.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/container/ContainerKineticWindgenerator.java (renamed from src/Java/gtPlusPlus/xmod/ic2/block/kieticgenerator/container/ContainerKineticWindgenerator.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/container/IC2_ContainerBase.java (renamed from src/Java/gtPlusPlus/xmod/ic2/block/kieticgenerator/container/IC2_ContainerBase.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/gui/GuiKineticWindGenerator.java (renamed from src/Java/gtPlusPlus/xmod/ic2/block/kieticgenerator/gui/GuiKineticWindGenerator.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/tileentity/TileEntityKineticWindGenerator.java (renamed from src/Java/gtPlusPlus/xmod/ic2/block/kieticgenerator/tileentity/TileEntityKineticWindGenerator.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/ic2/item/CustomKineticRotor.java (renamed from src/Java/gtPlusPlus/xmod/ic2/item/CustomKineticRotor.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradual.java (renamed from src/Java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradual.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradualInteger.java (renamed from src/Java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradualInteger.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/ic2/item/IC2_ItemIC2.java (renamed from src/Java/gtPlusPlus/xmod/ic2/item/IC2_ItemIC2.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/ic2/item/IC2_Items.java (renamed from src/Java/gtPlusPlus/xmod/ic2/item/IC2_Items.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/ic2/item/ItemGenerators.java (renamed from src/Java/gtPlusPlus/xmod/ic2/item/ItemGenerators.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/ic2/item/RotorBase.java (renamed from src/Java/gtPlusPlus/xmod/ic2/item/RotorBase.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/ic2/item/RotorIridium.java (renamed from src/Java/gtPlusPlus/xmod/ic2/item/RotorIridium.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/ic2/item/reactor/IC2_FuelRod_Base.java (renamed from src/Java/gtPlusPlus/xmod/ic2/item/reactor/IC2_FuelRod_Base.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java (renamed from src/Java/gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java) | 8 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/mekanism/HANDLER_Mekanism.java (renamed from src/Java/gtPlusPlus/xmod/mekanism/HANDLER_Mekanism.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/ob/GliderHandler.java (renamed from src/Java/gtPlusPlus/xmod/ob/GliderHandler.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/ob/HANDLER_OpenBlocks.java (renamed from src/Java/gtPlusPlus/xmod/ob/HANDLER_OpenBlocks.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/ob/SprinklerHandler.java (renamed from src/Java/gtPlusPlus/xmod/ob/SprinklerHandler.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/railcraft/HANDLER_Railcraft.java (renamed from src/Java/gtPlusPlus/xmod/railcraft/HANDLER_Railcraft.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/railcraft/utils/RailcraftUtils.java (renamed from src/Java/gtPlusPlus/xmod/railcraft/utils/RailcraftUtils.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/reliquary/HANDLER_Reliquary.java (renamed from src/Java/gtPlusPlus/xmod/reliquary/HANDLER_Reliquary.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/reliquary/item/ReliquaryItems.java (renamed from src/Java/gtPlusPlus/xmod/reliquary/item/ReliquaryItems.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/reliquary/util/AlkahestRecipeWrapper.java (renamed from src/Java/gtPlusPlus/xmod/reliquary/util/AlkahestRecipeWrapper.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/reliquary/util/ReliquaryRecipeHandler.java (renamed from src/Java/gtPlusPlus/xmod/reliquary/util/ReliquaryRecipeHandler.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/sc2/HANDLER_SC2.java (renamed from src/Java/gtPlusPlus/xmod/sc2/HANDLER_SC2.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/sc2/modules/ModuleExoticSeeds.java (renamed from src/Java/gtPlusPlus/xmod/sc2/modules/ModuleExoticSeeds.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/sol/HANDLER_SpiceOfLife.java (renamed from src/Java/gtPlusPlus/xmod/sol/HANDLER_SpiceOfLife.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/thaumcraft/HANDLER_Thaumcraft.java (renamed from src/Java/gtPlusPlus/xmod/thaumcraft/HANDLER_Thaumcraft.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/thaumcraft/aspect/GTPP_AspectCompat.java (renamed from src/Java/gtPlusPlus/xmod/thaumcraft/aspect/GTPP_AspectCompat.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/thaumcraft/aspect/GTPP_AspectStack.java (renamed from src/Java/gtPlusPlus/xmod/thaumcraft/aspect/GTPP_AspectStack.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/thaumcraft/commands/CommandDumpAspects.java (renamed from src/Java/gtPlusPlus/xmod/thaumcraft/commands/CommandDumpAspects.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/thaumcraft/objects/ThreadAspectScanner.java (renamed from src/Java/gtPlusPlus/xmod/thaumcraft/objects/ThreadAspectScanner.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/aspect/TC_AspectList_Wrapper.java (renamed from src/Java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/aspect/TC_AspectList_Wrapper.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/aspect/TC_Aspect_Wrapper.java (renamed from src/Java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/aspect/TC_Aspect_Wrapper.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/recipe/Base_Recipe_Wrapper.java (renamed from src/Java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/recipe/Base_Recipe_Wrapper.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/recipe/TC_CrucibleRecipe_Wrapper.java (renamed from src/Java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/recipe/TC_CrucibleRecipe_Wrapper.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/recipe/TC_IArcaneRecipe_Wrapper.java (renamed from src/Java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/recipe/TC_IArcaneRecipe_Wrapper.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/recipe/TC_InfusionEnchantmentRecipe_Wrapper.java (renamed from src/Java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/recipe/TC_InfusionEnchantmentRecipe_Wrapper.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/recipe/TC_InfusionRecipe_Wrapper.java (renamed from src/Java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/recipe/TC_InfusionRecipe_Wrapper.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_PageType_Wrapper.java (renamed from src/Java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_PageType_Wrapper.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchCategories_Wrapper.java (renamed from src/Java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchCategories_Wrapper.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchCategoryList_Wrapper.java (renamed from src/Java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchCategoryList_Wrapper.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchItem_Wrapper.java (renamed from src/Java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchItem_Wrapper.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchNoteData_Wrapper.java (renamed from src/Java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchNoteData_Wrapper.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchPage_Wrapper.java (renamed from src/Java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchPage_Wrapper.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/thaumcraft/util/ThaumcraftUtils.java (renamed from src/Java/gtPlusPlus/xmod/thaumcraft/util/ThaumcraftUtils.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/thermalfoundation/HANDLER_TF.java (renamed from src/Java/gtPlusPlus/xmod/thermalfoundation/HANDLER_TF.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Cryotheum.java (renamed from src/Java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Cryotheum.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Ender.java (renamed from src/Java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Ender.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Pyrotheum.java (renamed from src/Java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Pyrotheum.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Blocks.java (renamed from src/Java/gtPlusPlus/xmod/thermalfoundation/block/TF_Blocks.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/thermalfoundation/fluid/TF_Fluids.java (renamed from src/Java/gtPlusPlus/xmod/thermalfoundation/fluid/TF_Fluids.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/thermalfoundation/item/TF_Items.java (renamed from src/Java/gtPlusPlus/xmod/thermalfoundation/item/TF_Items.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/thermalfoundation/recipe/TF_Gregtech_Recipes.java (renamed from src/Java/gtPlusPlus/xmod/thermalfoundation/recipe/TF_Gregtech_Recipes.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/tinkers/HANDLER_Tinkers.java (renamed from src/Java/gtPlusPlus/xmod/tinkers/HANDLER_Tinkers.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/tinkers/material/BaseTinkersMaterial.java (renamed from src/Java/gtPlusPlus/xmod/tinkers/material/BaseTinkersMaterial.java) | 10 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/tinkers/util/TinkersDryingRecipe.java (renamed from src/Java/gtPlusPlus/xmod/tinkers/util/TinkersDryingRecipe.java) | 0 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/tinkers/util/TinkersUtils.java (renamed from src/Java/gtPlusPlus/xmod/tinkers/util/TinkersUtils.java) | 10 | ||||
-rw-r--r-- | src/main/java/gtPlusPlus/xmod/witchery/WitchUtils.java (renamed from src/Java/gtPlusPlus/xmod/witchery/WitchUtils.java) | 0 | ||||
-rw-r--r-- | src/main/java/vswe/stevescarts/ModuleData/GppModuleData.java (renamed from src/Java/vswe/stevescarts/ModuleData/GppModuleData.java) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/forestry/AlvearyFrame.png (renamed from src/resources/assets/forestry/AlvearyFrame.png) | bin | 931 -> 931 bytes | |||
-rw-r--r-- | src/main/resources/assets/forestry/AlvearyMutator.png (renamed from src/resources/assets/forestry/AlvearyMutator.png) | bin | 731 -> 731 bytes | |||
-rw-r--r-- | src/main/resources/assets/forestry/textures/blocks/apiculture/alveary.framehousing.off.png (renamed from src/resources/assets/forestry/textures/blocks/apiculture/alveary.framehousing.off.png) | bin | 670 -> 670 bytes | |||
-rw-r--r-- | src/main/resources/assets/forestry/textures/blocks/apiculture/alveary.framehousing.on.png (renamed from src/resources/assets/forestry/textures/blocks/apiculture/alveary.framehousing.on.png) | bin | 670 -> 670 bytes | |||
-rw-r--r-- | src/main/resources/assets/forestry/textures/blocks/apiculture/alveary.mutator.off.png (renamed from src/resources/assets/forestry/textures/blocks/apiculture/alveary.mutator.off.png) | bin | 558 -> 558 bytes | |||
-rw-r--r-- | src/main/resources/assets/forestry/textures/blocks/apiculture/alveary.mutator.on.png (renamed from src/resources/assets/forestry/textures/blocks/apiculture/alveary.mutator.on.png) | bin | 558 -> 558 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/lang/en_US.lang (renamed from src/resources/assets/gregtech/lang/en_US.lang) | 25 | ||||
-rw-r--r-- | src/main/resources/assets/gregtech/lang/zh_CN.lang (renamed from src/resources/assets/gregtech/lang/zh_CN.lang) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.argon.png (renamed from src/resources/assets/gregtech/textures/blocks/fluids/fluid.argon.png) | bin | 178 -> 178 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.nitrofuel_old.png (renamed from src/resources/assets/gregtech/textures/blocks/fluids/fluid.nitrofuel_old.png) | bin | 5538 -> 5538 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.nitrofuel_old.png.mcmeta (renamed from src/resources/assets/gregtech/textures/blocks/fluids/fluid.nitrofuel_old.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/iconsets/GAS_TURBINE_SIDE_ACTIVE.png (renamed from src/resources/assets/gregtech/textures/blocks/iconsets/GAS_TURBINE_SIDE_ACTIVE.png) | bin | 1505 -> 1505 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/iconsets/GAS_TURBINE_SIDE_ACTIVE.png.mcmeta (renamed from src/resources/assets/gregtech/textures/blocks/iconsets/GAS_TURBINE_SIDE_ACTIVE.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ACCELERATOR.png (renamed from src/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ACCELERATOR.png) | bin | 187 -> 187 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ACCELERATOR_ACTIVE.png (renamed from src/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ACCELERATOR_ACTIVE.png) | bin | 264 -> 264 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ACCELERATOR_ACTIVE.png.mcmeta (renamed from src/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ACCELERATOR_ACTIVE.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ACCELERATOR_TE.png (renamed from src/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ACCELERATOR_TE.png) | bin | 220 -> 220 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ACCELERATOR_TE_ACTIVE.png (renamed from src/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ACCELERATOR_TE_ACTIVE.png) | bin | 299 -> 299 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ACCELERATOR_TE_ACTIVE.png.mcmeta (renamed from src/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ACCELERATOR_TE_ACTIVE.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/iconsets/STEAM_TURBINE_SIDE_ACTIVE.png (renamed from src/resources/assets/gregtech/textures/blocks/iconsets/STEAM_TURBINE_SIDE_ACTIVE.png) | bin | 1505 -> 1505 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/iconsets/STEAM_TURBINE_SIDE_ACTIVE.png.mcmeta (renamed from src/resources/assets/gregtech/textures/blocks/iconsets/STEAM_TURBINE_SIDE_ACTIVE.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/block1.png (renamed from src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/block1.png) | bin | 437 -> 437 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/block2.png (renamed from src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/block2.png) | bin | 459 -> 459 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/block3.png (renamed from src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/block3.png) | bin | 490 -> 490 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/block4.png (renamed from src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/block4.png) | bin | 480 -> 480 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/block5.png (renamed from src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/block5.png) | bin | 414 -> 414 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/block6.png (renamed from src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/block6.png) | bin | 437 -> 437 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/foil.png (renamed from src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/foil.png) | bin | 368 -> 368 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/frameGt.png (renamed from src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/frameGt.png) | bin | 437 -> 437 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/ore.png (renamed from src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/ore.png) | bin | 271 -> 271 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/oreSmall.png (renamed from src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/oreSmall.png) | bin | 339 -> 339 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/ore_animated.png (renamed from src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/ore_animated.png) | bin | 591 -> 591 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/ore_animated.png.mcmeta (renamed from src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/ore_animated.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/pipeHuge.png (renamed from src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/pipeHuge.png) | bin | 348 -> 348 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/pipeLarge.png (renamed from src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/pipeLarge.png) | bin | 429 -> 429 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/pipeMedium.png (renamed from src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/pipeMedium.png) | bin | 429 -> 429 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/pipeSide.png (renamed from src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/pipeSide.png) | bin | 401 -> 401 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/pipeSmall.png (renamed from src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/pipeSmall.png) | bin | 427 -> 427 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/pipeTiny.png (renamed from src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/pipeTiny.png) | bin | 418 -> 418 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/void.png (renamed from src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/void.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/wire.png (renamed from src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/wire.png) | bin | 513 -> 513 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/block1.png (renamed from src/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/block1.png) | bin | 490 -> 490 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/block2.png (renamed from src/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/block2.png) | bin | 459 -> 459 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/block3.png (renamed from src/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/block3.png) | bin | 490 -> 490 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/block4.png (renamed from src/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/block4.png) | bin | 480 -> 480 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/block5.png (renamed from src/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/block5.png) | bin | 414 -> 414 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/block6.png (renamed from src/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/block6.png) | bin | 437 -> 437 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/foil.png (renamed from src/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/foil.png) | bin | 368 -> 368 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/frameGt.png (renamed from src/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/frameGt.png) | bin | 437 -> 437 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/ore.png (renamed from src/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/ore.png) | bin | 280 -> 280 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/oreSmall.png (renamed from src/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/oreSmall.png) | bin | 339 -> 339 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/pipeHuge.png (renamed from src/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/pipeHuge.png) | bin | 348 -> 348 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/pipeLarge.png (renamed from src/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/pipeLarge.png) | bin | 429 -> 429 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/pipeMedium.png (renamed from src/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/pipeMedium.png) | bin | 429 -> 429 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/pipeSide.png (renamed from src/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/pipeSide.png) | bin | 401 -> 401 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/pipeSmall.png (renamed from src/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/pipeSmall.png) | bin | 427 -> 427 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/pipeTiny.png (renamed from src/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/pipeTiny.png) | bin | 418 -> 418 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/void.png (renamed from src/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/void.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/wire.png (renamed from src/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/wire.png) | bin | 513 -> 513 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/block1.png (renamed from src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/block1.png) | bin | 437 -> 437 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/block2.png (renamed from src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/block2.png) | bin | 459 -> 459 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/block3.png (renamed from src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/block3.png) | bin | 490 -> 490 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/block4.png (renamed from src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/block4.png) | bin | 480 -> 480 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/block5.png (renamed from src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/block5.png) | bin | 414 -> 414 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/block6.png (renamed from src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/block6.png) | bin | 437 -> 437 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/foil.png (renamed from src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/foil.png) | bin | 368 -> 368 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/frameGt.png (renamed from src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/frameGt.png) | bin | 437 -> 437 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/ore.png (renamed from src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/ore.png) | bin | 589 -> 589 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/ore.png.mcmeta (renamed from src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/ore.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/oreSmall.png (renamed from src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/oreSmall.png) | bin | 339 -> 339 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/pipeHuge.png (renamed from src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/pipeHuge.png) | bin | 348 -> 348 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/pipeLarge.png (renamed from src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/pipeLarge.png) | bin | 429 -> 429 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/pipeMedium.png (renamed from src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/pipeMedium.png) | bin | 429 -> 429 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/pipeSide.png (renamed from src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/pipeSide.png) | bin | 401 -> 401 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/pipeSmall.png (renamed from src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/pipeSmall.png) | bin | 427 -> 427 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/pipeTiny.png (renamed from src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/pipeTiny.png) | bin | 418 -> 418 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/void.png (renamed from src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/void.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/wire.png (renamed from src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/wire.png) | bin | 513 -> 513 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/materialicons/REFINED/block1.png (renamed from src/resources/assets/gregtech/textures/blocks/materialicons/REFINED/block1.png) | bin | 487 -> 487 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/materialicons/REFINED/block2.png (renamed from src/resources/assets/gregtech/textures/blocks/materialicons/REFINED/block2.png) | bin | 459 -> 459 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/materialicons/REFINED/block3.png (renamed from src/resources/assets/gregtech/textures/blocks/materialicons/REFINED/block3.png) | bin | 490 -> 490 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/materialicons/REFINED/block4.png (renamed from src/resources/assets/gregtech/textures/blocks/materialicons/REFINED/block4.png) | bin | 480 -> 480 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/materialicons/REFINED/block5.png (renamed from src/resources/assets/gregtech/textures/blocks/materialicons/REFINED/block5.png) | bin | 414 -> 414 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/materialicons/REFINED/block6.png (renamed from src/resources/assets/gregtech/textures/blocks/materialicons/REFINED/block6.png) | bin | 437 -> 437 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/materialicons/REFINED/foil.png (renamed from src/resources/assets/gregtech/textures/blocks/materialicons/REFINED/foil.png) | bin | 368 -> 368 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/materialicons/REFINED/frameGt.png (renamed from src/resources/assets/gregtech/textures/blocks/materialicons/REFINED/frameGt.png) | bin | 437 -> 437 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/materialicons/REFINED/ore.png (renamed from src/resources/assets/gregtech/textures/blocks/materialicons/REFINED/ore.png) | bin | 632 -> 632 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/materialicons/REFINED/oreSmall.png (renamed from src/resources/assets/gregtech/textures/blocks/materialicons/REFINED/oreSmall.png) | bin | 339 -> 339 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/materialicons/REFINED/pipeHuge.png (renamed from src/resources/assets/gregtech/textures/blocks/materialicons/REFINED/pipeHuge.png) | bin | 500 -> 500 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/materialicons/REFINED/pipeLarge.png (renamed from src/resources/assets/gregtech/textures/blocks/materialicons/REFINED/pipeLarge.png) | bin | 555 -> 555 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/materialicons/REFINED/pipeMedium.png (renamed from src/resources/assets/gregtech/textures/blocks/materialicons/REFINED/pipeMedium.png) | bin | 569 -> 569 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/materialicons/REFINED/pipeSide.png (renamed from src/resources/assets/gregtech/textures/blocks/materialicons/REFINED/pipeSide.png) | bin | 540 -> 540 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/materialicons/REFINED/pipeSmall.png (renamed from src/resources/assets/gregtech/textures/blocks/materialicons/REFINED/pipeSmall.png) | bin | 545 -> 545 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/materialicons/REFINED/pipeTiny.png (renamed from src/resources/assets/gregtech/textures/blocks/materialicons/REFINED/pipeTiny.png) | bin | 560 -> 560 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/materialicons/REFINED/void.png (renamed from src/resources/assets/gregtech/textures/blocks/materialicons/REFINED/void.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/materialicons/REFINED/wire.png (renamed from src/resources/assets/gregtech/textures/blocks/materialicons/REFINED/wire.png) | bin | 513 -> 513 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/gui/HatchNbtConsumable_2By2.png (renamed from src/resources/assets/gregtech/textures/gui/HatchNbtConsumable_2By2.png) | bin | 1642 -> 1642 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/gui/HatchNbtConsumable_3By3.png (renamed from src/resources/assets/gregtech/textures/gui/HatchNbtConsumable_3By3.png) | bin | 1664 -> 1664 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/gui/HatchNbtConsumable_4By4.png (renamed from src/resources/assets/gregtech/textures/gui/HatchNbtConsumable_4By4.png) | bin | 1689 -> 1689 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/gui/PowerSubStation.png (renamed from src/resources/assets/gregtech/textures/gui/PowerSubStation.png) | bin | 970 -> 970 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/gui/basicmachines/BlastSmelter.png (renamed from src/resources/assets/gregtech/textures/gui/basicmachines/BlastSmelter.png) | bin | 1358 -> 1358 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/gui/basicmachines/Dehydrator.png (renamed from src/resources/assets/gregtech/textures/gui/basicmachines/Dehydrator.png) | bin | 1401 -> 1401 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/gui/basicmachines/FissionFuel.png | bin | 0 -> 2393 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/gui/basicmachines/LFTR.png (renamed from src/resources/assets/gregtech/textures/gui/basicmachines/LFTR.png) | bin | 1236 -> 1236 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/gui/basicmachines/MixerAdvanced.png (renamed from src/resources/assets/gregtech/textures/gui/basicmachines/MixerAdvanced.png) | bin | 1871 -> 1871 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/gui/multimachines/LFTR.png (renamed from src/resources/assets/gregtech/textures/gui/multimachines/LFTR.png) | bin | 1236 -> 1236 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/gt.Volumetric_Flask_32k.png (renamed from src/resources/assets/gregtech/textures/items/gt.Volumetric_Flask_32k.png) | bin | 1013 -> 1013 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/gt.Volumetric_Flask_32k.window.png (renamed from src/resources/assets/gregtech/textures/items/gt.Volumetric_Flask_32k.window.png) | bin | 399 -> 399 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/gt.Volumetric_Flask_8k.png (renamed from src/resources/assets/gregtech/textures/items/gt.Volumetric_Flask_8k.png) | bin | 1010 -> 1010 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/gt.Volumetric_Flask_8k.window.png (renamed from src/resources/assets/gregtech/textures/items/gt.Volumetric_Flask_8k.window.png) | bin | 398 -> 398 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/TURBINE_BLADE.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/TURBINE_BLADE.png) | bin | 395 -> 395 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/TURBINE_BLADE_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/TURBINE_BLADE_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/arrowGtPlastic.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/arrowGtPlastic.png) | bin | 291 -> 291 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/arrowGtPlastic_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/arrowGtPlastic_OVERLAY.png) | bin | 289 -> 289 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/arrowGtWood.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/arrowGtWood.png) | bin | 291 -> 291 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/arrowGtWood_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/arrowGtWood_OVERLAY.png) | bin | 302 -> 302 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/bolt.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/bolt.png) | bin | 161 -> 161 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/bolt_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/bolt_OVERLAY.png) | bin | 206 -> 206 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/cell.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/cell.png) | bin | 328 -> 328 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/cellPlasma.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/cellPlasma.png) | bin | 328 -> 328 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/cellPlasma_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/cellPlasma_OVERLAY.png) | bin | 290 -> 290 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/cell_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/cell_OVERLAY.png) | bin | 309 -> 309 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crateGtDust.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crateGtDust.png) | bin | 370 -> 370 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crateGtDust_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crateGtDust_OVERLAY.png) | bin | 506 -> 506 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crateGtGem.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crateGtGem.png) | bin | 401 -> 401 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crateGtGem_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crateGtGem_OVERLAY.png) | bin | 526 -> 526 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crateGtIngot.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crateGtIngot.png) | bin | 380 -> 380 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crateGtIngot_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crateGtIngot_OVERLAY.png) | bin | 517 -> 517 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crateGtPlate.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crateGtPlate.png) | bin | 455 -> 455 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crateGtPlate_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crateGtPlate_OVERLAY.png) | bin | 449 -> 449 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crushed.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crushed.png) | bin | 441 -> 441 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crushedCentrifuged.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crushedCentrifuged.png) | bin | 561 -> 561 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crushedCentrifuged_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crushedCentrifuged_OVERLAY.png) | bin | 430 -> 430 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crushedPurified.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crushedPurified.png) | bin | 460 -> 460 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crushedPurified_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crushedPurified_OVERLAY.png) | bin | 583 -> 583 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crushed_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crushed_OVERLAY.png) | bin | 426 -> 426 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/dust.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/dust.png) | bin | 312 -> 312 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/dustImpure.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/dustImpure.png) | bin | 312 -> 312 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/dustImpure_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/dustImpure_OVERLAY.png) | bin | 415 -> 415 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/dustPure.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/dustPure.png) | bin | 312 -> 312 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/dustPure_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/dustPure_OVERLAY.png) | bin | 383 -> 383 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/dustSmall.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/dustSmall.png) | bin | 286 -> 286 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/dustSmall_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/dustSmall_OVERLAY.png) | bin | 252 -> 252 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/dustTiny.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/dustTiny.png) | bin | 221 -> 221 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/dustTiny_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/dustTiny_OVERLAY.png) | bin | 221 -> 221 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/dust_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/dust_OVERLAY.png) | bin | 222 -> 222 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/foil.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/foil.png) | bin | 475 -> 475 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/foil_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/foil_OVERLAY.png) | bin | 539 -> 539 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gearGt.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gearGt.png) | bin | 434 -> 434 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gearGtSmall.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gearGtSmall.png) | bin | 563 -> 563 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gearGtSmall_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gearGtSmall_OVERLAY.png) | bin | 365 -> 365 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gearGt_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gearGt_OVERLAY.png) | bin | 503 -> 503 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gem.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gem.png) | bin | 419 -> 419 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gemChipped.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gemChipped.png) | bin | 575 -> 575 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gemChipped_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gemChipped_OVERLAY.png) | bin | 465 -> 465 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gemExquisite.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gemExquisite.png) | bin | 619 -> 619 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gemExquisite_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gemExquisite_OVERLAY.png) | bin | 613 -> 613 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gemFlawed.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gemFlawed.png) | bin | 504 -> 504 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gemFlawed_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gemFlawed_OVERLAY.png) | bin | 487 -> 487 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gemFlawless.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gemFlawless.png) | bin | 691 -> 691 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gemFlawless_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gemFlawless_OVERLAY.png) | bin | 504 -> 504 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gem_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gem_OVERLAY.png) | bin | 465 -> 465 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/handleMallet.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/handleMallet.png) | bin | 356 -> 356 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/handleMallet_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/handleMallet_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingot.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingot.png) | bin | 344 -> 344 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotDouble.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotDouble.png) | bin | 403 -> 403 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotDouble_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotDouble_OVERLAY.png) | bin | 419 -> 419 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotHot.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotHot.png) | bin | 335 -> 335 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotHot_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotHot_OVERLAY.png) | bin | 309 -> 309 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotQuadruple.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotQuadruple.png) | bin | 375 -> 375 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotQuadruple_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotQuadruple_OVERLAY.png) | bin | 379 -> 379 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotQuintuple.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotQuintuple.png) | bin | 358 -> 358 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotQuintuple_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotQuintuple_OVERLAY.png) | bin | 362 -> 362 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotTriple.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotTriple.png) | bin | 388 -> 388 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotTriple_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotTriple_OVERLAY.png) | bin | 395 -> 395 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingot_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingot_OVERLAY.png) | bin | 365 -> 365 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/lens.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/lens.png) | bin | 296 -> 296 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/lens_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/lens_OVERLAY.png) | bin | 594 -> 594 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/nugget.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/nugget.png) | bin | 250 -> 250 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/nugget_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/nugget_OVERLAY.png) | bin | 261 -> 261 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/plate.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/plate.png) | bin | 275 -> 275 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/plateDense.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/plateDense.png) | bin | 298 -> 298 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/plateDense_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/plateDense_OVERLAY.png) | bin | 322 -> 322 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/plateDouble.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/plateDouble.png) | bin | 297 -> 297 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/plateDouble_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/plateDouble_OVERLAY.png) | bin | 338 -> 338 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/plateQuadruple.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/plateQuadruple.png) | bin | 310 -> 310 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/plateQuadruple_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/plateQuadruple_OVERLAY.png) | bin | 372 -> 372 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/plateQuintuple.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/plateQuintuple.png) | bin | 312 -> 312 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/plateQuintuple_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/plateQuintuple_OVERLAY.png) | bin | 380 -> 380 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/plateTriple.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/plateTriple.png) | bin | 304 -> 304 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/plateTriple_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/plateTriple_OVERLAY.png) | bin | 360 -> 360 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/plate_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/plate_OVERLAY.png) | bin | 300 -> 300 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ring.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ring.png) | bin | 311 -> 311 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ring_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ring_OVERLAY.png) | bin | 413 -> 413 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/rotor.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/rotor.png) | bin | 443 -> 443 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/rotor_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/rotor_OVERLAY.png) | bin | 470 -> 470 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/round.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/round.png) | bin | 200 -> 200 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/round_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/round_OVERLAY.png) | bin | 205 -> 205 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/screw.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/screw.png) | bin | 199 -> 199 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/screw_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/screw_OVERLAY.png) | bin | 226 -> 226 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/spring.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/spring.png) | bin | 276 -> 276 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/springSmall.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/springSmall.png) | bin | 317 -> 317 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/springSmall_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/springSmall_OVERLAY.png) | bin | 283 -> 283 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/spring_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/spring_OVERLAY.png) | bin | 304 -> 304 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/stick.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/stick.png) | bin | 230 -> 230 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/stickLong.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/stickLong.png) | bin | 246 -> 246 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/stickLong_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/stickLong_OVERLAY.png) | bin | 217 -> 217 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/stick_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/stick_OVERLAY.png) | bin | 248 -> 248 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadArrow.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadArrow.png) | bin | 424 -> 424 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadArrow_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadArrow_OVERLAY.png) | bin | 309 -> 309 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadAxe.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadAxe.png) | bin | 255 -> 255 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadAxe_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadAxe_OVERLAY.png) | bin | 250 -> 250 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadBuzzSaw.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadBuzzSaw.png) | bin | 533 -> 533 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadBuzzSaw_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadBuzzSaw_OVERLAY.png) | bin | 557 -> 557 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadChainsaw.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadChainsaw.png) | bin | 531 -> 531 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadChainsaw_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadChainsaw_OVERLAY.png) | bin | 347 -> 347 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadDrill.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadDrill.png) | bin | 525 -> 525 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadDrill_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadDrill_OVERLAY.png) | bin | 348 -> 348 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadFile.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadFile.png) | bin | 257 -> 257 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadFile_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadFile_OVERLAY.png) | bin | 295 -> 295 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadHammer.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadHammer.png) | bin | 235 -> 235 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadHammer_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadHammer_OVERLAY.png) | bin | 253 -> 253 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadHoe.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadHoe.png) | bin | 230 -> 230 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadHoe_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadHoe_OVERLAY.png) | bin | 240 -> 240 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadMallet.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadMallet.png) | bin | 340 -> 340 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadMallet_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadMallet_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadPickaxe.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadPickaxe.png) | bin | 241 -> 241 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadPickaxe_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadPickaxe_OVERLAY.png) | bin | 280 -> 280 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadPlow.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadPlow.png) | bin | 268 -> 268 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadPlow_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadPlow_OVERLAY.png) | bin | 271 -> 271 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadSaw.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadSaw.png) | bin | 258 -> 258 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadSaw_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadSaw_OVERLAY.png) | bin | 280 -> 280 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadScrewdriver.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadScrewdriver.png) | bin | 178 -> 178 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadScrewdriver_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadScrewdriver_OVERLAY.png) | bin | 231 -> 231 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadSense.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadSense.png) | bin | 259 -> 259 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadSense_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadSense_OVERLAY.png) | bin | 285 -> 285 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadShovel.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadShovel.png) | bin | 251 -> 251 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadShovel_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadShovel_OVERLAY.png) | bin | 270 -> 270 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadSoldering.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadSoldering.png) | bin | 314 -> 314 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadSoldering_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadSoldering_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadSword.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadSword.png) | bin | 269 -> 269 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadSword_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadSword_OVERLAY.png) | bin | 280 -> 280 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadUniversalSpade.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadUniversalSpade.png) | bin | 254 -> 254 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadUniversalSpade_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadUniversalSpade_OVERLAY.png) | bin | 262 -> 262 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadWrench.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadWrench.png) | bin | 517 -> 517 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadWrench_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadWrench_OVERLAY.png) | bin | 310 -> 310 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/turbineBlade.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/turbineBlade.png) | bin | 395 -> 395 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/turbineBlade_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/turbineBlade_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/void.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/void.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/void_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/void_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/wireFine.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/wireFine.png) | bin | 481 -> 481 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/wireFine_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/wireFine_OVERLAY.png) | bin | 458 -> 458 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/TURBINE_BLADE.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/TURBINE_BLADE.png) | bin | 395 -> 395 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/TURBINE_BLADE_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/TURBINE_BLADE_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/arrowGtPlastic.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/arrowGtPlastic.png) | bin | 297 -> 297 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/arrowGtPlastic_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/arrowGtPlastic_OVERLAY.png) | bin | 283 -> 283 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/arrowGtWood.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/arrowGtWood.png) | bin | 297 -> 297 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/arrowGtWood_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/arrowGtWood_OVERLAY.png) | bin | 294 -> 294 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/bolt.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/bolt.png) | bin | 161 -> 161 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/bolt_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/bolt_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/cell.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/cell.png) | bin | 328 -> 328 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/cellPlasma.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/cellPlasma.png) | bin | 328 -> 328 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/cellPlasma_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/cellPlasma_OVERLAY.png) | bin | 290 -> 290 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/cell_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/cell_OVERLAY.png) | bin | 309 -> 309 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/crateGtDust.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/crateGtDust.png) | bin | 370 -> 370 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/crateGtDust_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/crateGtDust_OVERLAY.png) | bin | 506 -> 506 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/crateGtGem.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/crateGtGem.png) | bin | 401 -> 401 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/crateGtGem_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/crateGtGem_OVERLAY.png) | bin | 526 -> 526 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/crateGtIngot.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/crateGtIngot.png) | bin | 380 -> 380 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/crateGtIngot_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/crateGtIngot_OVERLAY.png) | bin | 517 -> 517 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/crateGtPlate.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/crateGtPlate.png) | bin | 455 -> 455 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/crateGtPlate_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/crateGtPlate_OVERLAY.png) | bin | 449 -> 449 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/crushed.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/crushed.png) | bin | 441 -> 441 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/crushedCentrifuged.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/crushedCentrifuged.png) | bin | 561 -> 561 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/crushedCentrifuged_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/crushedCentrifuged_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/crushedPurified.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/crushedPurified.png) | bin | 460 -> 460 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/crushedPurified_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/crushedPurified_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/crushed_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/crushed_OVERLAY.png) | bin | 448 -> 448 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/dust.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/dust.png) | bin | 312 -> 312 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/dustImpure.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/dustImpure.png) | bin | 312 -> 312 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/dustImpure_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/dustImpure_OVERLAY.png) | bin | 430 -> 430 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/dustPure.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/dustPure.png) | bin | 312 -> 312 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/dustPure_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/dustPure_OVERLAY.png) | bin | 424 -> 424 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/dustSmall.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/dustSmall.png) | bin | 286 -> 286 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/dustSmall_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/dustSmall_OVERLAY.png) | bin | 149 -> 149 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/dustTiny.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/dustTiny.png) | bin | 221 -> 221 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/dustTiny_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/dustTiny_OVERLAY.png) | bin | 149 -> 149 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/dust_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/dust_OVERLAY.png) | bin | 172 -> 172 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/foil.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/foil.png) | bin | 475 -> 475 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/foil_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/foil_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/gearGt.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/gearGt.png) | bin | 434 -> 434 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/gearGtSmall.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/gearGtSmall.png) | bin | 563 -> 563 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/gearGtSmall_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/gearGtSmall_OVERLAY.png) | bin | 312 -> 312 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/gearGt_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/gearGt_OVERLAY.png) | bin | 172 -> 172 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/gem.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/gem.png) | bin | 341 -> 341 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/gemChipped.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/gemChipped.png) | bin | 575 -> 575 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/gemChipped_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/gemChipped_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/gemExquisite.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/gemExquisite.png) | bin | 619 -> 619 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/gemExquisite_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/gemExquisite_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/gemFlawed.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/gemFlawed.png) | bin | 504 -> 504 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/gemFlawed_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/gemFlawed_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/gemFlawless.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/gemFlawless.png) | bin | 691 -> 691 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/gemFlawless_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/gemFlawless_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/gem_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/gem_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/handleMallet.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/handleMallet.png) | bin | 356 -> 356 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/handleMallet_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/handleMallet_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingot.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingot.png) | bin | 344 -> 344 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingotDouble.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingotDouble.png) | bin | 403 -> 403 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingotDouble_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingotDouble_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingotHot.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingotHot.png) | bin | 335 -> 335 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingotHot_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingotHot_OVERLAY.png) | bin | 309 -> 309 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingotQuadruple.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingotQuadruple.png) | bin | 375 -> 375 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingotQuadruple_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingotQuadruple_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingotQuintuple.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingotQuintuple.png) | bin | 358 -> 358 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingotQuintuple_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingotQuintuple_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingotTriple.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingotTriple.png) | bin | 388 -> 388 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingotTriple_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingotTriple_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingot_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingot_OVERLAY.png) | bin | 180 -> 180 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/lens.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/lens.png) | bin | 296 -> 296 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/lens_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/lens_OVERLAY.png) | bin | 556 -> 556 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/nugget.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/nugget.png) | bin | 250 -> 250 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/nugget_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/nugget_OVERLAY.png) | bin | 163 -> 163 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/plate.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/plate.png) | bin | 275 -> 275 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/plateDense.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/plateDense.png) | bin | 298 -> 298 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/plateDense_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/plateDense_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/plateDouble.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/plateDouble.png) | bin | 297 -> 297 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/plateDouble_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/plateDouble_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/plateQuadruple.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/plateQuadruple.png) | bin | 310 -> 310 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/plateQuadruple_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/plateQuadruple_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/plateQuintuple.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/plateQuintuple.png) | bin | 312 -> 312 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/plateQuintuple_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/plateQuintuple_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/plateTriple.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/plateTriple.png) | bin | 304 -> 304 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/plateTriple_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/plateTriple_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/plate_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/plate_OVERLAY.png) | bin | 173 -> 173 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/ring.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/ring.png) | bin | 311 -> 311 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/ring_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/ring_OVERLAY.png) | bin | 174 -> 174 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/rotor.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/rotor.png) | bin | 443 -> 443 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/rotor_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/rotor_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/round.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/round.png) | bin | 200 -> 200 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/round_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/round_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/screw.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/screw.png) | bin | 199 -> 199 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/screw_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/screw_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/spring.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/spring.png) | bin | 276 -> 276 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/springSmall.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/springSmall.png) | bin | 317 -> 317 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/springSmall_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/springSmall_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/spring_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/spring_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/stick.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/stick.png) | bin | 230 -> 230 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/stickLong.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/stickLong.png) | bin | 246 -> 246 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/stickLong_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/stickLong_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/stick_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/stick_OVERLAY.png) | bin | 230 -> 230 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadArrow.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadArrow.png) | bin | 399 -> 399 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadArrow_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadArrow_OVERLAY.png) | bin | 183 -> 183 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadAxe.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadAxe.png) | bin | 255 -> 255 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadAxe_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadAxe_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadBuzzSaw.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadBuzzSaw.png) | bin | 533 -> 533 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadBuzzSaw_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadBuzzSaw_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadChainsaw.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadChainsaw.png) | bin | 531 -> 531 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadChainsaw_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadChainsaw_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadDrill.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadDrill.png) | bin | 525 -> 525 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadDrill_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadDrill_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadFile.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadFile.png) | bin | 257 -> 257 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadFile_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadFile_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadHammer.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadHammer.png) | bin | 235 -> 235 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadHammer_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadHammer_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadHoe.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadHoe.png) | bin | 230 -> 230 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadHoe_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadHoe_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadMallet.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadMallet.png) | bin | 340 -> 340 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadMallet_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadMallet_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadPickaxe.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadPickaxe.png) | bin | 241 -> 241 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadPickaxe_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadPickaxe_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadPlow.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadPlow.png) | bin | 268 -> 268 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadPlow_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadPlow_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadSaw.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadSaw.png) | bin | 258 -> 258 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadSaw_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadSaw_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadScrewdriver.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadScrewdriver.png) | bin | 178 -> 178 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadScrewdriver_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadScrewdriver_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadSense.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadSense.png) | bin | 259 -> 259 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadSense_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadSense_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadShovel.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadShovel.png) | bin | 251 -> 251 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadShovel_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadShovel_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadSoldering.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadSoldering.png) | bin | 314 -> 314 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadSoldering_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadSoldering_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadSword.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadSword.png) | bin | 269 -> 269 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadSword_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadSword_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadUniversalSpade.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadUniversalSpade.png) | bin | 254 -> 254 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadUniversalSpade_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadUniversalSpade_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadWrench.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadWrench.png) | bin | 517 -> 517 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadWrench_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadWrench_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/turbineBlade.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/turbineBlade.png) | bin | 395 -> 395 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/turbineBlade_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/turbineBlade_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/void.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/void.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/void_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/void_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/wireFine.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/wireFine.png) | bin | 481 -> 481 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/wireFine_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/GEM_A/wireFine_OVERLAY.png) | bin | 271 -> 271 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/cell.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/cell.png) | bin | 328 -> 328 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/cellPlasma.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/cellPlasma.png) | bin | 328 -> 328 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/cellPlasma_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/cellPlasma_OVERLAY.png) | bin | 290 -> 290 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/cell_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/cell_OVERLAY.png) | bin | 309 -> 309 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crateGtDust.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crateGtDust.png) | bin | 370 -> 370 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crateGtDust_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crateGtDust_OVERLAY.png) | bin | 506 -> 506 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crateGtGem.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crateGtGem.png) | bin | 401 -> 401 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crateGtGem_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crateGtGem_OVERLAY.png) | bin | 526 -> 526 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crateGtIngot.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crateGtIngot.png) | bin | 380 -> 380 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crateGtIngot_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crateGtIngot_OVERLAY.png) | bin | 517 -> 517 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crateGtPlate.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crateGtPlate.png) | bin | 455 -> 455 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crateGtPlate_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crateGtPlate_OVERLAY.png) | bin | 449 -> 449 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crushedCentrifuged_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crushedCentrifuged_OVERLAY.png) | bin | 430 -> 430 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crushedPurified_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crushedPurified_OVERLAY.png) | bin | 583 -> 583 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crushed_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crushed_OVERLAY.png) | bin | 426 -> 426 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/dustTiny_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/dustTiny_OVERLAY.png) | bin | 221 -> 221 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/dust_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/dust_OVERLAY.png) | bin | 222 -> 222 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/foil_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/foil_OVERLAY.png) | bin | 539 -> 539 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/gearGtSmall_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/gearGtSmall_OVERLAY.png) | bin | 365 -> 365 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/gearGt_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/gearGt_OVERLAY.png) | bin | 503 -> 503 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/gemChipped_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/gemChipped_OVERLAY.png) | bin | 465 -> 465 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/gemExquisite_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/gemExquisite_OVERLAY.png) | bin | 613 -> 613 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/gemFlawed_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/gemFlawed_OVERLAY.png) | bin | 487 -> 487 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/gemFlawless_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/gemFlawless_OVERLAY.png) | bin | 504 -> 504 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/gem_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/gem_OVERLAY.png) | bin | 465 -> 465 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/ingotDouble_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/ingotDouble_OVERLAY.png) | bin | 419 -> 419 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/ingotHot_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/ingotHot_OVERLAY.png) | bin | 309 -> 309 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/ingotQuadruple_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/ingotQuadruple_OVERLAY.png) | bin | 379 -> 379 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/ingotQuintuple_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/ingotQuintuple_OVERLAY.png) | bin | 362 -> 362 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/ingotTriple_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/ingotTriple_OVERLAY.png) | bin | 395 -> 395 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/ingot_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/ingot_OVERLAY.png) | bin | 365 -> 365 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/lens.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/lens.png) | bin | 296 -> 296 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/lens_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/lens_OVERLAY.png) | bin | 594 -> 594 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/nugget_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/nugget_OVERLAY.png) | bin | 261 -> 261 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/plateDense_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/plateDense_OVERLAY.png) | bin | 322 -> 322 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/plateDouble_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/plateDouble_OVERLAY.png) | bin | 338 -> 338 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/plateQuadruple_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/plateQuadruple_OVERLAY.png) | bin | 372 -> 372 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/plateQuintuple_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/plateQuintuple_OVERLAY.png) | bin | 380 -> 380 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/plateTriple_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/plateTriple_OVERLAY.png) | bin | 360 -> 360 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/plate_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/plate_OVERLAY.png) | bin | 300 -> 300 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/ring_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/ring_OVERLAY.png) | bin | 413 -> 413 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/rotor_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/rotor_OVERLAY.png) | bin | 470 -> 470 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/round_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/round_OVERLAY.png) | bin | 205 -> 205 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/screw_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/screw_OVERLAY.png) | bin | 226 -> 226 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/springSmall_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/springSmall_OVERLAY.png) | bin | 283 -> 283 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/spring_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/spring_OVERLAY.png) | bin | 304 -> 304 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/stickLong_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/stickLong_OVERLAY.png) | bin | 217 -> 217 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/stick_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/stick_OVERLAY.png) | bin | 248 -> 248 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/wireFine.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/wireFine.png) | bin | 481 -> 481 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/wireFine_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/wireFine_OVERLAY.png) | bin | 458 -> 458 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/TURBINE_BLADE.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/TURBINE_BLADE.png) | bin | 395 -> 395 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/TURBINE_BLADE_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/TURBINE_BLADE_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/arrowGtPlastic.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/arrowGtPlastic.png) | bin | 297 -> 297 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/arrowGtPlastic_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/arrowGtPlastic_OVERLAY.png) | bin | 283 -> 283 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/arrowGtWood.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/arrowGtWood.png) | bin | 297 -> 297 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/arrowGtWood_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/arrowGtWood_OVERLAY.png) | bin | 294 -> 294 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/bolt.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/bolt.png) | bin | 161 -> 161 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/bolt_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/bolt_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/cell.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/cell.png) | bin | 328 -> 328 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/cellPlasma.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/cellPlasma.png) | bin | 328 -> 328 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/cellPlasma_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/cellPlasma_OVERLAY.png) | bin | 290 -> 290 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/cell_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/cell_OVERLAY.png) | bin | 309 -> 309 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crateGtDust.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crateGtDust.png) | bin | 370 -> 370 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crateGtDust_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crateGtDust_OVERLAY.png) | bin | 506 -> 506 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crateGtGem.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crateGtGem.png) | bin | 401 -> 401 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crateGtGem_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crateGtGem_OVERLAY.png) | bin | 526 -> 526 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crateGtIngot.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crateGtIngot.png) | bin | 380 -> 380 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crateGtIngot_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crateGtIngot_OVERLAY.png) | bin | 517 -> 517 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crateGtPlate.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crateGtPlate.png) | bin | 455 -> 455 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crateGtPlate_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crateGtPlate_OVERLAY.png) | bin | 449 -> 449 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crushed.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crushed.png) | bin | 462 -> 462 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crushedCentrifuged.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crushedCentrifuged.png) | bin | 561 -> 561 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crushedCentrifuged_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crushedCentrifuged_OVERLAY.png) | bin | 393 -> 393 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crushedPurified.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crushedPurified.png) | bin | 460 -> 460 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crushedPurified_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crushedPurified_OVERLAY.png) | bin | 538 -> 538 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crushed_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crushed_OVERLAY.png) | bin | 539 -> 539 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/dust.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/dust.png) | bin | 312 -> 312 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/dustImpure.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/dustImpure.png) | bin | 312 -> 312 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/dustImpure_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/dustImpure_OVERLAY.png) | bin | 430 -> 430 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/dustPure.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/dustPure.png) | bin | 312 -> 312 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/dustPure_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/dustPure_OVERLAY.png) | bin | 424 -> 424 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/dustSmall.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/dustSmall.png) | bin | 286 -> 286 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/dustSmall_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/dustSmall_OVERLAY.png) | bin | 256 -> 256 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/dustTiny.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/dustTiny.png) | bin | 221 -> 221 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/dustTiny_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/dustTiny_OVERLAY.png) | bin | 251 -> 251 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/dust_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/dust_OVERLAY.png) | bin | 281 -> 281 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/foil.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/foil.png) | bin | 475 -> 475 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/foil_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/foil_OVERLAY.png) | bin | 568 -> 568 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gearGt.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gearGt.png) | bin | 434 -> 434 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gearGtSmall.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gearGtSmall.png) | bin | 563 -> 563 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gearGtSmall_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gearGtSmall_OVERLAY.png) | bin | 312 -> 312 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gearGt_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gearGt_OVERLAY.png) | bin | 172 -> 172 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gem.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gem.png) | bin | 419 -> 419 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gemChipped.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gemChipped.png) | bin | 575 -> 575 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gemChipped_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gemChipped_OVERLAY.png) | bin | 511 -> 511 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gemExquisite.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gemExquisite.png) | bin | 619 -> 619 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gemExquisite_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gemExquisite_OVERLAY.png) | bin | 552 -> 552 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gemFlawed.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gemFlawed.png) | bin | 504 -> 504 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gemFlawed_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gemFlawed_OVERLAY.png) | bin | 543 -> 543 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gemFlawless.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gemFlawless.png) | bin | 691 -> 691 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gemFlawless_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gemFlawless_OVERLAY.png) | bin | 516 -> 516 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gem_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gem_OVERLAY.png) | bin | 437 -> 437 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/handleMallet.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/handleMallet.png) | bin | 356 -> 356 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/handleMallet_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/handleMallet_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingot.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingot.png) | bin | 344 -> 344 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotDouble.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotDouble.png) | bin | 403 -> 403 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotDouble_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotDouble_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotHot.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotHot.png) | bin | 335 -> 335 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotHot_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotHot_OVERLAY.png) | bin | 309 -> 309 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotQuadruple.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotQuadruple.png) | bin | 375 -> 375 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotQuadruple_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotQuadruple_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotQuintuple.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotQuintuple.png) | bin | 358 -> 358 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotQuintuple_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotQuintuple_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotTriple.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotTriple.png) | bin | 388 -> 388 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotTriple_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotTriple_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingot_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingot_OVERLAY.png) | bin | 333 -> 333 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/lens.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/lens.png) | bin | 296 -> 296 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/lens_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/lens_OVERLAY.png) | bin | 556 -> 556 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/nugget.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/nugget.png) | bin | 250 -> 250 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/nugget_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/nugget_OVERLAY.png) | bin | 286 -> 286 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/plate.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/plate.png) | bin | 275 -> 275 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/plateDense.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/plateDense.png) | bin | 298 -> 298 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/plateDense_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/plateDense_OVERLAY.png) | bin | 310 -> 310 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/plateDouble.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/plateDouble.png) | bin | 297 -> 297 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/plateDouble_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/plateDouble_OVERLAY.png) | bin | 319 -> 319 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/plateQuadruple.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/plateQuadruple.png) | bin | 310 -> 310 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/plateQuadruple_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/plateQuadruple_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/plateQuintuple.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/plateQuintuple.png) | bin | 312 -> 312 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/plateQuintuple_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/plateQuintuple_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/plateTriple.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/plateTriple.png) | bin | 304 -> 304 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/plateTriple_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/plateTriple_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/plate_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/plate_OVERLAY.png) | bin | 290 -> 290 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ring.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ring.png) | bin | 311 -> 311 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ring_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ring_OVERLAY.png) | bin | 174 -> 174 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/rotor.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/rotor.png) | bin | 443 -> 443 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/rotor_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/rotor_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/round.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/round.png) | bin | 200 -> 200 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/round_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/round_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/screw.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/screw.png) | bin | 199 -> 199 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/screw_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/screw_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/spring.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/spring.png) | bin | 276 -> 276 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/springSmall.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/springSmall.png) | bin | 317 -> 317 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/springSmall_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/springSmall_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/spring_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/spring_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/stick.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/stick.png) | bin | 230 -> 230 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/stickLong.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/stickLong.png) | bin | 246 -> 246 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/stickLong_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/stickLong_OVERLAY.png) | bin | 305 -> 305 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/stick_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/stick_OVERLAY.png) | bin | 314 -> 314 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadArrow.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadArrow.png) | bin | 399 -> 399 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadArrow_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadArrow_OVERLAY.png) | bin | 183 -> 183 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadAxe.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadAxe.png) | bin | 255 -> 255 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadAxe_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadAxe_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadBuzzSaw.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadBuzzSaw.png) | bin | 533 -> 533 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadBuzzSaw_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadBuzzSaw_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadChainsaw.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadChainsaw.png) | bin | 531 -> 531 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadChainsaw_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadChainsaw_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadDrill.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadDrill.png) | bin | 525 -> 525 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadDrill_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadDrill_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadFile.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadFile.png) | bin | 257 -> 257 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadFile_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadFile_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadHammer.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadHammer.png) | bin | 235 -> 235 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadHammer_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadHammer_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadHoe.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadHoe.png) | bin | 230 -> 230 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadHoe_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadHoe_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadMallet.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadMallet.png) | bin | 340 -> 340 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadMallet_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadMallet_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadPickaxe.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadPickaxe.png) | bin | 241 -> 241 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadPickaxe_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadPickaxe_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadPlow.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadPlow.png) | bin | 268 -> 268 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadPlow_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadPlow_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadSaw.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadSaw.png) | bin | 258 -> 258 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadSaw_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadSaw_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadScrewdriver.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadScrewdriver.png) | bin | 178 -> 178 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadScrewdriver_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadScrewdriver_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadSense.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadSense.png) | bin | 259 -> 259 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadSense_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadSense_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadShovel.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadShovel.png) | bin | 251 -> 251 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadShovel_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadShovel_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadSoldering.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadSoldering.png) | bin | 314 -> 314 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadSoldering_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadSoldering_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadSword.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadSword.png) | bin | 269 -> 269 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadSword_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadSword_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadUniversalSpade.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadUniversalSpade.png) | bin | 254 -> 254 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadUniversalSpade_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadUniversalSpade_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadWrench.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadWrench.png) | bin | 517 -> 517 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadWrench_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadWrench_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/turbineBlade.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/turbineBlade.png) | bin | 395 -> 395 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/turbineBlade_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/turbineBlade_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/void.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/void.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/void_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/void_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/wireFine.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/wireFine.png) | bin | 481 -> 481 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/wireFine_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/wireFine_OVERLAY.png) | bin | 271 -> 271 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/TURBINE_BLADE.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/TURBINE_BLADE.png) | bin | 395 -> 395 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/TURBINE_BLADE_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/TURBINE_BLADE_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/arrowGtPlastic.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/arrowGtPlastic.png) | bin | 297 -> 297 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/arrowGtPlastic_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/arrowGtPlastic_OVERLAY.png) | bin | 283 -> 283 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/arrowGtWood.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/arrowGtWood.png) | bin | 297 -> 297 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/arrowGtWood_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/arrowGtWood_OVERLAY.png) | bin | 294 -> 294 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/bolt.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/bolt.png) | bin | 161 -> 161 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/bolt_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/bolt_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/cell.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/cell.png) | bin | 328 -> 328 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/cellPlasma.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/cellPlasma.png) | bin | 328 -> 328 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/cellPlasma_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/cellPlasma_OVERLAY.png) | bin | 290 -> 290 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/cell_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/cell_OVERLAY.png) | bin | 309 -> 309 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/crateGtDust.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/crateGtDust.png) | bin | 370 -> 370 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/crateGtDust_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/crateGtDust_OVERLAY.png) | bin | 506 -> 506 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/crateGtGem.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/crateGtGem.png) | bin | 401 -> 401 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/crateGtGem_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/crateGtGem_OVERLAY.png) | bin | 526 -> 526 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/crateGtIngot.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/crateGtIngot.png) | bin | 380 -> 380 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/crateGtIngot_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/crateGtIngot_OVERLAY.png) | bin | 517 -> 517 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/crateGtPlate.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/crateGtPlate.png) | bin | 455 -> 455 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/crateGtPlate_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/crateGtPlate_OVERLAY.png) | bin | 449 -> 449 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/crushed.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/crushed.png) | bin | 441 -> 441 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/crushedCentrifuged.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/crushedCentrifuged.png) | bin | 561 -> 561 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/crushedCentrifuged_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/crushedCentrifuged_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/crushedPurified.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/crushedPurified.png) | bin | 460 -> 460 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/crushedPurified_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/crushedPurified_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/crushed_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/crushed_OVERLAY.png) | bin | 448 -> 448 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/dust.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/dust.png) | bin | 312 -> 312 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/dustImpure.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/dustImpure.png) | bin | 312 -> 312 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/dustImpure_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/dustImpure_OVERLAY.png) | bin | 430 -> 430 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/dustPure.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/dustPure.png) | bin | 312 -> 312 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/dustPure_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/dustPure_OVERLAY.png) | bin | 424 -> 424 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/dustSmall.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/dustSmall.png) | bin | 286 -> 286 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/dustSmall_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/dustSmall_OVERLAY.png) | bin | 149 -> 149 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/dustTiny.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/dustTiny.png) | bin | 221 -> 221 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/dustTiny_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/dustTiny_OVERLAY.png) | bin | 149 -> 149 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/dust_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/dust_OVERLAY.png) | bin | 172 -> 172 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/foil.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/foil.png) | bin | 475 -> 475 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/foil_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/foil_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/gearGt.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/gearGt.png) | bin | 434 -> 434 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/gearGtSmall.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/gearGtSmall.png) | bin | 563 -> 563 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/gearGtSmall_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/gearGtSmall_OVERLAY.png) | bin | 312 -> 312 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/gearGt_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/gearGt_OVERLAY.png) | bin | 172 -> 172 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/gem.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/gem.png) | bin | 419 -> 419 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/gemChipped.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/gemChipped.png) | bin | 575 -> 575 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/gemChipped_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/gemChipped_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/gemExquisite.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/gemExquisite.png) | bin | 619 -> 619 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/gemExquisite_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/gemExquisite_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/gemFlawed.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/gemFlawed.png) | bin | 504 -> 504 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/gemFlawed_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/gemFlawed_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/gemFlawless.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/gemFlawless.png) | bin | 691 -> 691 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/gemFlawless_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/gemFlawless_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/gem_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/gem_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/handleMallet.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/handleMallet.png) | bin | 356 -> 356 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/handleMallet_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/handleMallet_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/ingot.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/ingot.png) | bin | 344 -> 344 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/ingotDouble.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/ingotDouble.png) | bin | 403 -> 403 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/ingotDouble_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/ingotDouble_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/ingotHot.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/ingotHot.png) | bin | 335 -> 335 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/ingotHot_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/ingotHot_OVERLAY.png) | bin | 309 -> 309 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/ingotQuadruple.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/ingotQuadruple.png) | bin | 375 -> 375 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/ingotQuadruple_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/ingotQuadruple_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/ingotQuintuple.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/ingotQuintuple.png) | bin | 358 -> 358 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/ingotQuintuple_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/ingotQuintuple_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/ingotTriple.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/ingotTriple.png) | bin | 388 -> 388 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/ingotTriple_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/ingotTriple_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/ingot_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/ingot_OVERLAY.png) | bin | 180 -> 180 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/lens.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/lens.png) | bin | 296 -> 296 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/lens_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/lens_OVERLAY.png) | bin | 556 -> 556 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/nugget.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/nugget.png) | bin | 250 -> 250 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/nugget_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/nugget_OVERLAY.png) | bin | 163 -> 163 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/plate.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/plate.png) | bin | 275 -> 275 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/plateDense.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/plateDense.png) | bin | 298 -> 298 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/plateDense_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/plateDense_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/plateDouble.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/plateDouble.png) | bin | 297 -> 297 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/plateDouble_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/plateDouble_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/plateQuadruple.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/plateQuadruple.png) | bin | 310 -> 310 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/plateQuadruple_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/plateQuadruple_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/plateQuintuple.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/plateQuintuple.png) | bin | 312 -> 312 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/plateQuintuple_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/plateQuintuple_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/plateTriple.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/plateTriple.png) | bin | 304 -> 304 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/plateTriple_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/plateTriple_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/plate_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/plate_OVERLAY.png) | bin | 173 -> 173 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/ring.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/ring.png) | bin | 311 -> 311 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/ring_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/ring_OVERLAY.png) | bin | 174 -> 174 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/rotor.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/rotor.png) | bin | 443 -> 443 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/rotor_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/rotor_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/round.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/round.png) | bin | 200 -> 200 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/round_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/round_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/screw.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/screw.png) | bin | 199 -> 199 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/screw_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/screw_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/spring.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/spring.png) | bin | 276 -> 276 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/springSmall.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/springSmall.png) | bin | 317 -> 317 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/springSmall_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/springSmall_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/spring_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/spring_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/stick.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/stick.png) | bin | 230 -> 230 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/stickLong.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/stickLong.png) | bin | 246 -> 246 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/stickLong_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/stickLong_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/stick_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/stick_OVERLAY.png) | bin | 230 -> 230 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadArrow.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadArrow.png) | bin | 399 -> 399 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadArrow_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadArrow_OVERLAY.png) | bin | 183 -> 183 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadAxe.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadAxe.png) | bin | 255 -> 255 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadAxe_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadAxe_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadBuzzSaw.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadBuzzSaw.png) | bin | 533 -> 533 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadBuzzSaw_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadBuzzSaw_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadChainsaw.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadChainsaw.png) | bin | 531 -> 531 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadChainsaw_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadChainsaw_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadDrill.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadDrill.png) | bin | 525 -> 525 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadDrill_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadDrill_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadFile.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadFile.png) | bin | 257 -> 257 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadFile_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadFile_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadHammer.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadHammer.png) | bin | 235 -> 235 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadHammer_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadHammer_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadHoe.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadHoe.png) | bin | 230 -> 230 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadHoe_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadHoe_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadMallet.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadMallet.png) | bin | 340 -> 340 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadMallet_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadMallet_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadPickaxe.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadPickaxe.png) | bin | 241 -> 241 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadPickaxe_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadPickaxe_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadPlow.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadPlow.png) | bin | 268 -> 268 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadPlow_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadPlow_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadSaw.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadSaw.png) | bin | 258 -> 258 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadSaw_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadSaw_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadScrewdriver.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadScrewdriver.png) | bin | 178 -> 178 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadScrewdriver_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadScrewdriver_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadSense.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadSense.png) | bin | 259 -> 259 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadSense_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadSense_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadShovel.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadShovel.png) | bin | 251 -> 251 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadShovel_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadShovel_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadSoldering.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadSoldering.png) | bin | 314 -> 314 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadSoldering_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadSoldering_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadSword.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadSword.png) | bin | 269 -> 269 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadSword_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadSword_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadUniversalSpade.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadUniversalSpade.png) | bin | 254 -> 254 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadUniversalSpade_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadUniversalSpade_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadWrench.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadWrench.png) | bin | 517 -> 517 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadWrench_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadWrench_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/turbineBlade.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/turbineBlade.png) | bin | 395 -> 395 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/turbineBlade_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/turbineBlade_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/void.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/void.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/void_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/void_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/wireFine.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/wireFine.png) | bin | 481 -> 481 bytes | |||
-rw-r--r-- | src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/wireFine_OVERLAY.png (renamed from src/resources/assets/gregtech/textures/items/materialicons/REFINED/wireFine_OVERLAY.png) | bin | 271 -> 271 bytes | |||
-rw-r--r-- | src/main/resources/assets/ic2/lang/de_DE.lang (renamed from src/resources/assets/ic2/lang/de_DE.lang) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/ic2/lang/en_US.lang (renamed from src/resources/assets/ic2/lang/en_US.lang) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/ic2/lang/zh_CN.lang (renamed from src/resources/assets/ic2/lang/zh_CN.lang) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/ic2/textures/armor/hazmatEx_1.png (renamed from src/resources/assets/ic2/textures/armor/hazmatEx_1.png) | bin | 2669 -> 2669 bytes | |||
-rw-r--r-- | src/main/resources/assets/ic2/textures/armor/hazmatEx_2.png (renamed from src/resources/assets/ic2/textures/armor/hazmatEx_2.png) | bin | 967 -> 967 bytes | |||
-rw-r--r-- | src/main/resources/assets/ic2/textures/items/cell/HydrofluoricAcid.png (renamed from src/resources/assets/ic2/textures/items/cell/HydrofluoricAcid.png) | bin | 383 -> 383 bytes | |||
-rw-r--r-- | src/main/resources/assets/ic2/textures/items/cell/HydrogenChloride.png (renamed from src/resources/assets/ic2/textures/items/cell/HydrogenChloride.png) | bin | 402 -> 402 bytes | |||
-rw-r--r-- | src/main/resources/assets/ic2/textures/items/cell/LithiumHydroxide.png (renamed from src/resources/assets/ic2/textures/items/cell/LithiumHydroxide.png) | bin | 289 -> 289 bytes | |||
-rw-r--r-- | src/main/resources/assets/ic2/textures/items/cell/SulfurDioxide.png (renamed from src/resources/assets/ic2/textures/items/cell/SulfurDioxide.png) | bin | 402 -> 402 bytes | |||
-rw-r--r-- | src/main/resources/assets/ic2/textures/items/cell/SulfuricApatite.png (renamed from src/resources/assets/ic2/textures/items/cell/SulfuricApatite.png) | bin | 408 -> 408 bytes | |||
-rw-r--r-- | src/main/resources/assets/ic2/textures/items/cell/SulfuricLithium.png (renamed from src/resources/assets/ic2/textures/items/cell/SulfuricLithium.png) | bin | 431 -> 431 bytes | |||
-rw-r--r-- | src/main/resources/assets/ic2/textures/items/cell/SulfurousAcid.png (renamed from src/resources/assets/ic2/textures/items/cell/SulfurousAcid.png) | bin | 409 -> 409 bytes | |||
-rw-r--r-- | src/main/resources/assets/ic2/textures/items/cell/ThoriumTetraFluoride.png (renamed from src/resources/assets/ic2/textures/items/cell/ThoriumTetraFluoride.png) | bin | 460 -> 460 bytes | |||
-rw-r--r-- | src/main/resources/assets/ic2/textures/items/cell/UraniumHexaFluoride.png (renamed from src/resources/assets/ic2/textures/items/cell/UraniumHexaFluoride.png) | bin | 398 -> 398 bytes | |||
-rw-r--r-- | src/main/resources/assets/ic2/textures/items/cell/UraniumTetraFluoride.png (renamed from src/resources/assets/ic2/textures/items/cell/UraniumTetraFluoride.png) | bin | 445 -> 445 bytes | |||
-rw-r--r-- | src/main/resources/assets/ic2/textures/items/itemArmorHazmatChestplateEx.png (renamed from src/resources/assets/ic2/textures/items/itemArmorHazmatChestplateEx.png) | bin | 525 -> 525 bytes | |||
-rw-r--r-- | src/main/resources/assets/ic2/textures/items/itemArmorHazmatHelmetEx.png (renamed from src/resources/assets/ic2/textures/items/itemArmorHazmatHelmetEx.png) | bin | 464 -> 464 bytes | |||
-rw-r--r-- | src/main/resources/assets/ic2/textures/items/itemArmorHazmatLeggingsEx.png (renamed from src/resources/assets/ic2/textures/items/itemArmorHazmatLeggingsEx.png) | bin | 418 -> 418 bytes | |||
-rw-r--r-- | src/main/resources/assets/ic2/textures/items/itemArmorRubBootsEx.png (renamed from src/resources/assets/ic2/textures/items/itemArmorRubBootsEx.png) | bin | 459 -> 459 bytes | |||
-rw-r--r-- | src/main/resources/assets/ic2/textures/items/rotors/itemEnergeticRotor.png (renamed from src/resources/assets/ic2/textures/items/rotors/itemEnergeticRotor.png) | bin | 608 -> 608 bytes | |||
-rw-r--r-- | src/main/resources/assets/ic2/textures/items/rotors/itemIridiumRotor.png (renamed from src/resources/assets/ic2/textures/items/rotors/itemIridiumRotor.png) | bin | 555 -> 555 bytes | |||
-rw-r--r-- | src/main/resources/assets/ic2/textures/items/rotors/itemMagnaliumRotor.png (renamed from src/resources/assets/ic2/textures/items/rotors/itemMagnaliumRotor.png) | bin | 566 -> 566 bytes | |||
-rw-r--r-- | src/main/resources/assets/ic2/textures/items/rotors/itemTungstenSteelRotor.png (renamed from src/resources/assets/ic2/textures/items/rotors/itemTungstenSteelRotor.png) | bin | 523 -> 523 bytes | |||
-rw-r--r-- | src/main/resources/assets/ic2/textures/items/rotors/itemUltimetRotor.png (renamed from src/resources/assets/ic2/textures/items/rotors/itemUltimetRotor.png) | bin | 542 -> 542 bytes | |||
-rw-r--r-- | src/main/resources/assets/ic2/textures/items/rotors/itemVibrantRotor.png (renamed from src/resources/assets/ic2/textures/items/rotors/itemVibrantRotor.png) | bin | 575 -> 575 bytes | |||
-rw-r--r-- | src/main/resources/assets/ic2/textures/items/rotors/rotorEnergeticModel.png (renamed from src/resources/assets/ic2/textures/items/rotors/rotorEnergeticModel.png) | bin | 3650 -> 3650 bytes | |||
-rw-r--r-- | src/main/resources/assets/ic2/textures/items/rotors/rotorIridiumModel.png (renamed from src/resources/assets/ic2/textures/items/rotors/rotorIridiumModel.png) | bin | 3748 -> 3748 bytes | |||
-rw-r--r-- | src/main/resources/assets/ic2/textures/items/rotors/rotorMagnaliumModel.png (renamed from src/resources/assets/ic2/textures/items/rotors/rotorMagnaliumModel.png) | bin | 3748 -> 3748 bytes | |||
-rw-r--r-- | src/main/resources/assets/ic2/textures/items/rotors/rotorTungstenSteelModel.png (renamed from src/resources/assets/ic2/textures/items/rotors/rotorTungstenSteelModel.png) | bin | 3748 -> 3748 bytes | |||
-rw-r--r-- | src/main/resources/assets/ic2/textures/items/rotors/rotorUltimetModel.png (renamed from src/resources/assets/ic2/textures/items/rotors/rotorUltimetModel.png) | bin | 3748 -> 3748 bytes | |||
-rw-r--r-- | src/main/resources/assets/ic2/textures/items/rotors/rotorVibrantModel.png (renamed from src/resources/assets/ic2/textures/items/rotors/rotorVibrantModel.png) | bin | 3502 -> 3502 bytes | |||
-rw-r--r-- | src/main/resources/assets/minecraft/sounds/mob/witch/death.ogg (renamed from src/resources/assets/minecraft/sounds/mob/witch/death.ogg) | bin | 8428 -> 8428 bytes | |||
-rw-r--r-- | src/main/resources/assets/minecraft/sounds/mob/witch/hit1.ogg (renamed from src/resources/assets/minecraft/sounds/mob/witch/hit1.ogg) | bin | 5843 -> 5843 bytes | |||
-rw-r--r-- | src/main/resources/assets/minecraft/sounds/mob/witch/hit2.ogg (renamed from src/resources/assets/minecraft/sounds/mob/witch/hit2.ogg) | bin | 5455 -> 5455 bytes | |||
-rw-r--r-- | src/main/resources/assets/minecraft/sounds/mob/witch/hit3.ogg (renamed from src/resources/assets/minecraft/sounds/mob/witch/hit3.ogg) | bin | 5424 -> 5424 bytes | |||
-rw-r--r-- | src/main/resources/assets/minecraft/sounds/mob/witch/hit4.ogg (renamed from src/resources/assets/minecraft/sounds/mob/witch/hit4.ogg) | bin | 5160 -> 5160 bytes | |||
-rw-r--r-- | src/main/resources/assets/minecraft/sounds/mob/witch/idle1.ogg (renamed from src/resources/assets/minecraft/sounds/mob/witch/idle1.ogg) | bin | 8605 -> 8605 bytes | |||
-rw-r--r-- | src/main/resources/assets/minecraft/sounds/mob/witch/idle2.ogg (renamed from src/resources/assets/minecraft/sounds/mob/witch/idle2.ogg) | bin | 10948 -> 10948 bytes | |||
-rw-r--r-- | src/main/resources/assets/minecraft/sounds/mob/witch/idle3.ogg (renamed from src/resources/assets/minecraft/sounds/mob/witch/idle3.ogg) | bin | 7106 -> 7106 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/lang/de_DE.lang (renamed from src/resources/assets/miscutils/lang/de_DE.lang) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/lang/en_US.lang (renamed from src/resources/assets/miscutils/lang/en_US.lang) | 166 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/lang/ru_RU.lang (renamed from src/resources/assets/miscutils/lang/ru_RU.lang) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/lang/zh_CN.lang (renamed from src/resources/assets/miscutils/lang/zh_CN.lang) | 6484 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/DevCape.png (renamed from src/resources/assets/miscutils/textures/DevCape.png) | bin | 1232 -> 1232 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/DevCapeHD.png (renamed from src/resources/assets/miscutils/textures/DevCapeHD.png) | bin | 4788 -> 4788 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/FancyCape.png (renamed from src/resources/assets/miscutils/textures/FancyCape.png) | bin | 1191 -> 1191 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/FancyCapeHD.png (renamed from src/resources/assets/miscutils/textures/FancyCapeHD.png) | bin | 9643 -> 9643 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/Orange.png (renamed from src/resources/assets/miscutils/textures/Orange.png) | bin | 364 -> 364 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/OrangeHD.png (renamed from src/resources/assets/miscutils/textures/OrangeHD.png) | bin | 5904 -> 5904 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/PatreonCapeHD.png (renamed from src/resources/assets/miscutils/textures/PatreonCapeHD.png) | bin | 10267 -> 10267 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/TesterCape.png (renamed from src/resources/assets/miscutils/textures/TesterCape.png) | bin | 1101 -> 1101 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/TesterCapeHD.png (renamed from src/resources/assets/miscutils/textures/TesterCapeHD.png) | bin | 7976 -> 7976 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/aspects/Sagrausten.png (renamed from src/resources/assets/miscutils/textures/aspects/Sagrausten.png) | bin | 2997 -> 2997 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/aspects/Slusium.png (renamed from src/resources/assets/miscutils/textures/aspects/Slusium.png) | bin | 697 -> 697 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/aspects/Xablum.png (renamed from src/resources/assets/miscutils/textures/aspects/Xablum.png) | bin | 563 -> 563 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/aspects/Xenil.png (renamed from src/resources/assets/miscutils/textures/aspects/Xenil.png) | bin | 1000 -> 1000 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/aspects/Zetralt.png (renamed from src/resources/assets/miscutils/textures/aspects/Zetralt.png) | bin | 1461 -> 1461 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/FirePit/Firepit.tcn (renamed from src/resources/assets/miscutils/textures/blocks/FirePit/Firepit.tcn) | bin | 1583 -> 1583 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/FirePit/mossyFirepit.png (renamed from src/resources/assets/miscutils/textures/blocks/FirePit/mossyFirepit.png) | bin | 612 -> 612 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/SwirlBigBlue.png (renamed from src/resources/assets/miscutils/textures/blocks/SwirlBigBlue.png) | bin | 259 -> 259 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/SwirlBlue.png (renamed from src/resources/assets/miscutils/textures/blocks/SwirlBlue.png) | bin | 284 -> 284 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/SwirlCyan.png (renamed from src/resources/assets/miscutils/textures/blocks/SwirlCyan.png) | bin | 286 -> 286 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/SwirlGray.png (renamed from src/resources/assets/miscutils/textures/blocks/SwirlGray.png) | bin | 270 -> 270 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/SwirlRed.png (renamed from src/resources/assets/miscutils/textures/blocks/SwirlRed.png) | bin | 286 -> 286 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/SwirlYellow.png (renamed from src/resources/assets/miscutils/textures/blocks/SwirlYellow.png) | bin | 280 -> 280 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/CASING_AMAZON.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/CASING_AMAZON.png) | bin | 677 -> 677 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/0.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/0.png) | bin | 822 -> 822 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/1.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/1.png) | bin | 822 -> 822 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/10.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/10.png) | bin | 822 -> 822 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/11.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/11.png) | bin | 822 -> 822 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/12.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/12.png) | bin | 822 -> 822 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/13.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/13.png) | bin | 822 -> 822 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/14.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/14.png) | bin | 822 -> 822 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/15.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/15.png) | bin | 822 -> 822 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/16.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/16.png) | bin | 364 -> 364 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/17.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/17.png) | bin | 822 -> 822 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/18.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/18.png) | bin | 822 -> 822 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/19.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/19.png) | bin | 822 -> 822 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/2.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/2.png) | bin | 822 -> 822 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/20.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/20.png) | bin | 822 -> 822 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/21.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/21.png) | bin | 822 -> 822 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/22.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/22.png) | bin | 822 -> 822 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/23.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/23.png) | bin | 822 -> 822 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/24.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/24.png) | bin | 822 -> 822 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/25.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/25.png) | bin | 822 -> 822 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/26.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/26.png) | bin | 822 -> 822 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/27.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/27.png) | bin | 822 -> 822 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/28.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/28.png) | bin | 822 -> 822 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/29.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/29.png) | bin | 822 -> 822 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/3.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/3.png) | bin | 822 -> 822 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/30.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/30.png) | bin | 822 -> 822 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/31.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/31.png) | bin | 822 -> 822 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/4.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/4.png) | bin | 822 -> 822 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/5.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/5.png) | bin | 822 -> 822 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/6.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/6.png) | bin | 822 -> 822 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/7.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/7.png) | bin | 822 -> 822 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/8.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/8.png) | bin | 822 -> 822 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/9.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/9.png) | bin | 822 -> 822 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/wood_shelf.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/wood_shelf.png) | bin | 822 -> 822 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/wood_shelf_cans.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/wood_shelf_cans.png) | bin | 822 -> 822 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/wood_shelf_paper.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/wood_shelf_paper.png) | bin | 822 -> 822 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/DecayablesChest_bottom.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/DecayablesChest_bottom.png) | bin | 738 -> 738 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/DecayablesChest_bottom_old.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/DecayablesChest_bottom_old.png) | bin | 617 -> 617 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/DecayablesChest_full.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/DecayablesChest_full.png) | bin | 2249 -> 2249 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/DecayablesChest_side.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/DecayablesChest_side.png) | bin | 666 -> 666 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/DecayablesChest_top.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/DecayablesChest_top.png) | bin | 670 -> 670 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/EggBox_full.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/EggBox_full.png) | bin | 1777 -> 1777 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/EggBox_side.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/EggBox_side.png) | bin | 504 -> 504 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/EggBox_top.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/EggBox_top.png) | bin | 654 -> 654 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/FluidReactor/OVERLAY_FRONT.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/FluidReactor/OVERLAY_FRONT.png) | bin | 313 -> 313 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/FluidReactor/OVERLAY_FRONT_ACTIVE.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/FluidReactor/OVERLAY_FRONT_ACTIVE.png) | bin | 704 -> 704 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/FluidReactor/OVERLAY_FRONT_ACTIVE.png.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/FluidReactor/OVERLAY_FRONT_ACTIVE.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/FluidReactor/OVERLAY_SIDE.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/FluidReactor/OVERLAY_SIDE.png) | bin | 333 -> 333 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/FluidReactor/OVERLAY_SIDE_ACTIVE.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/FluidReactor/OVERLAY_SIDE_ACTIVE.png) | bin | 1049 -> 1049 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/FluidReactor/OVERLAY_SIDE_ACTIVE.png.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/FluidReactor/OVERLAY_SIDE_ACTIVE.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/FluidReactor/OVERLAY_TOP.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/FluidReactor/OVERLAY_TOP.png) | bin | 228 -> 228 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/FluidReactor/OVERLAY_TOP_ACTIVE.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/FluidReactor/OVERLAY_TOP_ACTIVE.png) | bin | 224 -> 224 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/Generic_Creative_Texture.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/Generic_Creative_Texture.png) | bin | 383 -> 383 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_ADVANCED_CRYOGENIC.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_ADVANCED_CRYOGENIC.png) | bin | 586 -> 586 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_ADVANCED_VOLCANUS.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_ADVANCED_VOLCANUS.png) | bin | 601 -> 601 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_CENTRIFUGE.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_CENTRIFUGE.png) | bin | 632 -> 632 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_FARM_MANAGER_STRUCTURAL.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_FARM_MANAGER_STRUCTURAL.png) | bin | 522 -> 522 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_FIREBOX_STABALLOY.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_FIREBOX_STABALLOY.png) | bin | 825 -> 825 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_FLOTATION.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_FLOTATION.png) | bin | 647 -> 647 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_FLUID_INCOLOY_DS.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_FLUID_INCOLOY_DS.png) | bin | 1232 -> 1232 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_FUSION_FRONT.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_FUSION_FRONT.png) | bin | 515 -> 515 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_FUSION_FRONT_ACTIVE.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_FUSION_FRONT_ACTIVE.png) | bin | 502 -> 502 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_GEARBOX_T1.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_GEARBOX_T1.png) | bin | 633 -> 633 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_GRINDING_FACTORY.png | bin | 0 -> 677 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_LAURENIUM.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_LAURENIUM.png) | bin | 416 -> 416 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_PIPE_T1.png | bin | 0 -> 656 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_ROCKETDYNE.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_ROCKETDYNE.png) | bin | 643 -> 643 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_GRISIUM.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_GRISIUM.png) | bin | 662 -> 662 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_HASTELLOY_N.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_HASTELLOY_N.png) | bin | 642 -> 642 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_HASTELLOY_X.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_HASTELLOY_X.png) | bin | 649 -> 649 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_INCOLOY_020.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_INCOLOY_020.png) | bin | 665 -> 665 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_INCOLOY_DS.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_INCOLOY_DS.png) | bin | 660 -> 660 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_INCOLOY_MA956.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_INCOLOY_MA956.png) | bin | 654 -> 654 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_MARAGINGSTEEL.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_MARAGINGSTEEL.png) | bin | 394 -> 394 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_POTIN.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_POTIN.png) | bin | 635 -> 635 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_RED_STEEL.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_RED_STEEL.png) | bin | 529 -> 529 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_STELLITE.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_STELLITE.png) | bin | 659 -> 659 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_TALONITE.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_TALONITE.png) | bin | 665 -> 665 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_TANTALLOY61.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_TANTALLOY61.png) | bin | 654 -> 654 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_TRINIUM_NAQUADAH.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_TRINIUM_NAQUADAH.png) | bin | 459 -> 459 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_TRINIUM_NAQUADAH_CARBON.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_TRINIUM_NAQUADAH_CARBON.png) | bin | 436 -> 436 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_TRINIUM_NAQUADAH_VENT.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_TRINIUM_NAQUADAH_VENT.png) | bin | 623 -> 623 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_TRINIUM_TITANIUM.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_TRINIUM_TITANIUM.png) | bin | 504 -> 504 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_TUMBAGA.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_TUMBAGA.png) | bin | 662 -> 662 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_ZERON100.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_ZERON100.png) | bin | 649 -> 649 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_ZIRCONIUM_CARBIDE.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_ZIRCONIUM_CARBIDE.png) | bin | 665 -> 665 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_PESTKILLER_TOP.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_PESTKILLER_TOP.png) | bin | 624 -> 624 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/ModularTable_output.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/ModularTable_output.png) | bin | 260 -> 260 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/ModularTable_side.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/ModularTable_side.png) | bin | 244 -> 244 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/ModularTable_top.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/ModularTable_top.png) | bin | 289 -> 289 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorColdTrap/OVERLAY_FRONT.png | bin | 0 -> 344 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorColdTrap/OVERLAY_FRONT_ACTIVE.png | bin | 0 -> 387 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorColdTrap/OVERLAY_SIDE.png | bin | 0 -> 345 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorColdTrap/OVERLAY_SIDE_ACTIVE.png | bin | 0 -> 668 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorColdTrap/OVERLAY_SIDE_ACTIVE.png.mcmeta | 6 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorColdTrap/OVERLAY_TOP.png | bin | 0 -> 228 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorColdTrap/OVERLAY_TOP_ACTIVE.png | bin | 0 -> 224 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorProcessingUnit/OVERLAY_FRONT.png | bin | 0 -> 439 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorProcessingUnit/OVERLAY_FRONT_ACTIVE.png | bin | 0 -> 704 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorProcessingUnit/OVERLAY_FRONT_ACTIVE.png.mcmeta | 6 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorProcessingUnit/OVERLAY_SIDE.png | bin | 0 -> 439 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorProcessingUnit/OVERLAY_SIDE_ACTIVE.png | bin | 0 -> 1049 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorProcessingUnit/OVERLAY_SIDE_ACTIVE.png.mcmeta | 6 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorProcessingUnit/OVERLAY_TOP.png | bin | 0 -> 367 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorProcessingUnit/OVERLAY_TOP_ACTIVE.png | bin | 0 -> 366 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/MACHINE_CASING_VENT.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/MACHINE_CASING_VENT.png) | bin | 467 -> 467 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Side_0.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Side_0.png) | bin | 1448 -> 1448 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Side_1.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Side_1.png) | bin | 1444 -> 1444 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Side_2.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Side_2.png) | bin | 1446 -> 1446 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Side_3.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Side_3.png) | bin | 1446 -> 1446 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Side_4.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Side_4.png) | bin | 1443 -> 1443 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Top_0.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Top_0.png) | bin | 1405 -> 1405 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Top_1.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Top_1.png) | bin | 1403 -> 1403 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Top_2.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Top_2.png) | bin | 1403 -> 1403 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Top_3.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Top_3.png) | bin | 1402 -> 1402 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Top_4.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Top_4.png) | bin | 1400 -> 1400 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/STEAM_TURBINE_SIDE_ACTIVE.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/STEAM_TURBINE_SIDE_ACTIVE.png) | bin | 1505 -> 1505 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/STEAM_TURBINE_SIDE_ACTIVE.png.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/STEAM_TURBINE_SIDE_ACTIVE.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/_PlaceHolder.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/_PlaceHolder.png) | bin | 696 -> 696 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_dimensional.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_dimensional.png) | bin | 1660 -> 1660 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_dimensional.png.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_dimensional.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_dimensional_cover_blue.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_dimensional_cover_blue.png) | bin | 1457 -> 1457 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_dimensional_cover_blue.png.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_dimensional_cover_blue.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_dimensional_cover_orange.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_dimensional_cover_orange.png) | bin | 1383 -> 1383 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_dimensional_cover_orange.png.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_dimensional_cover_orange.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_lesu.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_lesu.png) | bin | 822 -> 822 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_matterfab.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_matterfab.png) | bin | 296 -> 296 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_matterfab_active.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_matterfab_active.png) | bin | 277 -> 277 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_matterfab_active_animated.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_matterfab_active_animated.png) | bin | 694 -> 694 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_matterfab_active_animated.png.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_matterfab_active_animated.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_matterfab_animated.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_matterfab_animated.png) | bin | 762 -> 762 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_matterfab_animated.png.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_matterfab_animated.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_oil.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_oil.png) | bin | 238 -> 238 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_screen_frequency.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_screen_frequency.png) | bin | 427 -> 427 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_screen_logo.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_screen_logo.png) | bin | 526 -> 526 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_screen_logo.png.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_screen_logo.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_screen_random1.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_screen_random1.png) | bin | 12342 -> 12342 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_screen_random1.png.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_screen_random1.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_screen_random2.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_screen_random2.png) | bin | 12342 -> 12342 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_screen_random2.png.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_screen_random2.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_screen_random3.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_screen_random3.png) | bin | 12342 -> 12342 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_screen_random3.png.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_screen_random3.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_uum.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_uum.png) | bin | 334 -> 334 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_vent_rotating.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_vent_rotating.png) | bin | 3126 -> 3126 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_vent_rotating.png.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_vent_rotating.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_water.png | bin | 0 -> 218 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/audio_out.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/audio_out.png) | bin | 275 -> 275 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/audio_out_active.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/audio_out_active.png) | bin | 433 -> 433 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/audio_out_active.png.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/audio_out_active.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/bronze_side.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/bronze_side.png) | bin | 395 -> 395 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/bronze_side_cabinet.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/bronze_side_cabinet.png) | bin | 401 -> 401 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/bronze_top_crafting.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/bronze_top_crafting.png) | bin | 383 -> 383 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/cover_charger.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/cover_charger.png) | bin | 284 -> 284 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/cover_crafting.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/cover_crafting.png) | bin | 822 -> 822 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/cover_discharge.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/cover_discharge.png) | bin | 272 -> 272 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/cover_redstone_conductor.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/cover_redstone_conductor.png) | bin | 822 -> 822 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/cover_redstone_emitter.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/cover_redstone_emitter.png) | bin | 822 -> 822 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/dirt_podzol_top.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/dirt_podzol_top.png) | bin | 823 -> 823 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/fishtrap.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/fishtrap.png) | bin | 326 -> 326 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/machine_bottom.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/gt4/machine_bottom.png) | bin | 822 -> 822 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/machine_side.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/gt4/machine_side.png) | bin | 822 -> 822 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/machine_side_cabinet.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/gt4/machine_side_cabinet.png) | bin | 822 -> 822 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/machine_top.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/gt4/machine_top.png) | bin | 822 -> 822 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/high_adv_machine.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/high_adv_machine.png) | bin | 822 -> 822 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/high_adv_machine_dimensional.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/high_adv_machine_dimensional.png) | bin | 1713 -> 1713 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/high_adv_machine_dimensional.png.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/high_adv_machine_dimensional.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/log_acacia_top.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/log_acacia_top.png) | bin | 603 -> 603 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/machine_bottom.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/machine_bottom.png) | bin | 822 -> 822 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/machine_top.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/machine_top.png) | bin | 822 -> 822 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/machine_top_dieselmotor.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/machine_top_dieselmotor.png) | bin | 258 -> 258 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/machine_top_dieselmotor2.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/machine_top_dieselmotor2.png) | bin | 233 -> 233 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/machine_top_dieselmotor2_active.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/machine_top_dieselmotor2_active.png) | bin | 395 -> 395 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/machine_top_dieselmotor2_active.png.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/machine_top_dieselmotor2_active.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/machine_top_dieselmotor_active.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/machine_top_dieselmotor_active.png) | bin | 427 -> 427 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/machine_top_dieselmotor_active.png.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/machine_top_dieselmotor_active.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/machine_top_vent_rotating.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/machine_top_vent_rotating.png) | bin | 517 -> 517 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/machine_top_vent_rotating.png.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/machine_top_vent_rotating.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/machine_top_vent_rotating_fast.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/machine_top_vent_rotating_fast.png) | bin | 517 -> 517 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/machine_top_vent_rotating_fast.png.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/machine_top_vent_rotating_fast.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/sewer_adv_sides.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/sewer_adv_sides.png) | bin | 379 -> 379 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/sewer_adv_top.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/sewer_adv_top.png) | bin | 373 -> 373 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/sewer_sides.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/sewer_sides.png) | bin | 375 -> 375 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/TileEntities/sewer_top.png (renamed from src/resources/assets/miscutils/textures/blocks/TileEntities/sewer_top.png) | bin | 375 -> 375 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/blockAntiGrief.png (renamed from src/resources/assets/miscutils/textures/blocks/blockAntiGrief.png) | bin | 1086 -> 1086 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/blockBlock.png (renamed from src/resources/assets/miscutils/textures/blocks/blockBlock.png) | bin | 424 -> 424 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/blockBloodSteel.png (renamed from src/resources/assets/miscutils/textures/blocks/blockBloodSteel.png) | bin | 529 -> 529 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/blockDefault.png (renamed from src/resources/assets/miscutils/textures/blocks/blockDefault.png) | bin | 942 -> 942 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/blockFrameGt.png (renamed from src/resources/assets/miscutils/textures/blocks/blockFrameGt.png) | bin | 437 -> 437 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/blockMFEffect.png (renamed from src/resources/assets/miscutils/textures/blocks/blockMFEffect.png) | bin | 205 -> 205 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/blockNuclearFueledHeliumGenerator.png (renamed from src/resources/assets/miscutils/textures/blocks/blockNuclearFueledHeliumGenerator.png) | bin | 440 -> 440 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/blockOre_Overlay.png (renamed from src/resources/assets/miscutils/textures/blocks/blockOre_Overlay.png) | bin | 231 -> 231 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/blockStaballoy.png (renamed from src/resources/assets/miscutils/textures/blocks/blockStaballoy.png) | bin | 942 -> 942 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/blockStone.png (renamed from src/resources/assets/miscutils/textures/blocks/blockStone.png) | bin | 223 -> 223 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/chrono/CyberPanel.png (renamed from src/resources/assets/miscutils/textures/blocks/chrono/CyberPanel.png) | bin | 328 -> 328 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/chrono/CyberPanel2.png (renamed from src/resources/assets/miscutils/textures/blocks/chrono/CyberPanel2.png) | bin | 350 -> 350 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/chrono/MetalFunnel.png (renamed from src/resources/assets/miscutils/textures/blocks/chrono/MetalFunnel.png) | bin | 378 -> 378 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/chrono/MetalGrate.png (renamed from src/resources/assets/miscutils/textures/blocks/chrono/MetalGrate.png) | bin | 333 -> 333 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/chrono/MetalGrate2.png (renamed from src/resources/assets/miscutils/textures/blocks/chrono/MetalGrate2.png) | bin | 269 -> 269 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/chrono/MetalGrate3.png (renamed from src/resources/assets/miscutils/textures/blocks/chrono/MetalGrate3.png) | bin | 292 -> 292 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/chrono/MetalGrateA_Solid.png (renamed from src/resources/assets/miscutils/textures/blocks/chrono/MetalGrateA_Solid.png) | bin | 304 -> 304 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/chrono/MetalPanel.png (renamed from src/resources/assets/miscutils/textures/blocks/chrono/MetalPanel.png) | bin | 318 -> 318 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet.png (renamed from src/resources/assets/miscutils/textures/blocks/chrono/MetalSheet.png) | bin | 298 -> 298 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet10.png | bin | 0 -> 675 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet11.png | bin | 0 -> 574 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet12.png | bin | 0 -> 753 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet2.png (renamed from src/resources/assets/miscutils/textures/blocks/chrono/MetalSheet2.png) | bin | 318 -> 318 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet3.png | bin | 0 -> 863 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet4.png | bin | 0 -> 851 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet5.png | bin | 0 -> 877 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet6.png | bin | 0 -> 401 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet7.png | bin | 0 -> 543 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet8.png | bin | 0 -> 834 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet9.png | bin | 0 -> 941 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/chrono/Overlay_Cyber.png (renamed from src/resources/assets/miscutils/textures/blocks/chrono/Overlay_Cyber.png) | bin | 295 -> 295 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/clear_flow.png (renamed from src/resources/assets/miscutils/textures/blocks/clear_flow.png) | bin | 942 -> 942 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/clear_still.png (renamed from src/resources/assets/miscutils/textures/blocks/clear_still.png) | bin | 942 -> 942 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/compressed/obsidian1.png (renamed from src/resources/assets/miscutils/textures/blocks/compressed/obsidian1.png) | bin | 656 -> 656 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/compressed/obsidian2.png (renamed from src/resources/assets/miscutils/textures/blocks/compressed/obsidian2.png) | bin | 757 -> 757 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/compressed/obsidian3.png (renamed from src/resources/assets/miscutils/textures/blocks/compressed/obsidian3.png) | bin | 801 -> 801 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/compressed/obsidian4.png (renamed from src/resources/assets/miscutils/textures/blocks/compressed/obsidian4.png) | bin | 814 -> 814 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/compressed/obsidian5.png (renamed from src/resources/assets/miscutils/textures/blocks/compressed/obsidian5.png) | bin | 787 -> 787 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/compressed/obsidian_invert.png (renamed from src/resources/assets/miscutils/textures/blocks/compressed/obsidian_invert.png) | bin | 770 -> 770 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/crop/blockCrop.Hemp.1.png (renamed from src/resources/assets/miscutils/textures/blocks/crop/blockCrop.Hemp.1.png) | bin | 220 -> 220 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/crop/blockCrop.Hemp.2.png (renamed from src/resources/assets/miscutils/textures/blocks/crop/blockCrop.Hemp.2.png) | bin | 399 -> 399 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/crop/blockCrop.Hemp.3.png (renamed from src/resources/assets/miscutils/textures/blocks/crop/blockCrop.Hemp.3.png) | bin | 572 -> 572 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/crop/blockCrop.Hemp.4.png (renamed from src/resources/assets/miscutils/textures/blocks/crop/blockCrop.Hemp.4.png) | bin | 534 -> 534 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/crop/blockCrop.Hemp.5.png (renamed from src/resources/assets/miscutils/textures/blocks/crop/blockCrop.Hemp.5.png) | bin | 661 -> 661 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/door_cactus_lower.png (renamed from src/resources/assets/miscutils/textures/blocks/door_cactus_lower.png) | bin | 558 -> 558 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/door_cactus_upper.png (renamed from src/resources/assets/miscutils/textures/blocks/door_cactus_upper.png) | bin | 563 -> 563 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/door_glass_lower.png (renamed from src/resources/assets/miscutils/textures/blocks/door_glass_lower.png) | bin | 176 -> 176 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/door_glass_upper.png (renamed from src/resources/assets/miscutils/textures/blocks/door_glass_upper.png) | bin | 183 -> 183 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/door_ice_lower.png (renamed from src/resources/assets/miscutils/textures/blocks/door_ice_lower.png) | bin | 508 -> 508 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/door_ice_upper.png (renamed from src/resources/assets/miscutils/textures/blocks/door_ice_upper.png) | bin | 542 -> 542 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/fluid/Fluid_Cryotheum_Flow.png (renamed from src/resources/assets/miscutils/textures/blocks/fluid/Fluid_Cryotheum_Flow.png) | bin | 2943 -> 2943 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/fluid/Fluid_Cryotheum_Flow.png.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/fluid/Fluid_Cryotheum_Flow.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/fluid/Fluid_Cryotheum_Still.png (renamed from src/resources/assets/miscutils/textures/blocks/fluid/Fluid_Cryotheum_Still.png) | bin | 1911 -> 1911 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/fluid/Fluid_Cryotheum_Still.png.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/fluid/Fluid_Cryotheum_Still.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/fluid/Fluid_Ender_Flow.png (renamed from src/resources/assets/miscutils/textures/blocks/fluid/Fluid_Ender_Flow.png) | bin | 3595 -> 3595 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/fluid/Fluid_Ender_Flow.png.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/fluid/Fluid_Ender_Flow.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/fluid/Fluid_Ender_Still.png (renamed from src/resources/assets/miscutils/textures/blocks/fluid/Fluid_Ender_Still.png) | bin | 2001 -> 2001 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/fluid/Fluid_Ender_Still.png.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/fluid/Fluid_Ender_Still.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/fluid/Fluid_Pyrotheum_Flow.png (renamed from src/resources/assets/miscutils/textures/blocks/fluid/Fluid_Pyrotheum_Flow.png) | bin | 3210 -> 3210 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/fluid/Fluid_Pyrotheum_Flow.png.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/fluid/Fluid_Pyrotheum_Flow.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/fluid/Fluid_Pyrotheum_Still.png (renamed from src/resources/assets/miscutils/textures/blocks/fluid/Fluid_Pyrotheum_Still.png) | bin | 3691 -> 3691 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/fluid/Fluid_Pyrotheum_Still.png.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/fluid/Fluid_Pyrotheum_Still.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/fluid/Fluid_Sludge_Flow.png (renamed from src/resources/assets/miscutils/textures/blocks/fluid/Fluid_Sludge_Flow.png) | bin | 3601 -> 3601 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/fluid/Fluid_Sludge_Flow.png.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/fluid/Fluid_Sludge_Flow.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/fluid/Fluid_Sludge_Still.png (renamed from src/resources/assets/miscutils/textures/blocks/fluid/Fluid_Sludge_Still.png) | bin | 2038 -> 2038 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/fluid/Fluid_Sludge_Still.png.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/fluid/Fluid_Sludge_Still.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.cryotheum.png (renamed from src/resources/assets/miscutils/textures/blocks/fluids/fluid.cryotheum.png) | bin | 1911 -> 1911 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.cryotheum.png.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/fluids/fluid.cryotheum.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.ender.png (renamed from src/resources/assets/miscutils/textures/blocks/fluids/fluid.ender.png) | bin | 2001 -> 2001 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.ender.png.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/fluids/fluid.ender.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.flowing.png (renamed from src/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.flowing.png) | bin | 9232 -> 9232 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.flowing.png.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.flowing.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.png (renamed from src/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.png) | bin | 7019 -> 7019 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.png.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.still.png (renamed from src/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.still.png) | bin | 9586 -> 9586 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.still.png.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.still.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.hydrofluoricacid.png (renamed from src/resources/assets/miscutils/textures/blocks/fluids/fluid.hydrofluoricacid.png) | bin | 3998 -> 3998 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.hydrofluoricacid.png.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/fluids/fluid.hydrofluoricacid.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.hydrogenchloride.png (renamed from src/resources/assets/miscutils/textures/blocks/fluids/fluid.hydrogenchloride.png) | bin | 2844 -> 2844 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.hydrogenchloride.png.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/fluids/fluid.hydrogenchloride.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.jackdaniels.png (renamed from src/resources/assets/miscutils/textures/blocks/fluids/fluid.jackdaniels.png) | bin | 3454 -> 3454 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.jackdaniels.png.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/fluids/fluid.jackdaniels.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.lithiumhydroxide.png (renamed from src/resources/assets/miscutils/textures/blocks/fluids/fluid.lithiumhydroxide.png) | bin | 22548 -> 22548 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.lithiumhydroxide.png.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/fluids/fluid.lithiumhydroxide.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.molten.autogenerated.new.1.png (renamed from src/resources/assets/miscutils/textures/blocks/fluids/fluid.molten.autogenerated.new.1.png) | bin | 4175 -> 4175 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.molten.autogenerated.old.png (renamed from src/resources/assets/miscutils/textures/blocks/fluids/fluid.molten.autogenerated.old.png) | bin | 7019 -> 7019 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.molten.autogenerated.png (renamed from src/resources/assets/miscutils/textures/blocks/fluids/fluid.molten.autogenerated.png) | bin | 2928 -> 2928 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.molten.autogenerated.png.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/fluids/fluid.molten.autogenerated.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.plasma.autogenerated.png (renamed from src/resources/assets/miscutils/textures/blocks/fluids/fluid.plasma.autogenerated.png) | bin | 1461 -> 1461 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.plasma.autogenerated.png.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/fluids/fluid.plasma.autogenerated.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.pyrotheum.png (renamed from src/resources/assets/miscutils/textures/blocks/fluids/fluid.pyrotheum.png) | bin | 3691 -> 3691 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.pyrotheum.png.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/fluids/fluid.pyrotheum.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfurdioxide.png (renamed from src/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfurdioxide.png) | bin | 2844 -> 2844 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfurdioxide.png.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfurdioxide.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfuricapatite.png (renamed from src/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfuricapatite.png) | bin | 2844 -> 2844 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfuricapatite.png.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfuricapatite.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfuriclithium.png (renamed from src/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfuriclithium.png) | bin | 31006 -> 31006 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfuriclithium.png.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfuriclithium.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfurousacid.png (renamed from src/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfurousacid.png) | bin | 2844 -> 2844 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfurousacid.png.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfurousacid.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.thoriumhexafluoride.png (renamed from src/resources/assets/miscutils/textures/blocks/fluids/fluid.thoriumhexafluoride.png) | bin | 3011 -> 3011 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.thoriumtetrafluoride.png (renamed from src/resources/assets/miscutils/textures/blocks/fluids/fluid.thoriumtetrafluoride.png) | bin | 3167 -> 3167 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.thoriumtetrafluoride.png.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/fluids/fluid.thoriumtetrafluoride.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.uraniumhexafluoride.png (renamed from src/resources/assets/miscutils/textures/blocks/fluids/fluid.uraniumhexafluoride.png) | bin | 3196 -> 3196 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.uraniumhexafluoride.png.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/fluids/fluid.uraniumhexafluoride.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.uraniumtetrafluoride.png (renamed from src/resources/assets/miscutils/textures/blocks/fluids/fluid.uraniumtetrafluoride.png) | bin | 3196 -> 3196 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.uraniumtetrafluoride.png.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/fluids/fluid.uraniumtetrafluoride.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/hellfire/blockHellFire_layer_0.png (renamed from src/resources/assets/miscutils/textures/blocks/hellfire/blockHellFire_layer_0.png) | bin | 13281 -> 13281 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/hellfire/blockHellFire_layer_0.png.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/hellfire/blockHellFire_layer_0.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/hellfire/blockHellFire_layer_1.png (renamed from src/resources/assets/miscutils/textures/blocks/hellfire/blockHellFire_layer_1.png) | bin | 13886 -> 13886 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/hellfire/blockHellFire_layer_1.png.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/hellfire/blockHellFire_layer_1.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_1.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_1.png) | bin | 334 -> 334 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_2.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_2.png) | bin | 448 -> 448 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_3.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_3.png) | bin | 367 -> 367 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_4.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_4.png) | bin | 461 -> 461 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_5.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_5.png) | bin | 332 -> 332 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_6.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_6.png) | bin | 505 -> 505 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_7.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_7.png) | bin | 391 -> 391 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_8.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_8.png) | bin | 446 -> 446 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_9.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_9.png) | bin | 359 -> 359 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_1.PNG.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_1.PNG.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_1.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_1.png) | bin | 546 -> 546 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_2.PNG.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_2.PNG.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_2.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_2.png) | bin | 865 -> 865 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_3.PNG.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_3.PNG.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_3.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_3.png) | bin | 608 -> 608 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_4.PNG.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_4.PNG.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_4.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_4.png) | bin | 909 -> 909 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_5.PNG.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_5.PNG.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_5.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_5.png) | bin | 880 -> 880 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_6.PNG.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_6.PNG.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_6.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_6.png) | bin | 945 -> 945 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_7.PNG.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_7.PNG.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_7.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_7.png) | bin | 656 -> 656 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_8.PNG.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_8.PNG.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_8.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_8.png) | bin | 875 -> 875 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_9.PNG.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_9.PNG.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_9.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_9.png) | bin | 644 -> 644 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_1.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_1.png) | bin | 399 -> 399 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_2.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_2.png) | bin | 445 -> 445 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_3.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_3.png) | bin | 452 -> 452 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_4.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_4.png) | bin | 479 -> 479 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_5.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_5.png) | bin | 332 -> 332 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_6.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_6.png) | bin | 494 -> 494 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_7.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_7.png) | bin | 470 -> 470 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_8.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_8.png) | bin | 466 -> 466 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_9.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_9.png) | bin | 447 -> 447 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_1.PNG.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_1.PNG.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_1.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_1.png) | bin | 604 -> 604 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_2.PNG.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_2.PNG.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_2.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_2.png) | bin | 851 -> 851 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_3.PNG.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_3.PNG.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_3.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_3.png) | bin | 646 -> 646 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_4.PNG.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_4.PNG.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_4.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_4.png) | bin | 897 -> 897 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_5.PNG.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_5.PNG.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_5.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_5.png) | bin | 880 -> 880 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_6.PNG.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_6.PNG.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_6.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_6.png) | bin | 939 -> 939 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_7.PNG.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_7.PNG.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_7.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_7.png) | bin | 633 -> 633 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_8.PNG.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_8.PNG.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_8.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_8.png) | bin | 894 -> 894 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_9.PNG.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_9.PNG.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_9.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_9.png) | bin | 659 -> 659 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_1.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_1.png) | bin | 486 -> 486 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_10.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_10.png) | bin | 491 -> 491 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_11.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_11.png) | bin | 508 -> 508 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_12.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_12.png) | bin | 494 -> 494 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_2.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_2.png) | bin | 504 -> 504 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_3.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_3.png) | bin | 463 -> 463 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_4.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_4.png) | bin | 460 -> 460 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_5.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_5.png) | bin | 478 -> 478 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_6.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_6.png) | bin | 473 -> 473 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_7.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_7.png) | bin | 429 -> 429 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_8.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_8.png) | bin | 531 -> 531 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_9.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_9.png) | bin | 486 -> 486 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER1.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER1.png) | bin | 647 -> 647 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER2.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER2.png) | bin | 541 -> 541 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER3.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER3.png) | bin | 663 -> 663 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER4.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER4.png) | bin | 533 -> 533 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER5.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER5.png) | bin | 271 -> 271 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER6.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER6.png) | bin | 526 -> 526 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER7.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER7.png) | bin | 665 -> 665 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER8.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER8.png) | bin | 528 -> 528 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER9.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER9.png) | bin | 625 -> 625 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE1.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE1.png) | bin | 748 -> 748 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE1.png.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE1.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE2.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE2.png) | bin | 766 -> 766 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE2.png.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE2.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE3.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE3.png) | bin | 849 -> 849 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE3.png.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE3.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE4.pdn (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE4.pdn) | bin | 5038 -> 5038 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE4.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE4.png) | bin | 897 -> 897 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE4.png.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE4.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE5.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE5.png) | bin | 464 -> 464 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE5.png.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE5.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE6.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE6.png) | bin | 971 -> 971 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE6.png.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE6.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE7.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE7.png) | bin | 768 -> 768 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE7.png.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE7.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE8.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE8.png) | bin | 757 -> 757 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE8.png.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE8.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE9.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE9.png) | bin | 747 -> 747 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE9.png.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE9.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE1.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE1.png) | bin | 515 -> 515 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE2.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE2.png) | bin | 507 -> 507 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE3.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE3.png) | bin | 539 -> 539 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE4.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE4.png) | bin | 546 -> 546 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE5.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE5.png) | bin | 332 -> 332 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE6.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE6.png) | bin | 530 -> 530 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE7.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE7.png) | bin | 546 -> 546 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE8.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE8.png) | bin | 511 -> 511 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE9.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE9.png) | bin | 509 -> 509 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE1.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE1.png) | bin | 670 -> 670 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE1.png.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE1.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE2.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE2.png) | bin | 863 -> 863 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE2.png.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE2.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE3.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE3.png) | bin | 687 -> 687 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE3.png.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE3.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE4.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE4.png) | bin | 944 -> 944 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE4.png.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE4.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE5.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE5.png) | bin | 880 -> 880 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE5.png.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE5.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE6.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE6.png) | bin | 955 -> 955 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE6.png.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE6.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE7.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE7.png) | bin | 696 -> 696 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE7.png.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE7.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE8.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE8.png) | bin | 866 -> 866 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE8.png.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE8.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE9.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE9.png) | bin | 657 -> 657 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE9.png.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE9.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_FUSION_3.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_FUSION_3.png) | bin | 525 -> 525 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_FUSION_COIL_II.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_FUSION_COIL_II.png) | bin | 517 -> 517 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_FUSION_GLASS_ULTRA.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_FUSION_GLASS_ULTRA.png) | bin | 505 -> 505 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_CATALYSTS.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_CATALYSTS.png) | bin | 1371 -> 1371 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_CATALYSTS.png.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_CATALYSTS.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_CONTROL_CORE_BUS.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_CONTROL_CORE_BUS.png) | bin | 553 -> 553 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_ENERGY_OUT_BUFFER.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_ENERGY_OUT_BUFFER.png) | bin | 334 -> 334 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_ENERGY_OUT_MULTI_BUFFER.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_ENERGY_OUT_MULTI_BUFFER.png) | bin | 455 -> 455 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_ENERGY_RTG_OFF.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_ENERGY_RTG_OFF.png) | bin | 353 -> 353 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_ENERGY_RTG_ON.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_ENERGY_RTG_ON.png) | bin | 377 -> 377 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_FRONT_ADVANCED_MULTIBLOCK_ANIMATED.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_FRONT_ADVANCED_MULTIBLOCK_ANIMATED.png) | bin | 724 -> 724 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_FRONT_ADVANCED_MULTIBLOCK_ANIMATED.png.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_FRONT_ADVANCED_MULTIBLOCK_ANIMATED.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_FRONT_ADVANCED_MULTIBLOCK_ANIMATED_ACTIVE.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_FRONT_ADVANCED_MULTIBLOCK_ANIMATED_ACTIVE.png) | bin | 733 -> 733 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_FRONT_ADVANCED_MULTIBLOCK_ANIMATED_ACTIVE.png.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_FRONT_ADVANCED_MULTIBLOCK_ANIMATED_ACTIVE.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE.png) | bin | 363 -> 363 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ACTIVE.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ACTIVE.png) | bin | 350 -> 350 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ANIMATED.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ANIMATED.png) | bin | 533 -> 533 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ANIMATED.png.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ANIMATED.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ANIMATED_ACTIVE.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ANIMATED_ACTIVE.png) | bin | 557 -> 557 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ANIMATED_ACTIVE.png.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ANIMATED_ACTIVE.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_MILLING_BALL_BUS.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_MILLING_BALL_BUS.png) | bin | 1652 -> 1652 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_MILLING_BALL_BUS.png.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_MILLING_BALL_BUS.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_MUFFLER_ADV.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_MUFFLER_ADV.png) | bin | 754 -> 754 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_OVERFLOW_VALVE.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_OVERFLOW_VALVE.png) | bin | 878 -> 878 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_OVERFLOW_VALVE.png.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_OVERFLOW_VALVE.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_EV.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_EV.png) | bin | 2035 -> 2035 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_HV.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_HV.png) | bin | 2048 -> 2048 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_IV.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_IV.png) | bin | 2039 -> 2039 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_LV.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_LV.png) | bin | 1887 -> 1887 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_LuV.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_LuV.png) | bin | 1929 -> 1929 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_MAX.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_MAX.png) | bin | 2055 -> 2055 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_MV.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_MV.png) | bin | 2060 -> 2060 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_ULV.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_ULV.png) | bin | 1952 -> 1952 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_UV.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_UV.png) | bin | 2049 -> 2049 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_ZPM.png (renamed from src/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_ZPM.png) | bin | 2112 -> 2112 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/mash_flow.png (renamed from src/resources/assets/miscutils/textures/blocks/mash_flow.png) | bin | 942 -> 942 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/mash_still.png (renamed from src/resources/assets/miscutils/textures/blocks/mash_still.png) | bin | 942 -> 942 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/metro/OVERLAY_GRATE_A.png (renamed from src/resources/assets/miscutils/textures/blocks/metro/OVERLAY_GRATE_A.png) | bin | 423 -> 423 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_MAGIC_A.png (renamed from src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_MAGIC_A.png) | bin | 1156 -> 1156 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_MAGIC_A.png.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_MAGIC_A.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_GRATE_A.png (renamed from src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_GRATE_A.png) | bin | 344 -> 344 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_A.png (renamed from src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_A.png) | bin | 533 -> 533 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_B.png (renamed from src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_B.png) | bin | 569 -> 569 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_C.png (renamed from src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_C.png) | bin | 447 -> 447 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_D.png (renamed from src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_D.png) | bin | 448 -> 448 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_E.png (renamed from src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_E.png) | bin | 537 -> 537 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_F.png (renamed from src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_F.png) | bin | 453 -> 453 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_G.png (renamed from src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_G.png) | bin | 1220 -> 1220 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_H.png (renamed from src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_H.png) | bin | 312 -> 312 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_I.png (renamed from src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_I.png) | bin | 493 -> 493 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_ORGANIC_PANEL_A.png (renamed from src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_ORGANIC_PANEL_A.png) | bin | 598 -> 598 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_ORGANIC_PANEL_A_GLOWING.png (renamed from src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_ORGANIC_PANEL_A_GLOWING.png) | bin | 2503 -> 2503 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_ORGANIC_PANEL_A_GLOWING.png.mcmeta (renamed from src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_ORGANIC_PANEL_A_GLOWING.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_BIRD_A.png (renamed from src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_BIRD_A.png) | bin | 647 -> 647 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_BIRD_A_LEFT.png (renamed from src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_BIRD_A_LEFT.png) | bin | 630 -> 630 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_BIRD_A_RIGHT.png (renamed from src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_BIRD_A_RIGHT.png) | bin | 627 -> 627 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_BLUE_A.png (renamed from src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_BLUE_A.png) | bin | 410 -> 410 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_GREEN_A.png (renamed from src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_GREEN_A.png) | bin | 244 -> 244 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_RED_A.png (renamed from src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_RED_A.png) | bin | 532 -> 532 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_RED_B.png (renamed from src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_RED_B.png) | bin | 367 -> 367 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_TABLET_A.png (renamed from src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_TABLET_A.png) | bin | 572 -> 572 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_TABLET_B.png (renamed from src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_TABLET_B.png) | bin | 579 -> 579 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_A.png (renamed from src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_A.png) | bin | 266 -> 266 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_B.png (renamed from src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_B.png) | bin | 285 -> 285 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_C.png (renamed from src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_C.png) | bin | 312 -> 312 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_PANEL_A.png (renamed from src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_PANEL_A.png) | bin | 513 -> 513 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_PANEL_B.png (renamed from src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_PANEL_B.png) | bin | 474 -> 474 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_PANEL_C.png (renamed from src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_PANEL_C.png) | bin | 469 -> 469 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_PANEL_D.png (renamed from src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_PANEL_D.png) | bin | 360 -> 360 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/net.png (renamed from src/resources/assets/miscutils/textures/blocks/net.png) | bin | 350 -> 350 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/redox/redox1.png (renamed from src/resources/assets/miscutils/textures/blocks/redox/redox1.png) | bin | 562 -> 562 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/redox/redox2.png (renamed from src/resources/assets/miscutils/textures/blocks/redox/redox2.png) | bin | 721 -> 721 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/redox/redox3.png (renamed from src/resources/assets/miscutils/textures/blocks/redox/redox3.png) | bin | 776 -> 776 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/redox/redox4.png (renamed from src/resources/assets/miscutils/textures/blocks/redox/redox4.png) | bin | 781 -> 781 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/redox/redox5.png (renamed from src/resources/assets/miscutils/textures/blocks/redox/redox5.png) | bin | 794 -> 794 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/redox/redox6.png (renamed from src/resources/assets/miscutils/textures/blocks/redox/redox6.png) | bin | 779 -> 779 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/redstone/redstone_meter/top.png (renamed from src/resources/assets/miscutils/textures/blocks/redstone/redstone_meter/top.png) | bin | 822 -> 822 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/rum_mature_flow.png (renamed from src/resources/assets/miscutils/textures/blocks/rum_mature_flow.png) | bin | 942 -> 942 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/rum_mature_still.png (renamed from src/resources/assets/miscutils/textures/blocks/rum_mature_still.png) | bin | 942 -> 942 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/rum_semi_mature_flow.png (renamed from src/resources/assets/miscutils/textures/blocks/rum_semi_mature_flow.png) | bin | 942 -> 942 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/rum_semi_mature_still.png (renamed from src/resources/assets/miscutils/textures/blocks/rum_semi_mature_still.png) | bin | 942 -> 942 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/trees/leaves/leaves_pine.png (renamed from src/resources/assets/miscutils/textures/blocks/trees/leaves/leaves_pine.png) | bin | 688 -> 688 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/trees/leaves/leaves_pine_opaque.png (renamed from src/resources/assets/miscutils/textures/blocks/trees/leaves/leaves_pine_opaque .png) | bin | 687 -> 687 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/trees/leaves/leaves_rainforest.png (renamed from src/resources/assets/miscutils/textures/blocks/trees/leaves/leaves_rainforest.png) | bin | 455 -> 455 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/trees/leaves/leaves_rainforest_opaque.png (renamed from src/resources/assets/miscutils/textures/blocks/trees/leaves/leaves_rainforest_opaque.png) | bin | 457 -> 457 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/trees/logs/log_pine.png | bin | 0 -> 300 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/trees/logs/log_pine_top.png | bin | 0 -> 572 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/trees/logs/log_rainforest.png (renamed from src/resources/assets/miscutils/textures/blocks/trees/logs/log_rainforest.png) | bin | 579 -> 579 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/trees/logs/log_rainforest_top.png (renamed from src/resources/assets/miscutils/textures/blocks/trees/logs/log_rainforest_top.png) | bin | 580 -> 580 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/trees/saplings/sapling_pine.png (renamed from src/resources/assets/miscutils/textures/blocks/trees/saplings/sapling_pine.png) | bin | 432 -> 432 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/trees/saplings/sapling_rainforest.png (renamed from src/resources/assets/miscutils/textures/blocks/trees/saplings/sapling_rainforest.png) | bin | 372 -> 372 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/workbench.png (renamed from src/resources/assets/miscutils/textures/blocks/workbench.png) | bin | 410 -> 410 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/blocks/workbench_top.png (renamed from src/resources/assets/miscutils/textures/blocks/workbench_top.png) | bin | 550 -> 550 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/entity/australia/boar.png (renamed from src/resources/assets/miscutils/textures/entity/australia/boar.png) | bin | 3022 -> 3022 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/entity/australia/bush_spider.png (renamed from src/resources/assets/miscutils/textures/entity/australia/bush_spider.png) | bin | 1445 -> 1445 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/entity/australia/dingo/dingo.png (renamed from src/resources/assets/miscutils/textures/entity/australia/dingo/dingo.png) | bin | 3643 -> 3643 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/entity/australia/dingo/dingo_angry.png (renamed from src/resources/assets/miscutils/textures/entity/australia/dingo/dingo_angry.png) | bin | 1712 -> 1712 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/entity/australia/dingo/dingo_collar.png (renamed from src/resources/assets/miscutils/textures/entity/australia/dingo/dingo_collar.png) | bin | 3576 -> 3576 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/entity/australia/dingo/dingo_tame.png (renamed from src/resources/assets/miscutils/textures/entity/australia/dingo/dingo_tame.png) | bin | 3676 -> 3676 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/entity/australia/octopus.png (renamed from src/resources/assets/miscutils/textures/entity/australia/octopus.png) | bin | 720 -> 720 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/entity/batKing.png (renamed from src/resources/assets/miscutils/textures/entity/batKing.png) | bin | 1994 -> 1994 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/entity/golemStaballoy.png (renamed from src/resources/assets/miscutils/textures/entity/golemStaballoy.png) | bin | 5433 -> 5433 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/entity/sickBlaze.png (renamed from src/resources/assets/miscutils/textures/entity/sickBlaze.png) | bin | 1221 -> 1221 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/entity/villager/aboriginal.png (renamed from src/resources/assets/miscutils/textures/entity/villager/aboriginal.png) | bin | 1154 -> 1154 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/entity/villager/banker.png (renamed from src/resources/assets/miscutils/textures/entity/villager/banker.png) | bin | 937 -> 937 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/entity/villager/technician.png (renamed from src/resources/assets/miscutils/textures/entity/villager/technician.png) | bin | 996 -> 996 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/entity/villager/trader.png (renamed from src/resources/assets/miscutils/textures/entity/villager/trader.png) | bin | 955 -> 955 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/enviroment/moon_phases.png (renamed from src/resources/assets/miscutils/textures/enviroment/moon_phases.png) | bin | 1029 -> 1029 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/enviroment/snow.png (renamed from src/resources/assets/miscutils/textures/enviroment/snow.png) | bin | 849 -> 849 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/enviroment/sun.png (renamed from src/resources/assets/miscutils/textures/enviroment/sun.png) | bin | 694 -> 694 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/gui/AdvancedBoiler.png (renamed from src/resources/assets/miscutils/textures/gui/AdvancedBoiler.png) | bin | 1457 -> 1457 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/gui/AdvancedCraftingTable.png (renamed from src/resources/assets/miscutils/textures/gui/AdvancedCraftingTable.png) | bin | 1212 -> 1212 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/gui/BronzeCraftingTable.png (renamed from src/resources/assets/miscutils/textures/gui/BronzeCraftingTable.png) | bin | 1057 -> 1057 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/gui/CircuitProgrammer.png (renamed from src/resources/assets/miscutils/textures/gui/CircuitProgrammer.png) | bin | 2857 -> 2857 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/gui/CokeOven.png (renamed from src/resources/assets/miscutils/textures/gui/CokeOven.png) | bin | 1025 -> 1025 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/gui/Cyclotron.png (renamed from src/resources/assets/miscutils/textures/gui/Cyclotron.png) | bin | 2756 -> 2756 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/gui/FishTrap.png (renamed from src/resources/assets/miscutils/textures/gui/FishTrap.png) | bin | 882 -> 882 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/gui/FluidReactor.png (renamed from src/resources/assets/miscutils/textures/gui/FluidReactor.png) | bin | 3587 -> 3587 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/gui/Generic3By3.png (renamed from src/resources/assets/miscutils/textures/gui/Generic3By3.png) | bin | 934 -> 934 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/gui/IndustrialCentrifuge.png (renamed from src/resources/assets/miscutils/textures/gui/IndustrialCentrifuge.png) | bin | 1104 -> 1104 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/gui/IndustrialCuttingMachine.png (renamed from src/resources/assets/miscutils/textures/gui/IndustrialCuttingMachine.png) | bin | 889 -> 889 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/gui/IndustrialElectrolyzer.png (renamed from src/resources/assets/miscutils/textures/gui/IndustrialElectrolyzer.png) | bin | 1136 -> 1136 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/gui/IndustrialExtruder.png (renamed from src/resources/assets/miscutils/textures/gui/IndustrialExtruder.png) | bin | 889 -> 889 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/gui/IndustrialMixer.png (renamed from src/resources/assets/miscutils/textures/gui/IndustrialMixer.png) | bin | 909 -> 909 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/gui/IndustrialSifter.png (renamed from src/resources/assets/miscutils/textures/gui/IndustrialSifter.png) | bin | 921 -> 921 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/gui/IndustrialThermalCentrifuge.png (renamed from src/resources/assets/miscutils/textures/gui/IndustrialThermalCentrifuge.png) | bin | 912 -> 912 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/gui/IndustrialWashPlant.png (renamed from src/resources/assets/miscutils/textures/gui/IndustrialWashPlant.png) | bin | 911 -> 911 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/gui/IndustrialWireFactory.png (renamed from src/resources/assets/miscutils/textures/gui/IndustrialWireFactory.png) | bin | 1030 -> 1030 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/gui/IronBlastFurnace.png (renamed from src/resources/assets/miscutils/textures/gui/IronBlastFurnace.png) | bin | 954 -> 954 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/gui/MacerationStack.png (renamed from src/resources/assets/miscutils/textures/gui/MacerationStack.png) | bin | 1070 -> 1070 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/gui/MaterialPress.png (renamed from src/resources/assets/miscutils/textures/gui/MaterialPress.png) | bin | 1156 -> 1156 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/gui/MatterFabricator.png (renamed from src/resources/assets/miscutils/textures/gui/MatterFabricator.png) | bin | 1167 -> 1167 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/gui/ModularityTable.png (renamed from src/resources/assets/miscutils/textures/gui/ModularityTable.png) | bin | 1014 -> 1014 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/gui/MultiblockDisplay.png (renamed from src/resources/assets/miscutils/textures/gui/MultiblockDisplay.png) | bin | 899 -> 899 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/gui/MultiblockDisplay_Generic.png (renamed from src/resources/assets/miscutils/textures/gui/MultiblockDisplay_Generic.png) | bin | 1743 -> 1743 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/gui/PestKiller.png (renamed from src/resources/assets/miscutils/textures/gui/PestKiller.png) | bin | 1833 -> 1833 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/gui/PollutionCleaner.png (renamed from src/resources/assets/miscutils/textures/gui/PollutionCleaner.png) | bin | 1652 -> 1652 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/gui/PowerSubStation.png (renamed from src/resources/assets/miscutils/textures/gui/PowerSubStation.png) | bin | 1005 -> 1005 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/gui/ProjectTable.png (renamed from src/resources/assets/miscutils/textures/gui/ProjectTable.png) | bin | 1124 -> 1124 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/gui/RoundRobinator.png (renamed from src/resources/assets/miscutils/textures/gui/RoundRobinator.png) | bin | 1648 -> 1648 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/gui/SafeBlock.png (renamed from src/resources/assets/miscutils/textures/gui/SafeBlock.png) | bin | 952 -> 952 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/gui/SlowFusion.png (renamed from src/resources/assets/miscutils/textures/gui/SlowFusion.png) | bin | 2182 -> 2182 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/gui/SteelBoiler.png (renamed from src/resources/assets/miscutils/textures/gui/SteelBoiler.png) | bin | 1430 -> 1430 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/gui/SuperJukebox.png (renamed from src/resources/assets/miscutils/textures/gui/SuperJukebox.png) | bin | 5198 -> 5198 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/gui/TreeFarmer.png (renamed from src/resources/assets/miscutils/textures/gui/TreeFarmer.png) | bin | 832 -> 832 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/gui/VolumetricFlaskSetter.png (renamed from src/resources/assets/miscutils/textures/gui/VolumetricFlaskSetter.png) | bin | 2482 -> 2482 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/gui/Workbench.png (renamed from src/resources/assets/miscutils/textures/gui/Workbench.png) | bin | 1057 -> 1057 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/gui/helium_collector_gui.png (renamed from src/resources/assets/miscutils/textures/gui/helium_collector_gui.png) | bin | 2682 -> 2682 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/gui/itemBackpack.png (renamed from src/resources/assets/miscutils/textures/gui/itemBackpack.png) | bin | 888 -> 888 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/gui/itemGrindle.png (renamed from src/resources/assets/miscutils/textures/gui/itemGrindle.png) | bin | 1254 -> 1254 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/gui/machine_Charger.png (renamed from src/resources/assets/miscutils/textures/gui/machine_Charger.png) | bin | 548 -> 548 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/gui/nei/decayables.png (renamed from src/resources/assets/miscutils/textures/gui/nei/decayables.png) | bin | 2623 -> 2623 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/gui/nei/widgets.png (renamed from src/resources/assets/miscutils/textures/gui/nei/widgets.png) | bin | 1876 -> 1876 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/IndustrialDiamondExquisite.png (renamed from src/resources/assets/miscutils/textures/items/IndustrialDiamondExquisite.png) | bin | 608 -> 608 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/0.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/0.png) | bin | 501 -> 501 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/1.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/1.png) | bin | 501 -> 501 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/10.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/10.png) | bin | 358 -> 358 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/100.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/100.png) | bin | 2112 -> 2112 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/101.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/101.png) | bin | 309 -> 309 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/102.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/102.png) | bin | 10825 -> 10825 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/103.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/103.png) | bin | 13990 -> 13990 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/104.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/104.png) | bin | 24047 -> 24047 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/105.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/105.png) | bin | 30527 -> 30527 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/106.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/106.png) | bin | 300 -> 300 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/107.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/107.png) | bin | 304 -> 304 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/108.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/108.png) | bin | 299 -> 299 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/109.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/109.png) | bin | 297 -> 297 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/11.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/11.png) | bin | 358 -> 358 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/110.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/110.png) | bin | 393 -> 393 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/111.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/111.png) | bin | 345 -> 345 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/112.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/112.png) | bin | 341 -> 341 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/113.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/113.png) | bin | 337 -> 337 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/114.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/114.png) | bin | 396 -> 396 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/115.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/115.png) | bin | 428 -> 428 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/12.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/12.png) | bin | 411 -> 411 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/13.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/13.png) | bin | 411 -> 411 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/130.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/130.png) | bin | 489 -> 489 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/131.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/131.png) | bin | 451 -> 451 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/132.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/132.png) | bin | 449 -> 449 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/133.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/133.png) | bin | 463 -> 463 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/134.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/134.png) | bin | 465 -> 465 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/135.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/135.png) | bin | 462 -> 462 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/136.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/136.png) | bin | 477 -> 477 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/137.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/137.png) | bin | 461 -> 461 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/138.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/138.png) | bin | 474 -> 474 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/139.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/139.png) | bin | 482 -> 482 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/14.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/14.png) | bin | 411 -> 411 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/140.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/140.png) | bin | 660 -> 660 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/141.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/141.png) | bin | 655 -> 655 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/142.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/142.png) | bin | 627 -> 627 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/143.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/143.png) | bin | 675 -> 675 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/144.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/144.png) | bin | 645 -> 645 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/145.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/145.png) | bin | 651 -> 651 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/146.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/146.png) | bin | 630 -> 630 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/147.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/147.png) | bin | 648 -> 648 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/148.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/148.png) | bin | 645 -> 645 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/149.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/149.png) | bin | 659 -> 659 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/15.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/15.png) | bin | 411 -> 411 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/150.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/150.png) | bin | 667 -> 667 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/151.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/151.png) | bin | 335 -> 335 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/16.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/16.png) | bin | 461 -> 461 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/160.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/160.png) | bin | 459 -> 459 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/161.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/161.png) | bin | 455 -> 455 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/162.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/162.png) | bin | 455 -> 455 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/17.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/17.png) | bin | 461 -> 461 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/18.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/18.png) | bin | 461 -> 461 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/19.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/19.png) | bin | 461 -> 461 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/2.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/2.png) | bin | 501 -> 501 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/20.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/20.png) | bin | 617 -> 617 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/200.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/200.png) | bin | 231 -> 231 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/201.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/201.png) | bin | 292 -> 292 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/202.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/202.png) | bin | 321 -> 321 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/203.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/203.png) | bin | 319 -> 319 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/204.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/204.png) | bin | 315 -> 315 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/205.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/205.png) | bin | 348 -> 348 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/206.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/206.png) | bin | 364 -> 364 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/207.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/207.png) | bin | 375 -> 375 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/208.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/208.png) | bin | 338 -> 338 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/21.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/21.png) | bin | 617 -> 617 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/210.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/210.png) | bin | 223 -> 223 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/211.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/211.png) | bin | 223 -> 223 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/212.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/212.png) | bin | 252 -> 252 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/213.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/213.png) | bin | 435 -> 435 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/214.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/214.png) | bin | 461 -> 461 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/215.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/215.png) | bin | 273 -> 273 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/216.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/216.png) | bin | 441 -> 441 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/217.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/217.png) | bin | 450 -> 450 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/218.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/218.png) | bin | 508 -> 508 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/219.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/219.png) | bin | 277 -> 277 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/22.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/22.png) | bin | 617 -> 617 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/220.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/220.png) | bin | 331 -> 331 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/221.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/221.png) | bin | 513 -> 513 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/23.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/23.png) | bin | 617 -> 617 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/24.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/24.png) | bin | 545 -> 545 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/25.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/25.png) | bin | 545 -> 545 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/26.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/26.png) | bin | 545 -> 545 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/27.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/27.png) | bin | 545 -> 545 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/28.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/28.png) | bin | 482 -> 482 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/29.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/29.png) | bin | 482 -> 482 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/3.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/3.png) | bin | 501 -> 501 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/30.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/30.png) | bin | 482 -> 482 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/31.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/31.png) | bin | 482 -> 482 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/32.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/32.png) | bin | 501 -> 501 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/33.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/33.png) | bin | 415 -> 415 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/34.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/34.png) | bin | 358 -> 358 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/35.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/35.png) | bin | 411 -> 411 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/36.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/36.png) | bin | 461 -> 461 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/37.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/37.png) | bin | 617 -> 617 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/38.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/38.png) | bin | 545 -> 545 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/39.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/39.png) | bin | 482 -> 482 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/4.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/4.png) | bin | 415 -> 415 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/40.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/40.png) | bin | 788 -> 788 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/41.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/41.png) | bin | 750 -> 750 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/42.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/42.png) | bin | 834 -> 834 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/43.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/43.png) | bin | 936 -> 936 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/44.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/44.png) | bin | 764 -> 764 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/5.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/5.png) | bin | 415 -> 415 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/50.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/50.png) | bin | 499 -> 499 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/50/1.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/50/1.png) | bin | 480 -> 480 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/50/2.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/50/2.png) | bin | 490 -> 490 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/50/3.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/50/3.png) | bin | 485 -> 485 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/50/4.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/50/4.png) | bin | 490 -> 490 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/50/5.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/50/5.png) | bin | 488 -> 488 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/50/6.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/50/6.png) | bin | 498 -> 498 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/50/7.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/50/7.png) | bin | 491 -> 491 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/50/8.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/50/8.png) | bin | 485 -> 485 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/52.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/52.png) | bin | 499 -> 499 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/52/1.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/52/1.png) | bin | 480 -> 480 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/52/2.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/52/2.png) | bin | 490 -> 490 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/52/3.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/52/3.png) | bin | 485 -> 485 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/52/4.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/52/4.png) | bin | 490 -> 490 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/52/5.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/52/5.png) | bin | 488 -> 488 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/52/6.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/52/6.png) | bin | 498 -> 498 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/52/7.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/52/7.png) | bin | 491 -> 491 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/52/8.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/52/8.png) | bin | 485 -> 485 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/54.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/54.png) | bin | 499 -> 499 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/54/1.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/54/1.png) | bin | 480 -> 480 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/54/2.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/54/2.png) | bin | 490 -> 490 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/54/3.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/54/3.png) | bin | 485 -> 485 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/54/4.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/54/4.png) | bin | 490 -> 490 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/54/5.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/54/5.png) | bin | 488 -> 488 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/54/6.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/54/6.png) | bin | 498 -> 498 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/54/7.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/54/7.png) | bin | 491 -> 491 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/54/8.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/54/8.png) | bin | 485 -> 485 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/55.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/55.png) | bin | 24039 -> 24039 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/6.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/6.png) | bin | 415 -> 415 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/60.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/60.png) | bin | 5146 -> 5146 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/61.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/61.png) | bin | 352 -> 352 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/62.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/62.png) | bin | 352 -> 352 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/63.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/63.png) | bin | 352 -> 352 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/64.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/64.png) | bin | 358 -> 358 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/66.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/66.png) | bin | 392 -> 392 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/68.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/68.png) | bin | 390 -> 390 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/7.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/7.png) | bin | 415 -> 415 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/70.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/70.png) | bin | 398 -> 398 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/700.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/700.png) | bin | 328 -> 328 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/701.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/701.png) | bin | 361 -> 361 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/702.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/702.png) | bin | 369 -> 369 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/703.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/703.png) | bin | 366 -> 366 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/704.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/704.png) | bin | 368 -> 368 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/705.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/705.png) | bin | 375 -> 375 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/706.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/706.png) | bin | 375 -> 375 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/707.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/707.png) | bin | 386 -> 386 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/708.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/708.png) | bin | 362 -> 362 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/71.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/71.png) | bin | 304 -> 304 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/710.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/710.png) | bin | 326 -> 326 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/711.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/711.png) | bin | 326 -> 326 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/712.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/712.png) | bin | 343 -> 343 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/713.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/713.png) | bin | 352 -> 352 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/714.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/714.png) | bin | 363 -> 363 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/715.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/715.png) | bin | 363 -> 363 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/716.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/716.png) | bin | 343 -> 343 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/717.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/717.png) | bin | 343 -> 343 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/718.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/718.png) | bin | 343 -> 343 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/719.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/719.png) | bin | 464 -> 464 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/72.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/72.png) | bin | 314 -> 314 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/720.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/720.png) | bin | 455 -> 455 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/721.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/721.png) | bin | 465 -> 465 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/73.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/73.png) | bin | 318 -> 318 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/74.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/74.png) | bin | 319 -> 319 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/75.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/75.png) | bin | 323 -> 323 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/751.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/751.png) | bin | 317 -> 317 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/752.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/752.png) | bin | 447 -> 447 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/753.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/753.png) | bin | 462 -> 462 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/754.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/754.png) | bin | 459 -> 459 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/755.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/755.png) | bin | 463 -> 463 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/756.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/756.png) | bin | 466 -> 466 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/757.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/757.png) | bin | 464 -> 464 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/758.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/758.png) | bin | 477 -> 477 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/759.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/759.png) | bin | 444 -> 444 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/76.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/76.png) | bin | 321 -> 321 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/77.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/77.png) | bin | 324 -> 324 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/78.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/78.png) | bin | 324 -> 324 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/79.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/79.png) | bin | 314 -> 314 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/8.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/8.png) | bin | 358 -> 358 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/9.png (renamed from src/resources/assets/miscutils/textures/items/MU-metaitem.01/9.png) | bin | 358 -> 358 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metatool.01/0.png (renamed from src/resources/assets/miscutils/textures/items/MU-metatool.01/0.png) | bin | 1153 -> 1153 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metatool.01/1.png (renamed from src/resources/assets/miscutils/textures/items/MU-metatool.01/1.png) | bin | 1142 -> 1142 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metatool.01/2.png (renamed from src/resources/assets/miscutils/textures/items/MU-metatool.01/2.png) | bin | 1139 -> 1139 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/MU-metatool.01/3.png (renamed from src/resources/assets/miscutils/textures/items/MU-metatool.01/3.png) | bin | 1143 -> 1143 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/StoneStatue.png (renamed from src/resources/assets/miscutils/textures/items/StoneStatue.png) | bin | 3703 -> 3703 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/baubles/itemFireProtectGlovesBetter.png (renamed from src/resources/assets/miscutils/textures/items/baubles/itemFireProtectGlovesBetter.png) | bin | 1326 -> 1326 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/bioscience/BasicAlgae.png (renamed from src/resources/assets/miscutils/textures/items/bioscience/BasicAlgae.png) | bin | 1122 -> 1122 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/bioscience/BasicAlgae_Overlay.png (renamed from src/resources/assets/miscutils/textures/items/bioscience/BasicAlgae_Overlay.png) | bin | 1045 -> 1045 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit.png (renamed from src/resources/assets/miscutils/textures/items/bioscience/BioCircuit.png) | bin | 432 -> 432 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/0.png (renamed from src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/0.png) | bin | 605 -> 605 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/1.png (renamed from src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/1.png) | bin | 627 -> 627 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/10.png (renamed from src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/10.png) | bin | 516 -> 516 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/11.png (renamed from src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/11.png) | bin | 392 -> 392 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/12.png (renamed from src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/12.png) | bin | 704 -> 704 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/13.png (renamed from src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/13.png) | bin | 373 -> 373 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/14.png (renamed from src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/14.png) | bin | 427 -> 427 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/15.png (renamed from src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/15.png) | bin | 376 -> 376 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/16.png (renamed from src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/16.png) | bin | 397 -> 397 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/17.png (renamed from src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/17.png) | bin | 306 -> 306 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/18.png (renamed from src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/18.png) | bin | 442 -> 442 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/19.png (renamed from src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/19.png) | bin | 347 -> 347 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/2.png (renamed from src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/2.png) | bin | 633 -> 633 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/20.png (renamed from src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/20.png) | bin | 364 -> 364 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/21.png (renamed from src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/21.png) | bin | 280 -> 280 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/22.png (renamed from src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/22.png) | bin | 437 -> 437 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/23.png (renamed from src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/23.png) | bin | 701 -> 701 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/24.png (renamed from src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/24.png) | bin | 357 -> 357 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/25.png (renamed from src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/25.png) | bin | 648 -> 648 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/3.png (renamed from src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/3.png) | bin | 646 -> 646 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/4.png (renamed from src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/4.png) | bin | 622 -> 622 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/5.png (renamed from src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/5.png) | bin | 490 -> 490 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/6.png (renamed from src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/6.png) | bin | 455 -> 455 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/7.png (renamed from src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/7.png) | bin | 452 -> 452 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/8.png (renamed from src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/8.png) | bin | 654 -> 654 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/9.png (renamed from src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/9.png) | bin | 277 -> 277 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/bomb.png (renamed from src/resources/assets/miscutils/textures/items/bomb.png) | bin | 311 -> 311 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/bomb_casing.png (renamed from src/resources/assets/miscutils/textures/items/bomb_casing.png) | bin | 280 -> 280 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/bomb_lit.png (renamed from src/resources/assets/miscutils/textures/items/bomb_lit.png) | bin | 328 -> 328 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/bucket.generic.overlay.png (renamed from src/resources/assets/miscutils/textures/items/bucket.generic.overlay.png) | bin | 279 -> 279 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/bucket/BucketCryotheum.png (renamed from src/resources/assets/miscutils/textures/items/bucket/BucketCryotheum.png) | bin | 602 -> 602 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/bucket/BucketCryotheum.png.mcmeta (renamed from src/resources/assets/miscutils/textures/items/bucket/BucketCryotheum.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/bucket/BucketEnder.png (renamed from src/resources/assets/miscutils/textures/items/bucket/BucketEnder.png) | bin | 715 -> 715 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/bucket/BucketEnder.png.mcmeta (renamed from src/resources/assets/miscutils/textures/items/bucket/BucketEnder.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/bucket/BucketPyrotheum.png (renamed from src/resources/assets/miscutils/textures/items/bucket/BucketPyrotheum.png) | bin | 2141 -> 2141 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/bucket/BucketPyrotheum.png.mcmeta (renamed from src/resources/assets/miscutils/textures/items/bucket/BucketPyrotheum.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/bucket/OverlayIcon.png (renamed from src/resources/assets/miscutils/textures/items/bucket/OverlayIcon.png) | bin | 195 -> 195 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/burnables/itemCactusCharcoal.png (renamed from src/resources/assets/miscutils/textures/items/burnables/itemCactusCharcoal.png) | bin | 354 -> 354 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/burnables/itemCactusCoke.png (renamed from src/resources/assets/miscutils/textures/items/burnables/itemCactusCoke.png) | bin | 379 -> 379 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/burnables/itemCoalCoke.png (renamed from src/resources/assets/miscutils/textures/items/burnables/itemCoalCoke.png) | bin | 282 -> 282 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/burnables/itemSugarCharcoal.png (renamed from src/resources/assets/miscutils/textures/items/burnables/itemSugarCharcoal.png) | bin | 387 -> 387 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/burnables/itemSugarCoke.png (renamed from src/resources/assets/miscutils/textures/items/burnables/itemSugarCoke.png) | bin | 397 -> 397 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/chargepack/1.png (renamed from src/resources/assets/miscutils/textures/items/chargepack/1.png) | bin | 1327 -> 1327 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/chargepack/2.png (renamed from src/resources/assets/miscutils/textures/items/chargepack/2.png) | bin | 1335 -> 1335 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/chargepack/3.png (renamed from src/resources/assets/miscutils/textures/items/chargepack/3.png) | bin | 1340 -> 1340 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/chargepack/4.png (renamed from src/resources/assets/miscutils/textures/items/chargepack/4.png) | bin | 1306 -> 1306 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/chargepack/5.png (renamed from src/resources/assets/miscutils/textures/items/chargepack/5.png) | bin | 1302 -> 1302 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/chargepack/6.png (renamed from src/resources/assets/miscutils/textures/items/chargepack/6.png) | bin | 1338 -> 1338 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/chargepack/7.png (renamed from src/resources/assets/miscutils/textures/items/chargepack/7.png) | bin | 1317 -> 1317 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/chargepack/8.png (renamed from src/resources/assets/miscutils/textures/items/chargepack/8.png) | bin | 1402 -> 1402 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/chargepack/9.png (renamed from src/resources/assets/miscutils/textures/items/chargepack/9.png) | bin | 1183 -> 1183 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/controlcore/Core_0.png (renamed from src/resources/assets/miscutils/textures/items/controlcore/Core_0.png) | bin | 527 -> 527 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/controlcore/Core_1.png (renamed from src/resources/assets/miscutils/textures/items/controlcore/Core_1.png) | bin | 495 -> 495 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/controlcore/Core_2.png (renamed from src/resources/assets/miscutils/textures/items/controlcore/Core_2.png) | bin | 492 -> 492 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/controlcore/Core_3.png (renamed from src/resources/assets/miscutils/textures/items/controlcore/Core_3.png) | bin | 495 -> 495 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/controlcore/Core_4.png (renamed from src/resources/assets/miscutils/textures/items/controlcore/Core_4.png) | bin | 483 -> 483 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/controlcore/Core_5.png (renamed from src/resources/assets/miscutils/textures/items/controlcore/Core_5.png) | bin | 479 -> 479 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/controlcore/Core_6.png (renamed from src/resources/assets/miscutils/textures/items/controlcore/Core_6.png) | bin | 476 -> 476 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/controlcore/Core_7.png (renamed from src/resources/assets/miscutils/textures/items/controlcore/Core_7.png) | bin | 465 -> 465 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/controlcore/Core_8.png (renamed from src/resources/assets/miscutils/textures/items/controlcore/Core_8.png) | bin | 465 -> 465 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/controlcore/Core_9.png (renamed from src/resources/assets/miscutils/textures/items/controlcore/Core_9.png) | bin | 412 -> 412 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/covers/0.png (renamed from src/resources/assets/miscutils/textures/items/covers/0.png) | bin | 489 -> 489 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/covers/1.png (renamed from src/resources/assets/miscutils/textures/items/covers/1.png) | bin | 451 -> 451 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/covers/10.png (renamed from src/resources/assets/miscutils/textures/items/covers/10.png) | bin | 426 -> 426 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/covers/11.png (renamed from src/resources/assets/miscutils/textures/items/covers/11.png) | bin | 408 -> 408 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/covers/12.png (renamed from src/resources/assets/miscutils/textures/items/covers/12.png) | bin | 439 -> 439 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/covers/13.png (renamed from src/resources/assets/miscutils/textures/items/covers/13.png) | bin | 439 -> 439 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/covers/14.png (renamed from src/resources/assets/miscutils/textures/items/covers/14.png) | bin | 422 -> 422 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/covers/15.png (renamed from src/resources/assets/miscutils/textures/items/covers/15.png) | bin | 443 -> 443 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/covers/2.png (renamed from src/resources/assets/miscutils/textures/items/covers/2.png) | bin | 449 -> 449 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/covers/3.png (renamed from src/resources/assets/miscutils/textures/items/covers/3.png) | bin | 463 -> 463 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/covers/4.png (renamed from src/resources/assets/miscutils/textures/items/covers/4.png) | bin | 465 -> 465 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/covers/5.png (renamed from src/resources/assets/miscutils/textures/items/covers/5.png) | bin | 462 -> 462 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/covers/6.png (renamed from src/resources/assets/miscutils/textures/items/covers/6.png) | bin | 477 -> 477 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/covers/7.png (renamed from src/resources/assets/miscutils/textures/items/covers/7.png) | bin | 461 -> 461 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/covers/8.png (renamed from src/resources/assets/miscutils/textures/items/covers/8.png) | bin | 474 -> 474 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/covers/9.png (renamed from src/resources/assets/miscutils/textures/items/covers/9.png) | bin | 482 -> 482 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoilWire_0.png (renamed from src/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoilWire_0.png) | bin | 309 -> 309 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoilWire_1.png (renamed from src/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoilWire_1.png) | bin | 302 -> 302 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoilWire_2.png (renamed from src/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoilWire_2.png) | bin | 288 -> 288 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoilWire_3.png (renamed from src/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoilWire_3.png) | bin | 286 -> 286 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoil_0.png (renamed from src/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoil_0.png) | bin | 461 -> 461 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoil_1.png (renamed from src/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoil_1.png) | bin | 459 -> 459 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoil_2.png (renamed from src/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoil_2.png) | bin | 386 -> 386 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoil_3.png (renamed from src/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoil_3.png) | bin | 388 -> 388 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/dust.png (renamed from src/resources/assets/miscutils/textures/items/dust.png) | bin | 302 -> 302 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/dustSmall.png (renamed from src/resources/assets/miscutils/textures/items/dustSmall.png) | bin | 264 -> 264 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/dustTiny.png (renamed from src/resources/assets/miscutils/textures/items/dustTiny.png) | bin | 219 -> 219 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/food/MetaItem1/0.png (renamed from src/resources/assets/miscutils/textures/items/food/MetaItem1/0.png) | bin | 565 -> 565 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/food/MetaItem1/1.png (renamed from src/resources/assets/miscutils/textures/items/food/MetaItem1/1.png) | bin | 548 -> 548 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/food/MetaItem1/2.png (renamed from src/resources/assets/miscutils/textures/items/food/MetaItem1/2.png) | bin | 455 -> 455 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/food/MetaItem1/3.png (renamed from src/resources/assets/miscutils/textures/items/food/MetaItem1/3.png) | bin | 556 -> 556 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/food/MetaItem1/4.png (renamed from src/resources/assets/miscutils/textures/items/food/MetaItem1/4.png) | bin | 453 -> 453 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/food/MetaItem1/5.png (renamed from src/resources/assets/miscutils/textures/items/food/MetaItem1/5.png) | bin | 447 -> 447 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/food/MetaItem1/6.png (renamed from src/resources/assets/miscutils/textures/items/food/MetaItem1/6.png) | bin | 402 -> 402 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/food/MetaItem1/7.png (renamed from src/resources/assets/miscutils/textures/items/food/MetaItem1/7.png) | bin | 562 -> 562 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/food/MetaItem1/8.png (renamed from src/resources/assets/miscutils/textures/items/food/MetaItem1/8.png) | bin | 447 -> 447 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/frameAccelerated.png (renamed from src/resources/assets/miscutils/textures/items/frameAccelerated.png) | bin | 412 -> 412 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/frameArborists.png (renamed from src/resources/assets/miscutils/textures/items/frameArborists.png) | bin | 297 -> 297 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/frameBusy.png (renamed from src/resources/assets/miscutils/textures/items/frameBusy.png) | bin | 412 -> 412 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/frameChocolate.png (renamed from src/resources/assets/miscutils/textures/items/frameChocolate.png) | bin | 339 -> 339 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/frameDecaying.png (renamed from src/resources/assets/miscutils/textures/items/frameDecaying.png) | bin | 449 -> 449 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/frameHealing.png (renamed from src/resources/assets/miscutils/textures/items/frameHealing.png) | bin | 354 -> 354 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/frameMutagenic.png (renamed from src/resources/assets/miscutils/textures/items/frameMutagenic.png) | bin | 412 -> 412 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/frameNova.png (renamed from src/resources/assets/miscutils/textures/items/frameNova.png) | bin | 636 -> 636 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/frameRestraint.png (renamed from src/resources/assets/miscutils/textures/items/frameRestraint.png) | bin | 355 -> 355 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/frameSlowing.png (renamed from src/resources/assets/miscutils/textures/items/frameSlowing.png) | bin | 307 -> 307 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/frameSoul.png (renamed from src/resources/assets/miscutils/textures/items/frameSoul.png) | bin | 584 -> 584 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/frameStabilizing.png (renamed from src/resources/assets/miscutils/textures/items/frameStabilizing.png) | bin | 449 -> 449 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/frameUseless.png (renamed from src/resources/assets/miscutils/textures/items/frameUseless.png) | bin | 427 -> 427 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/frameVoid.png (renamed from src/resources/assets/miscutils/textures/items/frameVoid.png) | bin | 663 -> 663 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/iconsets/ANGLE_GRINDER.png (renamed from src/resources/assets/miscutils/textures/items/iconsets/ANGLE_GRINDER.png) | bin | 387 -> 387 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/iconsets/ANGLE_GRINDER_OVERLAY.png (renamed from src/resources/assets/miscutils/textures/items/iconsets/ANGLE_GRINDER_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/iconsets/ELECTRIC_BUTCHER_KNIFE.png (renamed from src/resources/assets/miscutils/textures/items/iconsets/ELECTRIC_BUTCHER_KNIFE.png) | bin | 336 -> 336 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/iconsets/ELECTRIC_BUTCHER_KNIFE_OVERLAY.png (renamed from src/resources/assets/miscutils/textures/items/iconsets/ELECTRIC_BUTCHER_KNIFE_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/iconsets/ELECTRIC_LIGHTER.png (renamed from src/resources/assets/miscutils/textures/items/iconsets/ELECTRIC_LIGHTER.png) | bin | 313 -> 313 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/iconsets/ELECTRIC_LIGHTER_OVERLAY.png (renamed from src/resources/assets/miscutils/textures/items/iconsets/ELECTRIC_LIGHTER_OVERLAY.png) | bin | 257 -> 257 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/iconsets/ELECTRIC_SNIPS.png (renamed from src/resources/assets/miscutils/textures/items/iconsets/ELECTRIC_SNIPS.png) | bin | 501 -> 501 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/iconsets/ELECTRIC_SNIPS_OVERLAY.png (renamed from src/resources/assets/miscutils/textures/items/iconsets/ELECTRIC_SNIPS_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/iconsets/PUMP_OVERLAY.png (renamed from src/resources/assets/miscutils/textures/items/iconsets/PUMP_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/iconsets/RENDERING_ERROR.png (renamed from src/resources/assets/miscutils/textures/items/iconsets/RENDERING_ERROR.png) | bin | 161 -> 161 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/iconsets/RENDERING_ERROR_OVERLAY.png (renamed from src/resources/assets/miscutils/textures/items/iconsets/RENDERING_ERROR_OVERLAY.png) | bin | 161 -> 161 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/iconsets/SKOOKUMCHOOCHER.png (renamed from src/resources/assets/miscutils/textures/items/iconsets/SKOOKUMCHOOCHER.png) | bin | 382 -> 382 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/iconsets/SKOOKUMCHOOCHER_OVERLAY.png (renamed from src/resources/assets/miscutils/textures/items/iconsets/SKOOKUMCHOOCHER_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/iconsets/VOID.png (renamed from src/resources/assets/miscutils/textures/items/iconsets/VOID.png) | bin | 357 -> 357 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/iconsets/VOID_OVERLAY.png (renamed from src/resources/assets/miscutils/textures/items/iconsets/VOID_OVERLAY.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/0.png (renamed from src/resources/assets/miscutils/textures/items/ion/0.png) | bin | 112 -> 112 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/1.png (renamed from src/resources/assets/miscutils/textures/items/ion/1.png) | bin | 146 -> 146 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/10.png (renamed from src/resources/assets/miscutils/textures/items/ion/10.png) | bin | 161 -> 161 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/100.png (renamed from src/resources/assets/miscutils/textures/items/ion/100.png) | bin | 161 -> 161 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/101.png (renamed from src/resources/assets/miscutils/textures/items/ion/101.png) | bin | 153 -> 153 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/102.png (renamed from src/resources/assets/miscutils/textures/items/ion/102.png) | bin | 124 -> 124 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/103.png (renamed from src/resources/assets/miscutils/textures/items/ion/103.png) | bin | 148 -> 148 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/104.png (renamed from src/resources/assets/miscutils/textures/items/ion/104.png) | bin | 156 -> 156 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/105.png (renamed from src/resources/assets/miscutils/textures/items/ion/105.png) | bin | 175 -> 175 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/106.png (renamed from src/resources/assets/miscutils/textures/items/ion/106.png) | bin | 148 -> 148 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/107.png (renamed from src/resources/assets/miscutils/textures/items/ion/107.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/108.png (renamed from src/resources/assets/miscutils/textures/items/ion/108.png) | bin | 152 -> 152 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/109.png (renamed from src/resources/assets/miscutils/textures/items/ion/109.png) | bin | 154 -> 154 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/11.png (renamed from src/resources/assets/miscutils/textures/items/ion/11.png) | bin | 178 -> 178 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/110.png (renamed from src/resources/assets/miscutils/textures/items/ion/110.png) | bin | 163 -> 163 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/111.png (renamed from src/resources/assets/miscutils/textures/items/ion/111.png) | bin | 146 -> 146 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/112.png (renamed from src/resources/assets/miscutils/textures/items/ion/112.png) | bin | 148 -> 148 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/113.png (renamed from src/resources/assets/miscutils/textures/items/ion/113.png) | bin | 113 -> 113 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/114.png (renamed from src/resources/assets/miscutils/textures/items/ion/114.png) | bin | 160 -> 160 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/115.png (renamed from src/resources/assets/miscutils/textures/items/ion/115.png) | bin | 138 -> 138 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/116.png (renamed from src/resources/assets/miscutils/textures/items/ion/116.png) | bin | 140 -> 140 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/117.png (renamed from src/resources/assets/miscutils/textures/items/ion/117.png) | bin | 166 -> 166 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/12.png (renamed from src/resources/assets/miscutils/textures/items/ion/12.png) | bin | 147 -> 147 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/13.png (renamed from src/resources/assets/miscutils/textures/items/ion/13.png) | bin | 151 -> 151 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/14.png (renamed from src/resources/assets/miscutils/textures/items/ion/14.png) | bin | 125 -> 125 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/15.png (renamed from src/resources/assets/miscutils/textures/items/ion/15.png) | bin | 136 -> 136 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/16.png (renamed from src/resources/assets/miscutils/textures/items/ion/16.png) | bin | 136 -> 136 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/17.png (renamed from src/resources/assets/miscutils/textures/items/ion/17.png) | bin | 148 -> 148 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/18.png (renamed from src/resources/assets/miscutils/textures/items/ion/18.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/19.png (renamed from src/resources/assets/miscutils/textures/items/ion/19.png) | bin | 161 -> 161 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/2.png (renamed from src/resources/assets/miscutils/textures/items/ion/2.png) | bin | 115 -> 115 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/20.png (renamed from src/resources/assets/miscutils/textures/items/ion/20.png) | bin | 155 -> 155 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/21.png (renamed from src/resources/assets/miscutils/textures/items/ion/21.png) | bin | 115 -> 115 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/22.png (renamed from src/resources/assets/miscutils/textures/items/ion/22.png) | bin | 132 -> 132 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/23.png (renamed from src/resources/assets/miscutils/textures/items/ion/23.png) | bin | 144 -> 144 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/24.png (renamed from src/resources/assets/miscutils/textures/items/ion/24.png) | bin | 150 -> 150 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/25.png (renamed from src/resources/assets/miscutils/textures/items/ion/25.png) | bin | 141 -> 141 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/26.png (renamed from src/resources/assets/miscutils/textures/items/ion/26.png) | bin | 148 -> 148 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/27.png (renamed from src/resources/assets/miscutils/textures/items/ion/27.png) | bin | 141 -> 141 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/28.png (renamed from src/resources/assets/miscutils/textures/items/ion/28.png) | bin | 142 -> 142 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/29.png (renamed from src/resources/assets/miscutils/textures/items/ion/29.png) | bin | 145 -> 145 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/3.png (renamed from src/resources/assets/miscutils/textures/items/ion/3.png) | bin | 150 -> 150 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/30.png (renamed from src/resources/assets/miscutils/textures/items/ion/30.png) | bin | 159 -> 159 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/31.png (renamed from src/resources/assets/miscutils/textures/items/ion/31.png) | bin | 157 -> 157 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/32.png (renamed from src/resources/assets/miscutils/textures/items/ion/32.png) | bin | 158 -> 158 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/33.png (renamed from src/resources/assets/miscutils/textures/items/ion/33.png) | bin | 158 -> 158 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/34.png (renamed from src/resources/assets/miscutils/textures/items/ion/34.png) | bin | 144 -> 144 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/35.png (renamed from src/resources/assets/miscutils/textures/items/ion/35.png) | bin | 159 -> 159 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/36.png (renamed from src/resources/assets/miscutils/textures/items/ion/36.png) | bin | 155 -> 155 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/37.png (renamed from src/resources/assets/miscutils/textures/items/ion/37.png) | bin | 149 -> 149 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/38.png (renamed from src/resources/assets/miscutils/textures/items/ion/38.png) | bin | 135 -> 135 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/39.png (renamed from src/resources/assets/miscutils/textures/items/ion/39.png) | bin | 141 -> 141 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/4.png (renamed from src/resources/assets/miscutils/textures/items/ion/4.png) | bin | 125 -> 125 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/40.png (renamed from src/resources/assets/miscutils/textures/items/ion/40.png) | bin | 157 -> 157 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/41.png (renamed from src/resources/assets/miscutils/textures/items/ion/41.png) | bin | 162 -> 162 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/42.png (renamed from src/resources/assets/miscutils/textures/items/ion/42.png) | bin | 133 -> 133 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/43.png (renamed from src/resources/assets/miscutils/textures/items/ion/43.png) | bin | 147 -> 147 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/44.png (renamed from src/resources/assets/miscutils/textures/items/ion/44.png) | bin | 155 -> 155 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/45.png (renamed from src/resources/assets/miscutils/textures/items/ion/45.png) | bin | 152 -> 152 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/46.png (renamed from src/resources/assets/miscutils/textures/items/ion/46.png) | bin | 173 -> 173 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/47.png (renamed from src/resources/assets/miscutils/textures/items/ion/47.png) | bin | 154 -> 154 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/48.png (renamed from src/resources/assets/miscutils/textures/items/ion/48.png) | bin | 129 -> 129 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/49.png (renamed from src/resources/assets/miscutils/textures/items/ion/49.png) | bin | 152 -> 152 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/5.png (renamed from src/resources/assets/miscutils/textures/items/ion/5.png) | bin | 127 -> 127 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/50.png (renamed from src/resources/assets/miscutils/textures/items/ion/50.png) | bin | 163 -> 163 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/51.png (renamed from src/resources/assets/miscutils/textures/items/ion/51.png) | bin | 142 -> 142 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/52.png (renamed from src/resources/assets/miscutils/textures/items/ion/52.png) | bin | 110 -> 110 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/53.png (renamed from src/resources/assets/miscutils/textures/items/ion/53.png) | bin | 167 -> 167 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/54.png (renamed from src/resources/assets/miscutils/textures/items/ion/54.png) | bin | 155 -> 155 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/55.png (renamed from src/resources/assets/miscutils/textures/items/ion/55.png) | bin | 152 -> 152 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/56.png (renamed from src/resources/assets/miscutils/textures/items/ion/56.png) | bin | 142 -> 142 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/57.png (renamed from src/resources/assets/miscutils/textures/items/ion/57.png) | bin | 154 -> 154 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/58.png (renamed from src/resources/assets/miscutils/textures/items/ion/58.png) | bin | 136 -> 136 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/59.png (renamed from src/resources/assets/miscutils/textures/items/ion/59.png) | bin | 156 -> 156 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/6.png (renamed from src/resources/assets/miscutils/textures/items/ion/6.png) | bin | 131 -> 131 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/60.png (renamed from src/resources/assets/miscutils/textures/items/ion/60.png) | bin | 142 -> 142 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/61.png (renamed from src/resources/assets/miscutils/textures/items/ion/61.png) | bin | 157 -> 157 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/62.png (renamed from src/resources/assets/miscutils/textures/items/ion/62.png) | bin | 129 -> 129 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/63.png (renamed from src/resources/assets/miscutils/textures/items/ion/63.png) | bin | 165 -> 165 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/64.png (renamed from src/resources/assets/miscutils/textures/items/ion/64.png) | bin | 134 -> 134 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/65.png (renamed from src/resources/assets/miscutils/textures/items/ion/65.png) | bin | 157 -> 157 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/66.png (renamed from src/resources/assets/miscutils/textures/items/ion/66.png) | bin | 139 -> 139 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/67.png (renamed from src/resources/assets/miscutils/textures/items/ion/67.png) | bin | 129 -> 129 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/68.png (renamed from src/resources/assets/miscutils/textures/items/ion/68.png) | bin | 126 -> 126 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/69.png (renamed from src/resources/assets/miscutils/textures/items/ion/69.png) | bin | 157 -> 157 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/7.png (renamed from src/resources/assets/miscutils/textures/items/ion/7.png) | bin | 128 -> 128 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/70.png (renamed from src/resources/assets/miscutils/textures/items/ion/70.png) | bin | 121 -> 121 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/71.png (renamed from src/resources/assets/miscutils/textures/items/ion/71.png) | bin | 127 -> 127 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/72.png (renamed from src/resources/assets/miscutils/textures/items/ion/72.png) | bin | 137 -> 137 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/73.png (renamed from src/resources/assets/miscutils/textures/items/ion/73.png) | bin | 150 -> 150 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/74.png (renamed from src/resources/assets/miscutils/textures/items/ion/74.png) | bin | 153 -> 153 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/75.png (renamed from src/resources/assets/miscutils/textures/items/ion/75.png) | bin | 154 -> 154 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/76.png (renamed from src/resources/assets/miscutils/textures/items/ion/76.png) | bin | 126 -> 126 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/77.png (renamed from src/resources/assets/miscutils/textures/items/ion/77.png) | bin | 138 -> 138 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/78.png (renamed from src/resources/assets/miscutils/textures/items/ion/78.png) | bin | 152 -> 152 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/79.png (renamed from src/resources/assets/miscutils/textures/items/ion/79.png) | bin | 157 -> 157 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/8.png (renamed from src/resources/assets/miscutils/textures/items/ion/8.png) | bin | 107 -> 107 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/80.png (renamed from src/resources/assets/miscutils/textures/items/ion/80.png) | bin | 112 -> 112 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/81.png (renamed from src/resources/assets/miscutils/textures/items/ion/81.png) | bin | 151 -> 151 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/82.png (renamed from src/resources/assets/miscutils/textures/items/ion/82.png) | bin | 139 -> 139 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/83.png (renamed from src/resources/assets/miscutils/textures/items/ion/83.png) | bin | 149 -> 149 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/84.png (renamed from src/resources/assets/miscutils/textures/items/ion/84.png) | bin | 153 -> 153 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/85.png (renamed from src/resources/assets/miscutils/textures/items/ion/85.png) | bin | 152 -> 152 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/86.png (renamed from src/resources/assets/miscutils/textures/items/ion/86.png) | bin | 125 -> 125 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/87.png (renamed from src/resources/assets/miscutils/textures/items/ion/87.png) | bin | 153 -> 153 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/88.png (renamed from src/resources/assets/miscutils/textures/items/ion/88.png) | bin | 157 -> 157 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/89.png (renamed from src/resources/assets/miscutils/textures/items/ion/89.png) | bin | 125 -> 125 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/9.png (renamed from src/resources/assets/miscutils/textures/items/ion/9.png) | bin | 161 -> 161 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/90.png (renamed from src/resources/assets/miscutils/textures/items/ion/90.png) | bin | 146 -> 146 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/91.png (renamed from src/resources/assets/miscutils/textures/items/ion/91.png) | bin | 119 -> 119 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/92.png (renamed from src/resources/assets/miscutils/textures/items/ion/92.png) | bin | 163 -> 163 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/93.png (renamed from src/resources/assets/miscutils/textures/items/ion/93.png) | bin | 138 -> 138 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/94.png (renamed from src/resources/assets/miscutils/textures/items/ion/94.png) | bin | 153 -> 153 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/95.png (renamed from src/resources/assets/miscutils/textures/items/ion/95.png) | bin | 150 -> 150 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/96.png (renamed from src/resources/assets/miscutils/textures/items/ion/96.png) | bin | 157 -> 157 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/97.png (renamed from src/resources/assets/miscutils/textures/items/ion/97.png) | bin | 146 -> 146 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/98.png (renamed from src/resources/assets/miscutils/textures/items/ion/98.png) | bin | 143 -> 143 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/99.png (renamed from src/resources/assets/miscutils/textures/items/ion/99.png) | bin | 128 -> 128 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/ion/IonBase.png (renamed from src/resources/assets/miscutils/textures/items/ion/IonBase.png) | bin | 1789 -> 1789 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/item.empty.png (renamed from src/resources/assets/miscutils/textures/items/item.empty.png) | bin | 179 -> 179 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemAirFilter.png (renamed from src/resources/assets/miscutils/textures/items/itemAirFilter.png) | bin | 1469 -> 1469 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemAlkalusDisk.png (renamed from src/resources/assets/miscutils/textures/items/itemAlkalusDisk.png) | bin | 424 -> 424 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemAmulet.png (renamed from src/resources/assets/miscutils/textures/items/itemAmulet.png) | bin | 346 -> 346 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemBackpack.png (renamed from src/resources/assets/miscutils/textures/items/itemBackpack.png) | bin | 2409 -> 2409 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemBasicTurbine.png (renamed from src/resources/assets/miscutils/textures/items/itemBasicTurbine.png) | bin | 475 -> 475 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemBelt.png (renamed from src/resources/assets/miscutils/textures/items/itemBelt.png) | bin | 377 -> 377 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemBigEgg.png (renamed from src/resources/assets/miscutils/textures/items/itemBigEgg.png) | bin | 5331 -> 5331 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemBlueprint.png (renamed from src/resources/assets/miscutils/textures/items/itemBlueprint.png) | bin | 782 -> 782 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemBoilerChassis.png (renamed from src/resources/assets/miscutils/textures/items/itemBoilerChassis.png) | bin | 1821 -> 1821 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemBolt.png (renamed from src/resources/assets/miscutils/textures/items/itemBolt.png) | bin | 161 -> 161 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemBook.png (renamed from src/resources/assets/miscutils/textures/items/itemBook.png) | bin | 303 -> 303 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemBoots.png (renamed from src/resources/assets/miscutils/textures/items/itemBoots.png) | bin | 358 -> 358 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemBottle.png (renamed from src/resources/assets/miscutils/textures/items/itemBottle.png) | bin | 262 -> 262 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemBread.png (renamed from src/resources/assets/miscutils/textures/items/itemBread.png) | bin | 5146 -> 5146 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemBufferCore.png (renamed from src/resources/assets/miscutils/textures/items/itemBufferCore.png) | bin | 1329 -> 1329 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemCell.png (renamed from src/resources/assets/miscutils/textures/items/itemCell.png) | bin | 362 -> 362 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemCellPlasma.png (renamed from src/resources/assets/miscutils/textures/items/itemCellPlasma.png) | bin | 290 -> 290 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemCellPlasma_Overlay.png (renamed from src/resources/assets/miscutils/textures/items/itemCellPlasma_Overlay.png) | bin | 328 -> 328 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemCell_Overlay.png (renamed from src/resources/assets/miscutils/textures/items/itemCell_Overlay.png) | bin | 297 -> 297 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemCentidust.png (renamed from src/resources/assets/miscutils/textures/items/itemCentidust.png) | bin | 326 -> 326 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemCircuitLFTR.png (renamed from src/resources/assets/miscutils/textures/items/itemCircuitLFTR.png) | bin | 181 -> 181 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemDebugShapeSpawner.png (renamed from src/resources/assets/miscutils/textures/items/itemDebugShapeSpawner.png) | bin | 6534 -> 6534 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemDecidust.png (renamed from src/resources/assets/miscutils/textures/items/itemDecidust.png) | bin | 341 -> 341 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemDefault.png (renamed from src/resources/assets/miscutils/textures/items/itemDefault.png) | bin | 376 -> 376 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemDehydratorCoil.png (renamed from src/resources/assets/miscutils/textures/items/itemDehydratorCoil.png) | bin | 653 -> 653 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemDehydratorCoilWire.png (renamed from src/resources/assets/miscutils/textures/items/itemDehydratorCoilWire.png) | bin | 735 -> 735 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemDroplet.png (renamed from src/resources/assets/miscutils/textures/items/itemDroplet.png) | bin | 218 -> 218 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemEnergeticRotorBlade.png (renamed from src/resources/assets/miscutils/textures/items/itemEnergeticRotorBlade.png) | bin | 541 -> 541 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemEnergeticShaft.png (renamed from src/resources/assets/miscutils/textures/items/itemEnergeticShaft.png) | bin | 444 -> 444 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemFiber.png (renamed from src/resources/assets/miscutils/textures/items/itemFiber.png) | bin | 455 -> 455 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemFineWire.png (renamed from src/resources/assets/miscutils/textures/items/itemFineWire.png) | bin | 514 -> 514 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemFireStarter.png (renamed from src/resources/assets/miscutils/textures/items/itemFireStarter.png) | bin | 1850 -> 1850 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemFoodCurriedSausages.png (renamed from src/resources/assets/miscutils/textures/items/itemFoodCurriedSausages.png) | bin | 1897 -> 1897 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemFoodRaisinToast.png (renamed from src/resources/assets/miscutils/textures/items/itemFoodRaisinToast.png) | bin | 2076 -> 2076 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemGear.png (renamed from src/resources/assets/miscutils/textures/items/itemGear.png) | bin | 455 -> 455 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemGem.png (renamed from src/resources/assets/miscutils/textures/items/itemGem.png) | bin | 420 -> 420 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemHatTinFoil.png (renamed from src/resources/assets/miscutils/textures/items/itemHatTinFoil.png) | bin | 261 -> 261 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemHeavyPlate.png (renamed from src/resources/assets/miscutils/textures/items/itemHeavyPlate.png) | bin | 397 -> 397 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemHeavyPlate_Overlay.png (renamed from src/resources/assets/miscutils/textures/items/itemHeavyPlate_Overlay.png) | bin | 471 -> 471 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemHeliumBlob.png (renamed from src/resources/assets/miscutils/textures/items/itemHeliumBlob.png) | bin | 350 -> 350 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemHelmet.png (renamed from src/resources/assets/miscutils/textures/items/itemHelmet.png) | bin | 396 -> 396 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemHotIngotRaisinBread.png (renamed from src/resources/assets/miscutils/textures/items/itemHotIngotRaisinBread.png) | bin | 5146 -> 5146 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemHydrogenBlob.png (renamed from src/resources/assets/miscutils/textures/items/itemHydrogenBlob.png) | bin | 241 -> 241 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemIngot.png (renamed from src/resources/assets/miscutils/textures/items/itemIngot.png) | bin | 390 -> 390 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemIngotBatteryAlloy.png (renamed from src/resources/assets/miscutils/textures/items/itemIngotBatteryAlloy.png) | bin | 420 -> 420 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemIngotHot.png (renamed from src/resources/assets/miscutils/textures/items/itemIngotHot.png) | bin | 423 -> 423 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemIngotRaisinBread.png (renamed from src/resources/assets/miscutils/textures/items/itemIngotRaisinBread.png) | bin | 5146 -> 5146 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemIridiumRotorBlade.png (renamed from src/resources/assets/miscutils/textures/items/itemIridiumRotorBlade.png) | bin | 560 -> 560 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemIridiumShaft.png (renamed from src/resources/assets/miscutils/textures/items/itemIridiumShaft.png) | bin | 447 -> 447 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemKey.png (renamed from src/resources/assets/miscutils/textures/items/itemKey.png) | bin | 258 -> 258 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemKeyBig.png (renamed from src/resources/assets/miscutils/textures/items/itemKeyBig.png) | bin | 293 -> 293 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemKeyGold.png (renamed from src/resources/assets/miscutils/textures/items/itemKeyGold.png) | bin | 354 -> 354 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemKeyGoldBoss.png (renamed from src/resources/assets/miscutils/textures/items/itemKeyGoldBoss.png) | bin | 311 -> 311 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemLavaFilter.png (renamed from src/resources/assets/miscutils/textures/items/itemLavaFilter.png) | bin | 531 -> 531 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemMagnaliumRotorBlade.png (renamed from src/resources/assets/miscutils/textures/items/itemMagnaliumRotorBlade.png) | bin | 560 -> 560 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemMagnaliumShaft.png (renamed from src/resources/assets/miscutils/textures/items/itemMagnaliumShaft.png) | bin | 447 -> 447 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemMushroom.png (renamed from src/resources/assets/miscutils/textures/items/itemMushroom.png) | bin | 260 -> 260 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemMushroomRed.png (renamed from src/resources/assets/miscutils/textures/items/itemMushroomRed.png) | bin | 273 -> 273 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemNugget.png (renamed from src/resources/assets/miscutils/textures/items/itemNugget.png) | bin | 1986 -> 1986 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemPLACEHOLDER_Circuit.png (renamed from src/resources/assets/miscutils/textures/items/itemPLACEHOLDER_Circuit.png) | bin | 405 -> 405 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemPickaxe.png (renamed from src/resources/assets/miscutils/textures/items/itemPickaxe.png) | bin | 178 -> 178 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemPineapple.png (renamed from src/resources/assets/miscutils/textures/items/itemPineapple.png) | bin | 297 -> 297 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemPlate.png (renamed from src/resources/assets/miscutils/textures/items/itemPlate.png) | bin | 278 -> 278 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemPlateBatteryAlloy.png (renamed from src/resources/assets/miscutils/textures/items/itemPlateBatteryAlloy.png) | bin | 491 -> 491 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemPlateDouble.png (renamed from src/resources/assets/miscutils/textures/items/itemPlateDouble.png) | bin | 297 -> 297 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemPlatebody.png (renamed from src/resources/assets/miscutils/textures/items/itemPlatebody.png) | bin | 378 -> 378 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemPlatelegs.png (renamed from src/resources/assets/miscutils/textures/items/itemPlatelegs.png) | bin | 342 -> 342 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemPotion.png (renamed from src/resources/assets/miscutils/textures/items/itemPotion.png) | bin | 271 -> 271 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemPotionBlack.png (renamed from src/resources/assets/miscutils/textures/items/itemPotionBlack.png) | bin | 284 -> 284 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemPotionRed.png (renamed from src/resources/assets/miscutils/textures/items/itemPotionRed.png) | bin | 284 -> 284 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemRing.png (renamed from src/resources/assets/miscutils/textures/items/itemRing.png) | bin | 311 -> 311 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemRingWearable.png (renamed from src/resources/assets/miscutils/textures/items/itemRingWearable.png) | bin | 350 -> 350 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemRod.png (renamed from src/resources/assets/miscutils/textures/items/itemRod.png) | bin | 250 -> 250 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemRodLong.png (renamed from src/resources/assets/miscutils/textures/items/itemRodLong.png) | bin | 246 -> 246 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemRope.png (renamed from src/resources/assets/miscutils/textures/items/itemRope.png) | bin | 316 -> 316 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemRotor.png (renamed from src/resources/assets/miscutils/textures/items/itemRotor.png) | bin | 443 -> 443 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemSandstoneHammer.png (renamed from src/resources/assets/miscutils/textures/items/itemSandstoneHammer.png) | bin | 422 -> 422 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemScrew.png (renamed from src/resources/assets/miscutils/textures/items/itemScrew.png) | bin | 199 -> 199 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemShard.png (renamed from src/resources/assets/miscutils/textures/items/itemShard.png) | bin | 620 -> 620 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemShovel.png (renamed from src/resources/assets/miscutils/textures/items/itemShovel.png) | bin | 154 -> 154 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemSlowBuildersRing.png (renamed from src/resources/assets/miscutils/textures/items/itemSlowBuildersRing.png) | bin | 427 -> 427 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemSmallSpring.png (renamed from src/resources/assets/miscutils/textures/items/itemSmallSpring.png) | bin | 317 -> 317 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemSpring.png (renamed from src/resources/assets/miscutils/textures/items/itemSpring.png) | bin | 276 -> 276 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemStaballoyAxe.png (renamed from src/resources/assets/miscutils/textures/items/itemStaballoyAxe.png) | bin | 534 -> 534 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemStaballoyPickaxe.png (renamed from src/resources/assets/miscutils/textures/items/itemStaballoyPickaxe.png) | bin | 525 -> 525 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemStickyRubber.png (renamed from src/resources/assets/miscutils/textures/items/itemStickyRubber.png) | bin | 397 -> 397 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemSulfuricAcidPotion.png (renamed from src/resources/assets/miscutils/textures/items/itemSulfuricAcidPotion.png) | bin | 416 -> 416 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemSword.png (renamed from src/resources/assets/miscutils/textures/items/itemSword.png) | bin | 363 -> 363 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemTablet.png (renamed from src/resources/assets/miscutils/textures/items/itemTablet.png) | bin | 372 -> 372 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemTungstenSteelRotorBlade.png (renamed from src/resources/assets/miscutils/textures/items/itemTungstenSteelRotorBlade.png) | bin | 544 -> 544 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemTungstenSteelShaft.png (renamed from src/resources/assets/miscutils/textures/items/itemTungstenSteelShaft.png) | bin | 326 -> 326 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemUltimetRotorBlade.png (renamed from src/resources/assets/miscutils/textures/items/itemUltimetRotorBlade.png) | bin | 557 -> 557 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemUltimetShaft.png (renamed from src/resources/assets/miscutils/textures/items/itemUltimetShaft.png) | bin | 447 -> 447 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemVibrantRotorBlade.png (renamed from src/resources/assets/miscutils/textures/items/itemVibrantRotorBlade.png) | bin | 530 -> 530 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemVibrantShaft.png (renamed from src/resources/assets/miscutils/textures/items/itemVibrantShaft.png) | bin | 447 -> 447 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/itemWaterBottle.png (renamed from src/resources/assets/miscutils/textures/items/itemWaterBottle.png) | bin | 262 -> 262 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/material/DustBlizz.png (renamed from src/resources/assets/miscutils/textures/items/material/DustBlizz.png) | bin | 914 -> 914 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/material/DustBlizz.png.mcmeta (renamed from src/resources/assets/miscutils/textures/items/material/DustBlizz.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/material/DustCryotheum.png (renamed from src/resources/assets/miscutils/textures/items/material/DustCryotheum.png) | bin | 1303 -> 1303 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/material/DustCryotheum.png.mcmeta (renamed from src/resources/assets/miscutils/textures/items/material/DustCryotheum.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/material/DustPyrotheum.png (renamed from src/resources/assets/miscutils/textures/items/material/DustPyrotheum.png) | bin | 1202 -> 1202 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/material/DustPyrotheum.png.mcmeta (renamed from src/resources/assets/miscutils/textures/items/material/DustPyrotheum.png.mcmeta) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/material/RodBlizz.png (renamed from src/resources/assets/miscutils/textures/items/material/RodBlizz.png) | bin | 439 -> 439 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/particle/0.PNG (renamed from src/resources/assets/miscutils/textures/items/particle/0.PNG) | bin | 1672 -> 1672 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/particle/1.png (renamed from src/resources/assets/miscutils/textures/items/particle/1.png) | bin | 1669 -> 1669 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/particle/10.PNG (renamed from src/resources/assets/miscutils/textures/items/particle/10.PNG) | bin | 1644 -> 1644 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/particle/11.PNG (renamed from src/resources/assets/miscutils/textures/items/particle/11.PNG) | bin | 1678 -> 1678 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/particle/12.PNG (renamed from src/resources/assets/miscutils/textures/items/particle/12.PNG) | bin | 1658 -> 1658 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/particle/13.PNG (renamed from src/resources/assets/miscutils/textures/items/particle/13.PNG) | bin | 1668 -> 1668 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/particle/14.PNG (renamed from src/resources/assets/miscutils/textures/items/particle/14.PNG) | bin | 1676 -> 1676 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/particle/15.PNG (renamed from src/resources/assets/miscutils/textures/items/particle/15.PNG) | bin | 1675 -> 1675 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/particle/16.PNG (renamed from src/resources/assets/miscutils/textures/items/particle/16.PNG) | bin | 1679 -> 1679 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/particle/17.PNG (renamed from src/resources/assets/miscutils/textures/items/particle/17.PNG) | bin | 1674 -> 1674 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/particle/18.PNG (renamed from src/resources/assets/miscutils/textures/items/particle/18.PNG) | bin | 1674 -> 1674 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/particle/19.PNG (renamed from src/resources/assets/miscutils/textures/items/particle/19.PNG) | bin | 1685 -> 1685 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/particle/2.png (renamed from src/resources/assets/miscutils/textures/items/particle/2.png) | bin | 1683 -> 1683 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/particle/20.PNG (renamed from src/resources/assets/miscutils/textures/items/particle/20.PNG) | bin | 1663 -> 1663 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/particle/21.PNG (renamed from src/resources/assets/miscutils/textures/items/particle/21.PNG) | bin | 1653 -> 1653 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/particle/22.PNG (renamed from src/resources/assets/miscutils/textures/items/particle/22.PNG) | bin | 1665 -> 1665 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/particle/23.PNG (renamed from src/resources/assets/miscutils/textures/items/particle/23.PNG) | bin | 1680 -> 1680 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/particle/24.PNG (renamed from src/resources/assets/miscutils/textures/items/particle/24.PNG) | bin | 1673 -> 1673 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/particle/3.png (renamed from src/resources/assets/miscutils/textures/items/particle/3.png) | bin | 1681 -> 1681 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/particle/4.png (renamed from src/resources/assets/miscutils/textures/items/particle/4.png) | bin | 1682 -> 1682 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/particle/5.png (renamed from src/resources/assets/miscutils/textures/items/particle/5.png) | bin | 1675 -> 1675 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/particle/6.png (renamed from src/resources/assets/miscutils/textures/items/particle/6.png) | bin | 1674 -> 1674 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/particle/7.PNG (renamed from src/resources/assets/miscutils/textures/items/particle/7.PNG) | bin | 1667 -> 1667 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/particle/8.PNG (renamed from src/resources/assets/miscutils/textures/items/particle/8.PNG) | bin | 1656 -> 1656 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/particle/9.PNG (renamed from src/resources/assets/miscutils/textures/items/particle/9.PNG) | bin | 1663 -> 1663 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/particle/new/0.png (renamed from src/resources/assets/miscutils/textures/items/particle/new/0.png) | bin | 1217 -> 1217 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/particle/new/1.png (renamed from src/resources/assets/miscutils/textures/items/particle/new/1.png) | bin | 1493 -> 1493 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/particle/new/10.png (renamed from src/resources/assets/miscutils/textures/items/particle/new/10.png) | bin | 1616 -> 1616 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/particle/new/11.png (renamed from src/resources/assets/miscutils/textures/items/particle/new/11.png) | bin | 1450 -> 1450 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/particle/new/12.png (renamed from src/resources/assets/miscutils/textures/items/particle/new/12.png) | bin | 1635 -> 1635 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/particle/new/13.png (renamed from src/resources/assets/miscutils/textures/items/particle/new/13.png) | bin | 1601 -> 1601 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/particle/new/14.png (renamed from src/resources/assets/miscutils/textures/items/particle/new/14.png) | bin | 1522 -> 1522 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/particle/new/15.png (renamed from src/resources/assets/miscutils/textures/items/particle/new/15.png) | bin | 1710 -> 1710 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/particle/new/16.png (renamed from src/resources/assets/miscutils/textures/items/particle/new/16.png) | bin | 1647 -> 1647 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/particle/new/17.png (renamed from src/resources/assets/miscutils/textures/items/particle/new/17.png) | bin | 1569 -> 1569 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/particle/new/18.png (renamed from src/resources/assets/miscutils/textures/items/particle/new/18.png) | bin | 1451 -> 1451 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/particle/new/19.png (renamed from src/resources/assets/miscutils/textures/items/particle/new/19.png) | bin | 1404 -> 1404 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/particle/new/2.png (renamed from src/resources/assets/miscutils/textures/items/particle/new/2.png) | bin | 1561 -> 1561 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/particle/new/20.png (renamed from src/resources/assets/miscutils/textures/items/particle/new/20.png) | bin | 1517 -> 1517 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/particle/new/21.png (renamed from src/resources/assets/miscutils/textures/items/particle/new/21.png) | bin | 1498 -> 1498 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/particle/new/22.png (renamed from src/resources/assets/miscutils/textures/items/particle/new/22.png) | bin | 1554 -> 1554 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/particle/new/23.png (renamed from src/resources/assets/miscutils/textures/items/particle/new/23.png) | bin | 1196 -> 1196 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/particle/new/24.png (renamed from src/resources/assets/miscutils/textures/items/particle/new/24.png) | bin | 1323 -> 1323 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/particle/new/3.png (renamed from src/resources/assets/miscutils/textures/items/particle/new/3.png) | bin | 1465 -> 1465 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/particle/new/4.png (renamed from src/resources/assets/miscutils/textures/items/particle/new/4.png) | bin | 1501 -> 1501 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/particle/new/5.png (renamed from src/resources/assets/miscutils/textures/items/particle/new/5.png) | bin | 1487 -> 1487 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/particle/new/6.png (renamed from src/resources/assets/miscutils/textures/items/particle/new/6.png) | bin | 1512 -> 1512 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/particle/new/7.png (renamed from src/resources/assets/miscutils/textures/items/particle/new/7.png) | bin | 1485 -> 1485 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/particle/new/8.png (renamed from src/resources/assets/miscutils/textures/items/particle/new/8.png) | bin | 1595 -> 1595 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/particle/new/9.png (renamed from src/resources/assets/miscutils/textures/items/particle/new/9.png) | bin | 1567 -> 1567 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/personalCloakingDevice.png (renamed from src/resources/assets/miscutils/textures/items/personalCloakingDevice.png) | bin | 245 -> 245 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/processing/MilledOre/milled.png (renamed from src/resources/assets/miscutils/textures/items/processing/MilledOre/milled.png) | bin | 595 -> 595 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/processing/MilledOre/milled_OVERLAY.png (renamed from src/resources/assets/miscutils/textures/items/processing/MilledOre/milled_OVERLAY.png) | bin | 437 -> 437 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/research/note.png (renamed from src/resources/assets/miscutils/textures/items/research/note.png) | bin | 348 -> 348 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/science/Atom.png (renamed from src/resources/assets/miscutils/textures/items/science/Atom.png) | bin | 1175 -> 1175 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit.png (renamed from src/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit.png) | bin | 515 -> 515 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/science/general/MetaItem1/0.png (renamed from src/resources/assets/miscutils/textures/items/science/general/MetaItem1/0.png) | bin | 441 -> 441 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/science/general/MetaItem1/1.png (renamed from src/resources/assets/miscutils/textures/items/science/general/MetaItem1/1.png) | bin | 440 -> 440 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/science/general/MetaItem1/10.png (renamed from src/resources/assets/miscutils/textures/items/science/general/MetaItem1/10.png) | bin | 328 -> 328 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/science/general/MetaItem1/11.png (renamed from src/resources/assets/miscutils/textures/items/science/general/MetaItem1/11.png) | bin | 339 -> 339 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/science/general/MetaItem1/12.png (renamed from src/resources/assets/miscutils/textures/items/science/general/MetaItem1/12.png) | bin | 320 -> 320 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/science/general/MetaItem1/13.png | bin | 0 -> 432 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/science/general/MetaItem1/2.png (renamed from src/resources/assets/miscutils/textures/items/science/general/MetaItem1/2.png) | bin | 447 -> 447 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/science/general/MetaItem1/3.png (renamed from src/resources/assets/miscutils/textures/items/science/general/MetaItem1/3.png) | bin | 448 -> 448 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/science/general/MetaItem1/4.png (renamed from src/resources/assets/miscutils/textures/items/science/general/MetaItem1/4.png) | bin | 434 -> 434 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/science/general/MetaItem1/5.png (renamed from src/resources/assets/miscutils/textures/items/science/general/MetaItem1/5.png) | bin | 440 -> 440 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/science/general/MetaItem1/6.png (renamed from src/resources/assets/miscutils/textures/items/science/general/MetaItem1/6.png) | bin | 429 -> 429 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/science/general/MetaItem1/7.png (renamed from src/resources/assets/miscutils/textures/items/science/general/MetaItem1/7.png) | bin | 376 -> 376 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/science/general/MetaItem1/8.png (renamed from src/resources/assets/miscutils/textures/items/science/general/MetaItem1/8.png) | bin | 492 -> 492 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/science/general/MetaItem1/9.png (renamed from src/resources/assets/miscutils/textures/items/science/general/MetaItem1/9.png) | bin | 340 -> 340 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/science/nuclear/MetaItem1/0.png | bin | 0 -> 243 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/science/nuclear/MetaItem1/1.png | bin | 0 -> 243 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/science/nuclear/MetaItem1/2.png | bin | 0 -> 243 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/science/nuclear/MetaItem1/3.png | bin | 0 -> 243 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/science/nuclear/MetaItem1/4.png | bin | 0 -> 328 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/science/nuclear/MetaItem1/5.png | bin | 0 -> 328 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/science/nuclear/MetaItem1/6.png | bin | 0 -> 328 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/spawn_egg.png (renamed from src/resources/assets/miscutils/textures/items/spawn_egg.png) | bin | 270 -> 270 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/spawn_egg_overlay.png (renamed from src/resources/assets/miscutils/textures/items/spawn_egg_overlay.png) | bin | 402 -> 402 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/token/0.png (renamed from src/resources/assets/miscutils/textures/items/token/0.png) | bin | 3345 -> 3345 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/token/1.png (renamed from src/resources/assets/miscutils/textures/items/token/1.png) | bin | 3688 -> 3688 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/token/2.png (renamed from src/resources/assets/miscutils/textures/items/token/2.png) | bin | 3698 -> 3698 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/token/3.png (renamed from src/resources/assets/miscutils/textures/items/token/3.png) | bin | 3758 -> 3758 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/items/token/4.png (renamed from src/resources/assets/miscutils/textures/items/token/4.png) | bin | 3719 -> 3719 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/models/TinFoil.png (renamed from src/resources/assets/miscutils/textures/models/TinFoil.png) | bin | 536 -> 536 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/space/RocketGui.png (renamed from src/resources/assets/miscutils/textures/space/RocketGui.png) | bin | 490 -> 490 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/space/hd10180/A.png (renamed from src/resources/assets/miscutils/textures/space/hd10180/A.png) | bin | 220 -> 220 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/space/hd10180/B.png (renamed from src/resources/assets/miscutils/textures/space/hd10180/B.png) | bin | 810 -> 810 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/space/hd10180/C.png (renamed from src/resources/assets/miscutils/textures/space/hd10180/C.png) | bin | 810 -> 810 bytes | |||
-rw-r--r-- | src/main/resources/assets/miscutils/textures/space/hd10180/D.png (renamed from src/resources/assets/miscutils/textures/space/hd10180/D.png) | bin | 817 -> 817 bytes | |||
-rw-r--r-- | src/main/resources/assets/spiceoflife/lang/de_DE.lang (renamed from src/resources/assets/spiceoflife/lang/de_DE.lang) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/spiceoflife/lang/en_US.lang (renamed from src/resources/assets/spiceoflife/lang/en_US.lang) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/spiceoflife/lang/es_ES.lang (renamed from src/resources/assets/spiceoflife/lang/es_ES.lang) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/spiceoflife/lang/fr_FR.lang (renamed from src/resources/assets/spiceoflife/lang/fr_FR.lang) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/spiceoflife/lang/it_IT.lang (renamed from src/resources/assets/spiceoflife/lang/it_IT.lang) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/spiceoflife/lang/ko_KR.lang (renamed from src/resources/assets/spiceoflife/lang/ko_KR.lang) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/spiceoflife/lang/ru_RU.lang (renamed from src/resources/assets/spiceoflife/lang/ru_RU.lang) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/spiceoflife/lang/zh_CN.lang (renamed from src/resources/assets/spiceoflife/lang/zh_CN.lang) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/spiceoflife/textures/items/foodcrate.png (renamed from src/resources/assets/spiceoflife/textures/items/foodcrate.png) | bin | 365 -> 365 bytes | |||
-rw-r--r-- | src/main/resources/assets/spiceoflife/textures/items/foodcrate_open_empty.png (renamed from src/resources/assets/spiceoflife/textures/items/foodcrate_open_empty.png) | bin | 355 -> 355 bytes | |||
-rw-r--r-- | src/main/resources/assets/spiceoflife/textures/items/foodcrate_open_full.png (renamed from src/resources/assets/spiceoflife/textures/items/foodcrate_open_full.png) | bin | 509 -> 509 bytes | |||
-rw-r--r-- | src/main/resources/assets/stevescarts/lang/en_US.lang (renamed from src/resources/assets/stevescarts/lang/en_US.lang) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/stevescarts/lang/zh_CN.lang (renamed from src/resources/assets/stevescarts/lang/zh_CN.lang) | 0 | ||||
-rw-r--r-- | src/main/resources/assets/stevescarts/textures/items/crop_exotic_seeds_icon.png (renamed from src/resources/assets/stevescarts/textures/items/crop_exotic_seeds_icon.png) | bin | 540 -> 540 bytes | |||
-rw-r--r-- | src/main/resources/mcmod.info (renamed from src/resources/mcmod.info) | 8 | ||||
-rw-r--r-- | src/resources/GradleStartClient.java | 103 | ||||
-rw-r--r-- | src/resources/assets/gregtech/textures/gui/basicmachines/FissionFuel.png | bin | 1149 -> 0 bytes | |||
-rw-r--r-- | src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_GRINDING_FACTORY.png | bin | 671 -> 0 bytes | |||
-rw-r--r-- | src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_PIPE_T1.png | bin | 598 -> 0 bytes |
3365 files changed, 16241 insertions, 13155 deletions
diff --git a/src/Java/gtPlusPlus/core/gui/machine/GUI_VolumetricFlaskSetter.java b/src/Java/gtPlusPlus/core/gui/machine/GUI_VolumetricFlaskSetter.java deleted file mode 100644 index 0257e51d0c..0000000000 --- a/src/Java/gtPlusPlus/core/gui/machine/GUI_VolumetricFlaskSetter.java +++ /dev/null @@ -1,183 +0,0 @@ -package gtPlusPlus.core.gui.machine; - -import org.lwjgl.input.Keyboard; -import org.lwjgl.opengl.GL11; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import gtPlusPlus.core.container.Container_VolumetricFlaskSetter; -import gtPlusPlus.core.gui.widget.GuiValueField; -import gtPlusPlus.core.handler.PacketHandler; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.network.packet.Packet_VolumetricFlaskGui; -import gtPlusPlus.core.tileentities.general.TileEntityVolumetricFlaskSetter; -import net.minecraft.client.gui.GuiTextField; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.client.resources.I18n; -import net.minecraft.util.ResourceLocation; - -@SideOnly(Side.CLIENT) -public class GUI_VolumetricFlaskSetter extends GuiContainer { - - private GuiTextField mText; - private boolean mIsOpen = false; - private TileEntityVolumetricFlaskSetter mTile; - private Container_VolumetricFlaskSetter mContainer; - private static final ResourceLocation mGuiTextures = new ResourceLocation(CORE.MODID, "textures/gui/VolumetricFlaskSetter.png"); - - public GUI_VolumetricFlaskSetter(Container_VolumetricFlaskSetter aContainer){ - super(aContainer); - mContainer = aContainer; - mTile = mContainer.mTileEntity; - } - - public void initGui(){ - super.initGui(); - Keyboard.enableRepeatEvents(true); - mIsOpen = true; - this.mText = new GuiValueField(this.fontRendererObj, 26, 31, this.width / 2 - 62, this.height/2-52, 106, 14); - mText.setMaxStringLength(5); - mText.setEnableBackgroundDrawing(true); - mText.setText("0"); - mText.setFocused(true); - } - - protected void keyTyped(char par1, int par2){ - if (mIsOpen) { - if (mText.isFocused()) { - if (par2 == Keyboard.KEY_RETURN) { - if (mText.isFocused()) { - mText.setFocused(false); - } - } - else if (par2 == Keyboard.KEY_BACK) { - String aCurrentText = getText(); - if (aCurrentText.length() > 0) { - this.mText.setText(aCurrentText.substring(0, aCurrentText.length() - 1)); - if (getText().length() <= 0) { - this.mText.setText("0"); - } - sendUpdateToServer(); - } - } - else { - if (isNumber(par1)) { - if (this.mText.getText().equals("0")) { - this.mText.setText(""+par1); - sendUpdateToServer(); - } - else { - this.mText.textboxKeyTyped(par1, par2); - sendUpdateToServer(); - } - } - else { - super.keyTyped(par1, par2); - } - } - } - else { - super.keyTyped(par1, par2); - } - } - } - - @Override - public void onGuiClosed() { - mIsOpen = false; - mText.setEnabled(false); - mText.setVisible(false); - super.onGuiClosed(); - Keyboard.enableRepeatEvents(false); - } - - public void updateScreen(){ - super.updateScreen(); - // Update Textbox to 0 if Empty - if (getText().length() <= 0) { - this.mText.setText("0"); - sendUpdateToServer(); - } - this.mText.updateCursorCounter(); - - // Check TextBox Value is correct - short aCustomValue = 0; - if (getText().length() > 0) { - try { - aCustomValue = Short.parseShort(getText()); - short aTileValue = ((Container_VolumetricFlaskSetter) mContainer).mCustomValue; - if (mContainer != null) { - if (aTileValue != aCustomValue){ - this.mText.setText(""+aTileValue); - } - } - } catch (NumberFormatException ex) { - - } - } - } - - public void drawScreen(int par1, int par2, float par3){ - this.drawDefaultBackground(); - super.drawScreen(par1, par2, par3); - - - } - - protected void mouseClicked(int x, int y, int btn) { - if (mIsOpen) { - super.mouseClicked(x, y, btn); - this.mText.mouseClicked(x, y, btn); - } - } - - - - - @Override - protected void drawGuiContainerForegroundLayer(final int i, final int j){ - super.drawGuiContainerForegroundLayer(i, j); - this.mText.drawTextBox(); - this.fontRendererObj.drawString(I18n.format("container.VolumetricFlaskSetter", new Object[0]), 4, 3, 4210752); - int aYVal = 49; - this.fontRendererObj.drawString(I18n.format("0 = 16l", new Object[0]), 8, aYVal, 4210752); - this.fontRendererObj.drawString(I18n.format("4 = 576l", new Object[0]), 64, aYVal, 4210752); - this.fontRendererObj.drawString(I18n.format("1 = 36l", new Object[0]), 8, aYVal+=8, 4210752); - this.fontRendererObj.drawString(I18n.format("5 = 720l", new Object[0]), 64, aYVal, 4210752); - this.fontRendererObj.drawString(I18n.format("2 = 144l", new Object[0]), 8, aYVal+=8, 4210752); - this.fontRendererObj.drawString(I18n.format("6 = 864l", new Object[0]), 64, aYVal, 4210752); - this.fontRendererObj.drawString(I18n.format("3 = 432l", new Object[0]), 8, aYVal+=8, 4210752); - this.fontRendererObj.drawString(I18n.format("-> = Custom", new Object[0]), 59, aYVal, 4210752); - - } - - @Override - protected void drawGuiContainerBackgroundLayer(final float f, final int i, final int j){ - GL11.glColor4f(1.0f, 1.0f, 1.0f, 1.0f); - this.mc.renderEngine.bindTexture(mGuiTextures); - final int x = (this.width - this.xSize) / 2; - final int y = (this.height - this.ySize) / 2; - this.drawTexturedModalRect(x, y, 0, 0, this.xSize, this.ySize); - } - - public boolean isNumber(char c) { - return ((c >= 48 && c <= 57) || c == 45); - } - - protected String getText() { - return this.mText.getText(); - } - - protected void sendUpdateToServer() { - short aCustomValue = 0; - if (getText().length() > 0) { - try { - aCustomValue = Short.parseShort(getText()); - PacketHandler.sendToServer(new Packet_VolumetricFlaskGui(mTile, aCustomValue)); - } catch (NumberFormatException ex) { - - } - } - } - -}
\ No newline at end of file diff --git a/src/Java/gtPlusPlus/core/gui/widget/GuiValueField.java b/src/Java/gtPlusPlus/core/gui/widget/GuiValueField.java deleted file mode 100644 index ac4c1a8aee..0000000000 --- a/src/Java/gtPlusPlus/core/gui/widget/GuiValueField.java +++ /dev/null @@ -1,86 +0,0 @@ -package gtPlusPlus.core.gui.widget; - -import java.lang.reflect.Field; - -import gtPlusPlus.core.util.reflect.ReflectionUtils; -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.gui.GuiTextField; - -public class GuiValueField extends GuiTextField { - - private final FontRenderer mFontRenderer; - private final int mScreenLocationX; - private final int mScreenLocationY; - - public GuiValueField(FontRenderer aFontRenderer, int aX, int aY, int aScreenLocationX, int aScreenLocationY, int aWidth, int aHeight) { - super(aFontRenderer, aX, aY, aWidth, aHeight); - mFontRenderer = aFontRenderer; - mScreenLocationX = aScreenLocationX; - mScreenLocationY = aScreenLocationY; - } - - public boolean canLoseFocus() { - Field canLoseFocus = ReflectionUtils.getField(GuiTextField.class, "canLoseFocus"); - if (canLoseFocus != null) { - return (boolean) ReflectionUtils.getFieldValue(canLoseFocus, this); - } - return true; - } - - public boolean isFocused() { - Field isFocused = ReflectionUtils.getField(GuiTextField.class, "isFocused"); - if (isFocused != null) { - return (boolean) ReflectionUtils.getFieldValue(isFocused, this); - } - return false; - } - - public boolean isBackgroundDrawingEnabled() { - Field enableBackgroundDrawing = ReflectionUtils.getField(GuiTextField.class, "enableBackgroundDrawing"); - if (enableBackgroundDrawing != null) { - return (boolean) ReflectionUtils.getFieldValue(enableBackgroundDrawing, this); - } - return true; - } - public int getLineScrollOffset() { - Field lineScrollOffset = ReflectionUtils.getField(GuiTextField.class, "lineScrollOffset"); - if (lineScrollOffset != null) { - return (int) ReflectionUtils.getFieldValue(lineScrollOffset, this); - } - return 0; - } - - /** - * Args: x, y, buttonClicked - */ - public void mouseClicked(int aX, int aY, int aButton){ - - boolean flag = aX >= this.mScreenLocationX && aX < this.mScreenLocationX + this.width && aY >= this.mScreenLocationY && aY < this.mScreenLocationY + this.height; - - //Logger.INFO("Clicked X:"+aX); - //Logger.INFO("Clicked Y:"+aY); - //Logger.INFO("ScreenPos X:"+mScreenLocationX); - //Logger.INFO("ScreenPos Y:"+mScreenLocationY); - //Logger.INFO("Render X:"+xPosition); - //Logger.INFO("Render Y:"+yPosition); - - if (canLoseFocus()) - { - this.setFocused(flag); - } - - if (isFocused() && aButton == 0) - { - int l = aX - this.mScreenLocationX; - - if (isBackgroundDrawingEnabled()) - { - l -= 4; - } - - String s = this.mFontRenderer.trimStringToWidth(this.getText().substring(getLineScrollOffset()), this.getWidth()); - this.setCursorPosition(this.mFontRenderer.trimStringToWidth(s, l).length() + getLineScrollOffset()); - } - } - -} diff --git a/src/Java/gtPlusPlus/core/item/base/rods/BaseItemRod.java b/src/Java/gtPlusPlus/core/item/base/rods/BaseItemRod.java deleted file mode 100644 index ef3266fe75..0000000000 --- a/src/Java/gtPlusPlus/core/item/base/rods/BaseItemRod.java +++ /dev/null @@ -1,49 +0,0 @@ -package gtPlusPlus.core.item.base.rods; - -import net.minecraft.item.ItemStack; - -import gregtech.api.enums.GT_Values; - -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.item.base.BaseItemComponent; -import gtPlusPlus.core.material.Material; -import gtPlusPlus.core.util.minecraft.ItemUtils; - -public class BaseItemRod extends BaseItemComponent{ - - public BaseItemRod(final Material material) { - super(material, BaseItemComponent.ComponentTypes.ROD); - this.addCutterRecipe(material); - this.addLatheRecipe(material); - } - - - private void addCutterRecipe(Material material){ - Logger.WARNING("Adding cutter recipe for "+this.materialName+" Rods"); - final ItemStack stackStick = this.componentMaterial.getRod(1); - final ItemStack stackBolt = this.componentMaterial.getBolt(4); - - if (ItemUtils.checkForInvalidItems(new ItemStack[] {stackStick, stackBolt})) - GT_Values.RA.addCutterRecipe( - stackStick, - stackBolt, - null, - (int) Math.max(this.componentMaterial.getMass() * 2L, 1L), - material.vVoltageMultiplier); - } - - - private void addLatheRecipe(Material material){ - Logger.WARNING("Adding recipe for "+this.materialName+" Rod"); - ItemStack boltStack = this.componentMaterial.getIngot(1); - if (ItemUtils.checkForInvalidItems(boltStack)){ - GT_Values.RA.addLatheRecipe( - boltStack, - ItemUtils.getSimpleStack(this), - material.getSmallDust(2), - (int) Math.max(this.componentMaterial.getMass() / 8L, 1L), - material.vVoltageMultiplier); - } - } - -} diff --git a/src/Java/gtPlusPlus/core/item/base/rods/BaseItemRodLong.java b/src/Java/gtPlusPlus/core/item/base/rods/BaseItemRodLong.java deleted file mode 100644 index 9b232f95c5..0000000000 --- a/src/Java/gtPlusPlus/core/item/base/rods/BaseItemRodLong.java +++ /dev/null @@ -1,46 +0,0 @@ -package gtPlusPlus.core.item.base.rods; - -import net.minecraft.item.ItemStack; - -import gregtech.api.enums.GT_Values; - -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.item.base.BaseItemComponent; -import gtPlusPlus.core.material.Material; -import gtPlusPlus.core.util.minecraft.ItemUtils; - -public class BaseItemRodLong extends BaseItemComponent{ - - public BaseItemRodLong(final Material material) { - super(material, BaseItemComponent.ComponentTypes.RODLONG); - this.addExtruderRecipe(); - } - - @Override - public String getItemStackDisplayName(final ItemStack p_77653_1_) { - return ("Long "+this.materialName+ " Rod"); - } - - private void addExtruderRecipe(){ - Logger.WARNING("Adding recipe for Long "+this.materialName+" Rods"); - - final ItemStack stackStick = this.componentMaterial.getRod(2); - final ItemStack stackLong = this.componentMaterial.getLongRod(1); - - if (ItemUtils.checkForInvalidItems(new ItemStack[] {stackStick, stackLong})) - GT_Values.RA.addForgeHammerRecipe( - stackStick, - stackLong, - (int) Math.max(this.componentMaterial.getMass(), 1L), - 16); - - if (ItemUtils.checkForInvalidItems(new ItemStack[] {stackStick, stackLong})) - GT_Values.RA.addCutterRecipe( - stackLong, - stackStick, - null, - (int) Math.max(this.componentMaterial.getMass(), 1L), - 4); - } - -} diff --git a/src/Java/gtPlusPlus/core/item/base/screws/BaseItemScrew.java b/src/Java/gtPlusPlus/core/item/base/screws/BaseItemScrew.java deleted file mode 100644 index 29e525ed10..0000000000 --- a/src/Java/gtPlusPlus/core/item/base/screws/BaseItemScrew.java +++ /dev/null @@ -1,32 +0,0 @@ -package gtPlusPlus.core.item.base.screws; - -import net.minecraft.item.ItemStack; - -import gregtech.api.enums.GT_Values; - -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.item.base.BaseItemComponent; -import gtPlusPlus.core.material.Material; -import gtPlusPlus.core.util.minecraft.ItemUtils; - -public class BaseItemScrew extends BaseItemComponent{ - - public BaseItemScrew(final Material material) { - super(material, BaseItemComponent.ComponentTypes.SCREW); - this.addLatheRecipe(); - } - - private void addLatheRecipe(){ - Logger.WARNING("Adding recipe for "+this.materialName+" Screws"); - ItemStack boltStack = this.componentMaterial.getBolt(1); - if (ItemUtils.checkForInvalidItems(boltStack)){ - GT_Values.RA.addLatheRecipe( - boltStack, - ItemUtils.getSimpleStack(this), - null, - (int) Math.max(this.componentMaterial.getMass() / 8L, 1L), - 4); - } - } - -} diff --git a/src/Java/gtPlusPlus/core/material/nuclear/NUCLIDE.java b/src/Java/gtPlusPlus/core/material/nuclear/NUCLIDE.java deleted file mode 100644 index 73751ac49d..0000000000 --- a/src/Java/gtPlusPlus/core/material/nuclear/NUCLIDE.java +++ /dev/null @@ -1,129 +0,0 @@ -package gtPlusPlus.core.material.nuclear; - -import gtPlusPlus.core.client.CustomTextureSet.TextureSets; -import gtPlusPlus.core.material.ELEMENT; -import gtPlusPlus.core.material.Material; -import gtPlusPlus.core.material.MaterialStack; -import gtPlusPlus.core.material.state.MaterialState; -import gtPlusPlus.core.util.data.StringUtils; - - -public final class NUCLIDE { - - public static final Material LiFBeF2ThF4UF4 = new Material( - "LiFBeF2ThF4UF4", //Material Name - MaterialState.LIQUID, //State - TextureSets.NUCLEAR.get(), - null, //Material Colour - 566, //Melting Point in C - 870, //Boiling Point in C - -1, //Protons - -1, //Neutrons - false, //Uses Blast furnace? - StringUtils.subscript(StringUtils.superscript("7")+"LiFBeF2ThF4UF4"), //Chemical Formula - 5, //Radioactivity Level - //Material Stacks with Percentage of required elements. - new MaterialStack[]{ - new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 65), - new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 28), - new MaterialStack(FLUORIDES.THORIUM_TETRAFLUORIDE, 1), - new MaterialStack(FLUORIDES.URANIUM_TETRAFLUORIDE, 1) - }); - - public static final Material LiFBeF2ZrF4UF4 = new Material( - "LiFBeF2ZrF4UF4", //Material Name - MaterialState.LIQUID, //State - TextureSets.NUCLEAR.get(), - null, //Material Colour - 650, //Melting Point in C - 940, //Boiling Point in C - -1, //Protons - -1, //Neutrons - false, //Uses Blast furnace? - StringUtils.subscript(StringUtils.superscript("7")+"LiFBeF2ZrF4UF4"), //Chemical Formula - 5, //Radioactivity Level - //Material Stacks with Percentage of required elements. - new MaterialStack[]{ - new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 65), - new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 28), - new MaterialStack(FLUORIDES.ZIRCONIUM_TETRAFLUORIDE, 5), - new MaterialStack(FLUORIDES.URANIUM_TETRAFLUORIDE, 2) - }); - - public static final Material LiFBeF2ZrF4U235 = new Material( - "LiFBeF2ZrF4U235", //Material Name - MaterialState.LIQUID, //State - TextureSets.NUCLEAR.get(), - null, //Material Colour - 590, //Melting Point in C - 890, //Boiling Point in C - -1, //Protons - -1, //Neutrons - false, //Uses Blast furnace? - StringUtils.subscript(StringUtils.superscript("7")+"LiFBeF2ZrF4")+StringUtils.superscript("235U"), //Chemical Formula - 5, //Radioactivity Level - //Material Stacks with Percentage of required elements. - new MaterialStack[]{ - new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 55), - new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 25), - new MaterialStack(FLUORIDES.ZIRCONIUM_TETRAFLUORIDE, 6), - new MaterialStack(ELEMENT.getInstance().URANIUM235, 14) - }); - - // Secondary material is molten metal - public static final Material NAQ_FUEL_T1 = new Material( - "Naquadah Fuel", - MaterialState.PURE_LIQUID, //State - null, //Material Colour - -1, //Melting Point in C - -1, //Boiling Point in C - -1, //Protons - -1, - false, //Uses Blast furnace? - //Material Stacks with Percentage of required elements. - new MaterialStack[]{ - new MaterialStack(ELEMENT.getInstance().NAQUADAH, 2), - new MaterialStack(ELEMENT.getInstance().TANTALUM, 3) - }); - - // Secondary material is a plasma - public static final Material NAQ_FUEL_T2 = new Material( - "Enriched Naquadah Fuel", - MaterialState.PURE_LIQUID, //State - null, //Material Colour - -1, //Melting Point in C - -1, //Boiling Point in C - -1, //Protons - -1, - false, //Uses Blast furnace? - //Material Stacks with Percentage of required elements. - new MaterialStack[]{ - new MaterialStack(ELEMENT.getInstance().NAQUADAH_ENRICHED, 2), - new MaterialStack(ELEMENT.getInstance().TITANIUM, 3) - }); - - // Secondary material is a plasma - public static final Material NAQ_FUEL_T3 = new Material( - "Naquadria Fuel", - MaterialState.PURE_LIQUID, //State - null, //Material Colour - -1, //Melting Point in C - -1, //Boiling Point in C - -1, //Protons - -1, - false, //Uses Blast furnace? - //Material Stacks with Percentage of required elements. - new MaterialStack[]{ - new MaterialStack(ELEMENT.getInstance().NAQUADRIA, 2), - new MaterialStack(ELEMENT.getInstance().AMERICIUM, 3) - }); - - - - private static final NUCLIDE INSTANCE = new NUCLIDE(); - - public static NUCLIDE getInstance(){ - return INSTANCE; - } - -} diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_SeleniumProcessing.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_SeleniumProcessing.java deleted file mode 100644 index 902806e026..0000000000 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_SeleniumProcessing.java +++ /dev/null @@ -1,218 +0,0 @@ -package gtPlusPlus.core.recipe; - -import gregtech.api.enums.Materials; -import gregtech.api.enums.OrePrefixes; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.material.ELEMENT; -import gtPlusPlus.core.material.MISC_MATERIALS; -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.reflect.AddGregtechRecipe; -import net.minecraft.item.ItemStack; - -public class RECIPES_SeleniumProcessing { - - public static void init() { - - //We need this - MaterialUtils.generateSpecialDustAndAssignToAMaterial(MISC_MATERIALS.SELENIUM_DIOXIDE, false); - - // Makes Selenium Dioxide - processCopperRecipes(); - - //Liquify the Dried Dioxide - AddGregtechRecipe.addCokeAndPyrolyseRecipes(MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1), 13, FluidUtils.getSteam(500), null, MISC_MATERIALS.SELENIUM_DIOXIDE.getFluid(1000), 20, 1024); - - // Produce Selenious Acid - AddGregtechRecipe.addCokeAndPyrolyseRecipes(MISC_MATERIALS.SELENIUM_DIOXIDE.getCell(1), 14, FluidUtils.getHotWater(4000), CI.emptyCells(1), MISC_MATERIALS.SELENIOUS_ACID.getFluid(1000), 20, 2048); - - // Make Selenium - CORE.RA.addBlastSmelterRecipe( - new ItemStack[] { - ItemUtils.getGregtechCircuit(14), - ItemUtils.getItemStackOfAmountFromOreDict("cellSulfuricAcid", 8), - ELEMENT.getInstance().CARBON.getDust(16), - }, - MISC_MATERIALS.SELENIOUS_ACID.getFluid(750), - ELEMENT.getInstance().SELENIUM.getFluid(144 * 1), - new ItemStack[] { - CI.emptyCells(8), - ELEMENT.getInstance().SELENIUM.getIngot(1), - ELEMENT.getInstance().SELENIUM.getIngot(1), - }, - new int[] {10000, 2000, 2000}, - 20 * 300, - 7200); - - - /*// Old recipes for Selenium Roasting - CORE.RA.addBlastSmelterRecipe( - new ItemStack[] { - ItemUtils.getGregtechCircuit(16), - ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedPyrite", 8), - ELEMENT.getInstance().CARBON.getDust(32), - }, - Materials.SulfuricAcid.getFluid(4000), - ELEMENT.getInstance().SELENIUM.getFluid(144), - 0, - 20 * 300, - 2000); - CORE.RA.addBlastSmelterRecipe( - new ItemStack[] { - ItemUtils.getGregtechCircuit(17), - ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedChalcopyrite", 8), - ELEMENT.getInstance().CARBON.getDust(32), - }, - Materials.SulfuricAcid.getFluid(4000), - ELEMENT.getInstance().SELENIUM.getFluid(144), - 0, - 20 * 300, - 2000); - CORE.RA.addBlastSmelterRecipe( - new ItemStack[] { - ItemUtils.getGregtechCircuit(18), - ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedGalena", 8), - ELEMENT.getInstance().CARBON.getDust(32), - }, - Materials.SulfuricAcid.getFluid(4000), - ELEMENT.getInstance().SELENIUM.getFluid(144), - 0, - 20 * 300, - 2000);*/ - } - - - public static void processCopperRecipes() { - - //Copper - CORE.RA.addDehydratorRecipe( - new ItemStack[]{ - ItemUtils.getOrePrefixStack(OrePrefixes.crushedPurified, Materials.Copper, 1), // Item Input - }, - FluidUtils.getHotWater(1000), // Fluid - MISC_MATERIALS.SELENIUM_DIOXIDE.getFluid(20), // Fluid - new ItemStack[] { - ItemUtils.getOrePrefixStack(OrePrefixes.crushedCentrifuged, Materials.Copper, 1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1), - }, // Output - new int[] { - 10000, - 100, - 100, - 500, - 500, - 500, - 1000, - 1000, - 1000 - }, - 40 * 20, // Time in ticks - 1024); // EU - - //Tetra - CORE.RA.addDehydratorRecipe( - new ItemStack[]{ - ItemUtils.getOrePrefixStack(OrePrefixes.crushedPurified, Materials.Tetrahedrite, 1), // Item Input - }, - FluidUtils.getHotWater(1000), // Fluid - MISC_MATERIALS.SELENIUM_DIOXIDE.getFluid(10), // Fluid - new ItemStack[] { - ItemUtils.getOrePrefixStack(OrePrefixes.crushedCentrifuged, Materials.Tetrahedrite, 1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1), - }, // Output - new int[] { - 10000, - 100, - 100, - 300, - 300, - 300, - 800, - 800, - 800 - }, - 40 * 20, // Time in ticks - 1024); // EU - - //Chalco - CORE.RA.addDehydratorRecipe( - new ItemStack[]{ - ItemUtils.getOrePrefixStack(OrePrefixes.crushedPurified, Materials.Chalcopyrite, 1), // Item Input - }, - FluidUtils.getHotWater(1000), // Fluid - MISC_MATERIALS.SELENIUM_DIOXIDE.getFluid(10), // Fluid - new ItemStack[] { - ItemUtils.getOrePrefixStack(OrePrefixes.crushedCentrifuged, Materials.Chalcopyrite, 1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1), - }, // Output - new int[] { - 10000, - 100, - 100, - 300, - 300, - 300, - 800, - 800, - 800 - }, - 40 * 20, // Time in ticks - 1024); // EU - - //Malachite - CORE.RA.addDehydratorRecipe( - new ItemStack[]{ - ItemUtils.getOrePrefixStack(OrePrefixes.crushedPurified, Materials.Malachite, 1), // Item Input - }, - FluidUtils.getHotWater(1000), // Fluid - MISC_MATERIALS.SELENIUM_DIOXIDE.getFluid(10), // Fluid - new ItemStack[] { - ItemUtils.getOrePrefixStack(OrePrefixes.crushedCentrifuged, Materials.Malachite, 1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1), - MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1), - }, // Output - new int[] { - 10000, - 100, - 100, - 300, - 300, - 300, - 800, - 800, - 800 - }, - 40 * 20, // Time in ticks - 1024); // EU - } - -} diff --git a/src/Java/gtPlusPlus/nei/GTPP_NEI_DefaultHandler.java b/src/Java/gtPlusPlus/nei/GTPP_NEI_DefaultHandler.java deleted file mode 100644 index 2c00010a1a..0000000000 --- a/src/Java/gtPlusPlus/nei/GTPP_NEI_DefaultHandler.java +++ /dev/null @@ -1,822 +0,0 @@ -package gtPlusPlus.nei; - -import java.awt.Point; -import java.awt.Rectangle; -import java.util.*; - -import org.lwjgl.opengl.GL11; - -import cpw.mods.fml.common.event.FMLInterModComms; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; - -import gregtech.api.enums.GT_Values; -import gregtech.api.enums.OrePrefixes; -import gregtech.api.gui.GT_GUIContainer_BasicMachine; -import gregtech.api.objects.ItemData; -import gregtech.api.util.*; -import gregtech.api.util.GT_Recipe.GT_Recipe_Map; -import codechicken.lib.gui.GuiDraw; -import codechicken.nei.PositionedStack; -import codechicken.nei.guihook.GuiContainerManager; -import codechicken.nei.guihook.IContainerInputHandler; -import codechicken.nei.guihook.IContainerTooltipHandler; -import codechicken.nei.recipe.*; -import net.minecraftforge.fluids.FluidContainerRegistry; -import net.minecraftforge.fluids.FluidStack; - -public class GTPP_NEI_DefaultHandler -extends TemplateRecipeHandler { - public static final int sOffsetX = 5; - public static final int sOffsetY = 11; - - static { - GuiContainerManager.addInputHandler(new GT_RectHandler()); - GuiContainerManager.addTooltipHandler(new GT_RectHandler()); - } - - protected final GT_Recipe_Map mRecipeMap; - - public GTPP_NEI_DefaultHandler(final GT_Recipe_Map tMap) { - this.mRecipeMap = tMap; - this.transferRects.add(new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(65, 13, 36, 18), this.getOverlayIdentifier(), new Object[0])); - if (!NEI_GT_Config.sIsAdded) { - FMLInterModComms.sendRuntimeMessage(GT_Values.GT, "NEIPlugins", "register-crafting-handler", "gregtechplusplus@" + this.getRecipeName() + "@" + this.getOverlayIdentifier()); - GuiCraftingRecipe.craftinghandlers.add(this); - GuiUsageRecipe.usagehandlers.add(this); - } - } - - public static void drawText(final int aX, final int aY, final String aString, final int aColor) { - Minecraft.getMinecraft().fontRenderer.drawString(aString, aX, aY, aColor); - } - - @Override - public TemplateRecipeHandler newInstance() { - return new GTPP_NEI_DefaultHandler(this.mRecipeMap); - } - - - public List<GT_Recipe> getSortedRecipes() { - List<GT_Recipe> result = new ArrayList<>(this.mRecipeMap.mRecipeList); - Collections.sort(result); - return result; - } - - public void loadCraftingRecipes(String outputId, Object... results) { - if (outputId.equals(getOverlayIdentifier())) { - for (GT_Recipe tRecipe : getSortedRecipes()) { - if (!tRecipe.mHidden) { - this.arecipes.add(new CachedDefaultRecipe(tRecipe)); - } - } - } else { - super.loadCraftingRecipes(outputId, results); - } - } - - public void loadCraftingRecipes(ItemStack aResult) { - ItemData tPrefixMaterial = GT_OreDictUnificator.getAssociation(aResult); - - ArrayList<ItemStack> tResults = new ArrayList<ItemStack>(); - tResults.add(aResult); - tResults.add(GT_OreDictUnificator.get(true, aResult)); - if ((tPrefixMaterial != null) && (!tPrefixMaterial.mBlackListed) && (!tPrefixMaterial.mPrefix.mFamiliarPrefixes.isEmpty())) { - for (OrePrefixes tPrefix : tPrefixMaterial.mPrefix.mFamiliarPrefixes) { - tResults.add(GT_OreDictUnificator.get(tPrefix, tPrefixMaterial.mMaterial.mMaterial, 1L)); - } - } - FluidStack tFluid = GT_Utility.getFluidForFilledItem(aResult, true); - if (tFluid != null) { - tResults.add(GT_Utility.getFluidDisplayStack(tFluid, false)); - for (FluidContainerRegistry.FluidContainerData tData : FluidContainerRegistry.getRegisteredFluidContainerData()) { - if (tData.fluid.isFluidEqual(tFluid)) { - tResults.add(GT_Utility.copy(new Object[]{tData.filledContainer})); - } - } - } - for (GT_Recipe tRecipe : getSortedRecipes()) { - if (!tRecipe.mHidden) { - CachedDefaultRecipe tNEIRecipe = new CachedDefaultRecipe(tRecipe); - for (ItemStack tStack : tResults) { - if (tNEIRecipe.contains(tNEIRecipe.mOutputs, tStack)) { - this.arecipes.add(tNEIRecipe); - break; - } - } - } - } - } - - public void loadUsageRecipes(ItemStack aInput) { - ItemData tPrefixMaterial = GT_OreDictUnificator.getAssociation(aInput); - ArrayList<ItemStack> tInputs = new ArrayList<ItemStack>(); - tInputs.add(aInput); - tInputs.add(GT_OreDictUnificator.get(false, aInput)); - if ((tPrefixMaterial != null) && (!tPrefixMaterial.mPrefix.mFamiliarPrefixes.isEmpty())) { - for (OrePrefixes tPrefix : tPrefixMaterial.mPrefix.mFamiliarPrefixes) { - tInputs.add(GT_OreDictUnificator.get(tPrefix, tPrefixMaterial.mMaterial.mMaterial, 1L)); - } - } - FluidStack tFluid = GT_Utility.getFluidForFilledItem(aInput, true); - if (tFluid != null) { - tInputs.add(GT_Utility.getFluidDisplayStack(tFluid, false)); - for (FluidContainerRegistry.FluidContainerData tData : FluidContainerRegistry.getRegisteredFluidContainerData()) { - if (tData.fluid.isFluidEqual(tFluid)) { - tInputs.add(GT_Utility.copy(new Object[]{tData.filledContainer})); - } - } - } - for (GT_Recipe tRecipe : getSortedRecipes()) { - if (!tRecipe.mHidden) { - CachedDefaultRecipe tNEIRecipe = new CachedDefaultRecipe(tRecipe); - for (ItemStack tStack : tInputs) { - if (tNEIRecipe.contains(tNEIRecipe.mInputs, tStack)) { - this.arecipes.add(tNEIRecipe); - break; - } - } - } - } - } - - @Override - public String getOverlayIdentifier() { - return this.mRecipeMap.mNEIName; - } - - @Override - public void drawBackground(final int recipe) { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - GuiDraw.changeTexture(this.getGuiTexture()); - GuiDraw.drawTexturedModalRect(-4, -8, 1, 3, 174, 78); - } - - @Override - public int recipiesPerPage() { - return 1; - } - - @Override - public String getRecipeName() { - return GT_LanguageManager.getTranslation(this.mRecipeMap.mUnlocalizedName); - } - - @Override - public String getGuiTexture() { - // return "gregtech:textures/gui/" + this.mRecipeMap.mUnlocalizedName + ".png"; - return this.mRecipeMap.mNEIGUIPath; - } - - @Override - public List<String> handleItemTooltip(final GuiRecipe gui, final ItemStack aStack, final List<String> currenttip, final int aRecipeIndex) { - final TemplateRecipeHandler.CachedRecipe tObject = this.arecipes.get(aRecipeIndex); - if ((tObject instanceof CachedDefaultRecipe)) { - final CachedDefaultRecipe tRecipe = (CachedDefaultRecipe) tObject; - for (final PositionedStack tStack : tRecipe.mOutputs) { - if (aStack == tStack.item) { - if ((!(tStack instanceof FixedPositionedStack)) || (((FixedPositionedStack) tStack).mChance <= 0) || (((FixedPositionedStack) tStack).mChance == 10000)) { - break; - } - currenttip.add("Chance: " + (((FixedPositionedStack) tStack).mChance / 100) + "." + ((((FixedPositionedStack) tStack).mChance % 100) < 10 ? "0" + (((FixedPositionedStack) tStack).mChance % 100) : Integer.valueOf(((FixedPositionedStack) tStack).mChance % 100)) + "%"); - break; - } - } - for (final PositionedStack tStack : tRecipe.mInputs) { - if (aStack == tStack.item) { - if ((gregtech.api.enums.ItemList.Display_Fluid.isStackEqual(tStack.item, true, true)) || - (tStack.item.stackSize != 0)) { - break; - } - currenttip.add("Does not get consumed in the process"); - break; - } - } - } - return currenttip; - } - - @Override - public void drawExtras(final int aRecipeIndex) { - final int tEUt = ((CachedDefaultRecipe) this.arecipes.get(aRecipeIndex)).mRecipe.mEUt; - final int tDuration = ((CachedDefaultRecipe) this.arecipes.get(aRecipeIndex)).mRecipe.mDuration; - if (tEUt != 0) { - drawText(10, 73, "Total: " + (tDuration * tEUt) + " EU", -16777216); - drawText(10, 83, "Usage: " + tEUt + " EU/t", -16777216); - if (this.mRecipeMap.mShowVoltageAmperageInNEI) { - drawText(10, 93, "Voltage: " + (tEUt / this.mRecipeMap.mAmperage) + " EU", -16777216); - drawText(10, 103, "Amperage: " + this.mRecipeMap.mAmperage, -16777216); - } else { - drawText(10, 93, "Voltage: unspecified", -16777216); - drawText(10, 103, "Amperage: unspecified", -16777216); - } - } - if (tDuration > 0) { - drawText(10, 113, "Time: " + (tDuration < 20 ? "< 1" : Integer.valueOf(tDuration / 20)) + " secs", -16777216); - } - if ((GT_Utility.isStringValid(this.mRecipeMap.mNEISpecialValuePre)) || (GT_Utility.isStringValid(this.mRecipeMap.mNEISpecialValuePost))) { - drawText(10, 123, this.mRecipeMap.mNEISpecialValuePre + (((CachedDefaultRecipe) this.arecipes.get(aRecipeIndex)).mRecipe.mSpecialValue * this.mRecipeMap.mNEISpecialValueMultiplier) + this.mRecipeMap.mNEISpecialValuePost, -16777216); - } - } - - public static class GT_RectHandler - implements IContainerInputHandler, IContainerTooltipHandler { - @Override - public boolean mouseClicked(final GuiContainer gui, final int mousex, final int mousey, final int button) { - if (this.canHandle(gui)) { - if (button == 0) { - return this.transferRect(gui, false); - } - if (button == 1) { - return this.transferRect(gui, true); - } - } - return false; - } - - @Override - public boolean lastKeyTyped(final GuiContainer gui, final char keyChar, final int keyCode) { - return false; - } - - public boolean canHandle(final GuiContainer gui) { - return (((gui instanceof GT_GUIContainer_BasicMachine)) && (GT_Utility.isStringValid(((GT_GUIContainer_BasicMachine) gui).mNEI)) /*|| ((gui instanceof GT_GUIContainer_FusionReactor)) && (GT_Utility.isStringValid(((GT_GUIContainer_FusionReactor) gui).mNEI))*/); - } - - @Override - public List<String> handleTooltip(final GuiContainer gui, final int mousex, final int mousey, final List<String> currenttip) { - if ((this.canHandle(gui)) && (currenttip.isEmpty())) { - if ((gui instanceof GT_GUIContainer_BasicMachine) && new Rectangle(65, 13, 36, 18).contains(new Point(GuiDraw.getMousePosition().x - ((GT_GUIContainer_BasicMachine) gui).getLeft() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[0], GuiDraw.getMousePosition().y - ((GT_GUIContainer_BasicMachine) gui).getTop() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[1]))) { - currenttip.add("Recipes"); - } /*else if (gui instanceof GT_GUIContainer_FusionReactor && new Rectangle(145, 0, 24, 24).contains(new Point(GuiDraw.getMousePosition().x - ((GT_GUIContainer_FusionReactor) gui).getLeft() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[0], GuiDraw.getMousePosition().y - ((GT_GUIContainer_FusionReactor) gui).getTop() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[1]))) { - currenttip.add("Recipes"); - }*/ - - } - return currenttip; - } - - private boolean transferRect(final GuiContainer gui, final boolean usage) { - if (gui instanceof GT_GUIContainer_BasicMachine) { - return (this.canHandle(gui)) && (new Rectangle(65, 13, 36, 18).contains(new Point(GuiDraw.getMousePosition().x - ((GT_GUIContainer_BasicMachine) gui).getLeft() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[0], GuiDraw.getMousePosition().y - ((GT_GUIContainer_BasicMachine) gui).getTop() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[1]))) && (usage ? GuiUsageRecipe.openRecipeGui(((GT_GUIContainer_BasicMachine) gui).mNEI, new Object[0]) : GuiCraftingRecipe.openRecipeGui(((GT_GUIContainer_BasicMachine) gui).mNEI, new Object[0])); - } /*else if (gui instanceof GT_GUIContainer_FusionReactor) { - return (canHandle(gui)) && (new Rectangle(145, 0, 24, 24).contains(new Point(GuiDraw.getMousePosition().x - ((GT_GUIContainer_FusionReactor) gui).getLeft() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[0], GuiDraw.getMousePosition().y - ((GT_GUIContainer_FusionReactor) gui).getTop() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[1]))) && (usage ? GuiUsageRecipe.openRecipeGui(((GT_GUIContainer_FusionReactor) gui).mNEI, new Object[0]) : GuiCraftingRecipe.openRecipeGui(((GT_GUIContainer_FusionReactor) gui).mNEI, new Object[0])); - }*/ - return false; - } - - @Override - public List<String> handleItemDisplayName(final GuiContainer gui, final ItemStack itemstack, final List<String> currenttip) { - return currenttip; - } - - @Override - public List<String> handleItemTooltip(final GuiContainer gui, final ItemStack itemstack, final int mousex, final int mousey, final List<String> currenttip) { - return currenttip; - } - - @Override - public boolean keyTyped(final GuiContainer gui, final char keyChar, final int keyCode) { - return false; - } - - @Override - public void onKeyTyped(final GuiContainer gui, final char keyChar, final int keyID) { - } - - @Override - public void onMouseClicked(final GuiContainer gui, final int mousex, final int mousey, final int button) { - } - - @Override - public void onMouseUp(final GuiContainer gui, final int mousex, final int mousey, final int button) { - } - - @Override - public boolean mouseScrolled(final GuiContainer gui, final int mousex, final int mousey, final int scrolled) { - return false; - } - - @Override - public void onMouseScrolled(final GuiContainer gui, final int mousex, final int mousey, final int scrolled) { - } - - @Override - public void onMouseDragged(final GuiContainer gui, final int mousex, final int mousey, final int button, final long heldTime) { - } - } - - public class FixedPositionedStack - extends PositionedStack { - public final int mChance; - public boolean permutated = false; - - public FixedPositionedStack(final Object object, final int x, final int y) { - this(object, x, y, 0); - } - - public FixedPositionedStack(final Object object, final int x, final int y, final int aChance) { - super(object, x, y, true); - this.mChance = aChance; - } - - @Override - public void generatePermutations() { - if (this.permutated) { - return; - } - final ArrayList<ItemStack> tDisplayStacks = new ArrayList<ItemStack>(); - for (final ItemStack tStack : this.items) { - if (GT_Utility.isStackValid(tStack)) { - if (tStack.getItemDamage() == 32767) { - final List<ItemStack> permutations = codechicken.nei.ItemList.itemMap.get(tStack.getItem()); - if (!permutations.isEmpty()) { - ItemStack stack; - for (final Iterator<ItemStack> i$ = permutations.iterator(); i$.hasNext(); tDisplayStacks.add(GT_Utility.copyAmount(tStack.stackSize, new Object[]{stack}))) { - stack = i$.next(); - } - } else { - final ItemStack base = new ItemStack(tStack.getItem(), tStack.stackSize); - base.stackTagCompound = tStack.stackTagCompound; - tDisplayStacks.add(base); - } - } else { - tDisplayStacks.add(GT_Utility.copy(new Object[]{tStack})); - } - } - } - this.items = (tDisplayStacks.toArray(new ItemStack[0])); - if (this.items.length == 0) { - this.items = new ItemStack[]{new ItemStack(Blocks.fire)}; - } - this.permutated = true; - this.setPermutationToRender(0); - } - } - - public class CachedDefaultRecipe - extends TemplateRecipeHandler.CachedRecipe { - public final GT_Recipe mRecipe; - public final List<PositionedStack> mOutputs = new ArrayList<PositionedStack>(); - public final List<PositionedStack> mInputs = new ArrayList<PositionedStack>(); - - public CachedDefaultRecipe(final GT_Recipe aRecipe) { - super(); - this.mRecipe = aRecipe; - - int tStartIndex = 0; - switch (GTPP_NEI_DefaultHandler.this.mRecipeMap.mUsualInputCount) { - case 0: - break; - case 1: - if (aRecipe.getRepresentativeInput(tStartIndex) != null) { - this.mInputs.add(new FixedPositionedStack(aRecipe.getRepresentativeInput(tStartIndex), 48, 14)); - } - tStartIndex++; - break; - case 2: - if (aRecipe.getRepresentativeInput(tStartIndex) != null) { - this.mInputs.add(new FixedPositionedStack(aRecipe.getRepresentativeInput(tStartIndex), 30, 14)); - } - tStartIndex++; - if (aRecipe.getRepresentativeInput(tStartIndex) != null) { - this.mInputs.add(new FixedPositionedStack(aRecipe.getRepresentativeInput(tStartIndex), 48, 14)); - } - tStartIndex++; - break; - case 3: - if (aRecipe.getRepresentativeInput(tStartIndex) != null) { - this.mInputs.add(new FixedPositionedStack(aRecipe.getRepresentativeInput(tStartIndex), 12, 14)); - } - tStartIndex++; - if (aRecipe.getRepresentativeInput(tStartIndex) != null) { - this.mInputs.add(new FixedPositionedStack(aRecipe.getRepresentativeInput(tStartIndex), 30, 14)); - } - tStartIndex++; - if (aRecipe.getRepresentativeInput(tStartIndex) != null) { - this.mInputs.add(new FixedPositionedStack(aRecipe.getRepresentativeInput(tStartIndex), 48, 14)); - } - tStartIndex++; - break; - case 4: - if (aRecipe.getRepresentativeInput(tStartIndex) != null) { - this.mInputs.add(new FixedPositionedStack(aRecipe.getRepresentativeInput(tStartIndex), 30, 5)); - } - tStartIndex++; - if (aRecipe.getRepresentativeInput(tStartIndex) != null) { - this.mInputs.add(new FixedPositionedStack(aRecipe.getRepresentativeInput(tStartIndex), 48, 5)); - } - tStartIndex++; - if (aRecipe.getRepresentativeInput(tStartIndex) != null) { - this.mInputs.add(new FixedPositionedStack(aRecipe.getRepresentativeInput(tStartIndex), 30, 23)); - } - tStartIndex++; - if (aRecipe.getRepresentativeInput(tStartIndex) != null) { - this.mInputs.add(new FixedPositionedStack(aRecipe.getRepresentativeInput(tStartIndex), 48, 23)); - } - tStartIndex++; - break; - case 5: - if (aRecipe.getRepresentativeInput(tStartIndex) != null) { - this.mInputs.add(new FixedPositionedStack(aRecipe.getRepresentativeInput(tStartIndex), 12, 5)); - } - tStartIndex++; - if (aRecipe.getRepresentativeInput(tStartIndex) != null) { - this.mInputs.add(new FixedPositionedStack(aRecipe.getRepresentativeInput(tStartIndex), 30, 5)); - } - tStartIndex++; - if (aRecipe.getRepresentativeInput(tStartIndex) != null) { - this.mInputs.add(new FixedPositionedStack(aRecipe.getRepresentativeInput(tStartIndex), 48, 5)); - } - tStartIndex++; - if (aRecipe.getRepresentativeInput(tStartIndex) != null) { - this.mInputs.add(new FixedPositionedStack(aRecipe.getRepresentativeInput(tStartIndex), 30, 23)); - } - tStartIndex++; - if (aRecipe.getRepresentativeInput(tStartIndex) != null) { - this.mInputs.add(new FixedPositionedStack(aRecipe.getRepresentativeInput(tStartIndex), 48, 23)); - } - tStartIndex++; - break; - case 6: - if (aRecipe.getRepresentativeInput(tStartIndex) != null) { - this.mInputs.add(new FixedPositionedStack(aRecipe.getRepresentativeInput(tStartIndex), 12, 5)); - } - tStartIndex++; - if (aRecipe.getRepresentativeInput(tStartIndex) != null) { - this.mInputs.add(new FixedPositionedStack(aRecipe.getRepresentativeInput(tStartIndex), 30, 5)); - } - tStartIndex++; - if (aRecipe.getRepresentativeInput(tStartIndex) != null) { - this.mInputs.add(new FixedPositionedStack(aRecipe.getRepresentativeInput(tStartIndex), 48, 5)); - } - tStartIndex++; - if (aRecipe.getRepresentativeInput(tStartIndex) != null) { - this.mInputs.add(new FixedPositionedStack(aRecipe.getRepresentativeInput(tStartIndex), 12, 23)); - } - tStartIndex++; - if (aRecipe.getRepresentativeInput(tStartIndex) != null) { - this.mInputs.add(new FixedPositionedStack(aRecipe.getRepresentativeInput(tStartIndex), 30, 23)); - } - tStartIndex++; - if (aRecipe.getRepresentativeInput(tStartIndex) != null) { - this.mInputs.add(new FixedPositionedStack(aRecipe.getRepresentativeInput(tStartIndex), 48, 23)); - } - tStartIndex++; - break; - case 7: - if (aRecipe.getRepresentativeInput(tStartIndex) != null) { - this.mInputs.add(new FixedPositionedStack(aRecipe.getRepresentativeInput(tStartIndex), 12, -4)); - } - tStartIndex++; - if (aRecipe.getRepresentativeInput(tStartIndex) != null) { - this.mInputs.add(new FixedPositionedStack(aRecipe.getRepresentativeInput(tStartIndex), 30, -4)); - } - tStartIndex++; - if (aRecipe.getRepresentativeInput(tStartIndex) != null) { - this.mInputs.add(new FixedPositionedStack(aRecipe.getRepresentativeInput(tStartIndex), 48, -4)); - } - tStartIndex++; - if (aRecipe.getRepresentativeInput(tStartIndex) != null) { - this.mInputs.add(new FixedPositionedStack(aRecipe.getRepresentativeInput(tStartIndex), 12, 14)); - } - tStartIndex++; - if (aRecipe.getRepresentativeInput(tStartIndex) != null) { - this.mInputs.add(new FixedPositionedStack(aRecipe.getRepresentativeInput(tStartIndex), 30, 14)); - } - tStartIndex++; - if (aRecipe.getRepresentativeInput(tStartIndex) != null) { - this.mInputs.add(new FixedPositionedStack(aRecipe.getRepresentativeInput(tStartIndex), 48, 14)); - } - tStartIndex++; - if (aRecipe.getRepresentativeInput(tStartIndex) != null) { - this.mInputs.add(new FixedPositionedStack(aRecipe.getRepresentativeInput(tStartIndex), 12, 32)); - } - tStartIndex++; - break; - case 8: - if (aRecipe.getRepresentativeInput(tStartIndex) != null) { - this.mInputs.add(new FixedPositionedStack(aRecipe.getRepresentativeInput(tStartIndex), 12, -4)); - } - tStartIndex++; - if (aRecipe.getRepresentativeInput(tStartIndex) != null) { - this.mInputs.add(new FixedPositionedStack(aRecipe.getRepresentativeInput(tStartIndex), 30, -4)); - } - tStartIndex++; - if (aRecipe.getRepresentativeInput(tStartIndex) != null) { - this.mInputs.add(new FixedPositionedStack(aRecipe.getRepresentativeInput(tStartIndex), 48, -4)); - } - tStartIndex++; - if (aRecipe.getRepresentativeInput(tStartIndex) != null) { - this.mInputs.add(new FixedPositionedStack(aRecipe.getRepresentativeInput(tStartIndex), 12, 14)); - } - tStartIndex++; - if (aRecipe.getRepresentativeInput(tStartIndex) != null) { - this.mInputs.add(new FixedPositionedStack(aRecipe.getRepresentativeInput(tStartIndex), 30, 14)); - } - tStartIndex++; - if (aRecipe.getRepresentativeInput(tStartIndex) != null) { - this.mInputs.add(new FixedPositionedStack(aRecipe.getRepresentativeInput(tStartIndex), 48, 14)); - } - tStartIndex++; - if (aRecipe.getRepresentativeInput(tStartIndex) != null) { - this.mInputs.add(new FixedPositionedStack(aRecipe.getRepresentativeInput(tStartIndex), 12, 32)); - } - tStartIndex++; - if (aRecipe.getRepresentativeInput(tStartIndex) != null) { - this.mInputs.add(new FixedPositionedStack(aRecipe.getRepresentativeInput(tStartIndex), 30, 32)); - } - tStartIndex++; - break; - default: - if (aRecipe.getRepresentativeInput(tStartIndex) != null) { - this.mInputs.add(new FixedPositionedStack(aRecipe.getRepresentativeInput(tStartIndex), 12, -4)); - } - tStartIndex++; - if (aRecipe.getRepresentativeInput(tStartIndex) != null) { - this.mInputs.add(new FixedPositionedStack(aRecipe.getRepresentativeInput(tStartIndex), 30, -4)); - } - tStartIndex++; - if (aRecipe.getRepresentativeInput(tStartIndex) != null) { - this.mInputs.add(new FixedPositionedStack(aRecipe.getRepresentativeInput(tStartIndex), 48, -4)); - } - tStartIndex++; - if (aRecipe.getRepresentativeInput(tStartIndex) != null) { - this.mInputs.add(new FixedPositionedStack(aRecipe.getRepresentativeInput(tStartIndex), 12, 14)); - } - tStartIndex++; - if (aRecipe.getRepresentativeInput(tStartIndex) != null) { - this.mInputs.add(new FixedPositionedStack(aRecipe.getRepresentativeInput(tStartIndex), 30, 14)); - } - tStartIndex++; - if (aRecipe.getRepresentativeInput(tStartIndex) != null) { - this.mInputs.add(new FixedPositionedStack(aRecipe.getRepresentativeInput(tStartIndex), 48, 14)); - } - tStartIndex++; - if (aRecipe.getRepresentativeInput(tStartIndex) != null) { - this.mInputs.add(new FixedPositionedStack(aRecipe.getRepresentativeInput(tStartIndex), 12, 32)); - } - tStartIndex++; - if (aRecipe.getRepresentativeInput(tStartIndex) != null) { - this.mInputs.add(new FixedPositionedStack(aRecipe.getRepresentativeInput(tStartIndex), 30, 32)); - } - tStartIndex++; - if (aRecipe.getRepresentativeInput(tStartIndex) != null) { - this.mInputs.add(new FixedPositionedStack(aRecipe.getRepresentativeInput(tStartIndex), 48, 32)); - } - tStartIndex++; - } - if (aRecipe.mSpecialItems != null) { - this.mInputs.add(new FixedPositionedStack(aRecipe.mSpecialItems, 120, 52)); - } - tStartIndex = 0; - switch (GTPP_NEI_DefaultHandler.this.mRecipeMap.mUsualOutputCount) { - case 0: - break; - case 1: - if (aRecipe.getOutput(tStartIndex) != null) { - this.mOutputs.add(new FixedPositionedStack(aRecipe.getOutput(tStartIndex), 102, 14, aRecipe.getOutputChance(tStartIndex))); - } - tStartIndex++; - break; - case 2: - if (aRecipe.getOutput(tStartIndex) != null) { - this.mOutputs.add(new FixedPositionedStack(aRecipe.getOutput(tStartIndex), 102, 14, aRecipe.getOutputChance(tStartIndex))); - } - tStartIndex++; - if (aRecipe.getOutput(tStartIndex) != null) { - this.mOutputs.add(new FixedPositionedStack(aRecipe.getOutput(tStartIndex), 120, 14, aRecipe.getOutputChance(tStartIndex))); - } - tStartIndex++; - break; - case 3: - if (aRecipe.getOutput(tStartIndex) != null) { - this.mOutputs.add(new FixedPositionedStack(aRecipe.getOutput(tStartIndex), 102, 14, aRecipe.getOutputChance(tStartIndex))); - } - tStartIndex++; - if (aRecipe.getOutput(tStartIndex) != null) { - this.mOutputs.add(new FixedPositionedStack(aRecipe.getOutput(tStartIndex), 120, 14, aRecipe.getOutputChance(tStartIndex))); - } - tStartIndex++; - if (aRecipe.getOutput(tStartIndex) != null) { - this.mOutputs.add(new FixedPositionedStack(aRecipe.getOutput(tStartIndex), 138, 14, aRecipe.getOutputChance(tStartIndex))); - } - tStartIndex++; - break; - case 4: - if (aRecipe.getOutput(tStartIndex) != null) { - this.mOutputs.add(new FixedPositionedStack(aRecipe.getOutput(tStartIndex), 102, 5, aRecipe.getOutputChance(tStartIndex))); - } - tStartIndex++; - if (aRecipe.getOutput(tStartIndex) != null) { - this.mOutputs.add(new FixedPositionedStack(aRecipe.getOutput(tStartIndex), 120, 5, aRecipe.getOutputChance(tStartIndex))); - } - tStartIndex++; - if (aRecipe.getOutput(tStartIndex) != null) { - this.mOutputs.add(new FixedPositionedStack(aRecipe.getOutput(tStartIndex), 102, 23, aRecipe.getOutputChance(tStartIndex))); - } - tStartIndex++; - if (aRecipe.getOutput(tStartIndex) != null) { - this.mOutputs.add(new FixedPositionedStack(aRecipe.getOutput(tStartIndex), 120, 23, aRecipe.getOutputChance(tStartIndex))); - } - tStartIndex++; - break; - case 5: - if (aRecipe.getOutput(tStartIndex) != null) { - this.mOutputs.add(new FixedPositionedStack(aRecipe.getOutput(tStartIndex), 102, 5, aRecipe.getOutputChance(tStartIndex))); - } - tStartIndex++; - if (aRecipe.getOutput(tStartIndex) != null) { - this.mOutputs.add(new FixedPositionedStack(aRecipe.getOutput(tStartIndex), 120, 5, aRecipe.getOutputChance(tStartIndex))); - } - tStartIndex++; - if (aRecipe.getOutput(tStartIndex) != null) { - this.mOutputs.add(new FixedPositionedStack(aRecipe.getOutput(tStartIndex), 138, 5, aRecipe.getOutputChance(tStartIndex))); - } - tStartIndex++; - if (aRecipe.getOutput(tStartIndex) != null) { - this.mOutputs.add(new FixedPositionedStack(aRecipe.getOutput(tStartIndex), 102, 23, aRecipe.getOutputChance(tStartIndex))); - } - tStartIndex++; - if (aRecipe.getOutput(tStartIndex) != null) { - this.mOutputs.add(new FixedPositionedStack(aRecipe.getOutput(tStartIndex), 120, 23, aRecipe.getOutputChance(tStartIndex))); - } - tStartIndex++; - break; - case 6: - if (aRecipe.getOutput(tStartIndex) != null) { - this.mOutputs.add(new FixedPositionedStack(aRecipe.getOutput(tStartIndex), 102, 5, aRecipe.getOutputChance(tStartIndex))); - } - tStartIndex++; - if (aRecipe.getOutput(tStartIndex) != null) { - this.mOutputs.add(new FixedPositionedStack(aRecipe.getOutput(tStartIndex), 120, 5, aRecipe.getOutputChance(tStartIndex))); - } - tStartIndex++; - if (aRecipe.getOutput(tStartIndex) != null) { - this.mOutputs.add(new FixedPositionedStack(aRecipe.getOutput(tStartIndex), 138, 5, aRecipe.getOutputChance(tStartIndex))); - } - tStartIndex++; - if (aRecipe.getOutput(tStartIndex) != null) { - this.mOutputs.add(new FixedPositionedStack(aRecipe.getOutput(tStartIndex), 102, 23, aRecipe.getOutputChance(tStartIndex))); - } - tStartIndex++; - if (aRecipe.getOutput(tStartIndex) != null) { - this.mOutputs.add(new FixedPositionedStack(aRecipe.getOutput(tStartIndex), 120, 23, aRecipe.getOutputChance(tStartIndex))); - } - tStartIndex++; - if (aRecipe.getOutput(tStartIndex) != null) { - this.mOutputs.add(new FixedPositionedStack(aRecipe.getOutput(tStartIndex), 138, 23, aRecipe.getOutputChance(tStartIndex))); - } - tStartIndex++; - break; - case 7: - if (aRecipe.getOutput(tStartIndex) != null) { - this.mOutputs.add(new FixedPositionedStack(aRecipe.getOutput(tStartIndex), 102, -4, aRecipe.getOutputChance(tStartIndex))); - } - tStartIndex++; - if (aRecipe.getOutput(tStartIndex) != null) { - this.mOutputs.add(new FixedPositionedStack(aRecipe.getOutput(tStartIndex), 120, -4, aRecipe.getOutputChance(tStartIndex))); - } - tStartIndex++; - if (aRecipe.getOutput(tStartIndex) != null) { - this.mOutputs.add(new FixedPositionedStack(aRecipe.getOutput(tStartIndex), 138, -4, aRecipe.getOutputChance(tStartIndex))); - } - tStartIndex++; - if (aRecipe.getOutput(tStartIndex) != null) { - this.mOutputs.add(new FixedPositionedStack(aRecipe.getOutput(tStartIndex), 102, 14, aRecipe.getOutputChance(tStartIndex))); - } - tStartIndex++; - if (aRecipe.getOutput(tStartIndex) != null) { - this.mOutputs.add(new FixedPositionedStack(aRecipe.getOutput(tStartIndex), 120, 14, aRecipe.getOutputChance(tStartIndex))); - } - tStartIndex++; - if (aRecipe.getOutput(tStartIndex) != null) { - this.mOutputs.add(new FixedPositionedStack(aRecipe.getOutput(tStartIndex), 138, 14, aRecipe.getOutputChance(tStartIndex))); - } - tStartIndex++; - if (aRecipe.getOutput(tStartIndex) != null) { - this.mOutputs.add(new FixedPositionedStack(aRecipe.getOutput(tStartIndex), 102, 32, aRecipe.getOutputChance(tStartIndex))); - } - tStartIndex++; - break; - case 8: - if (aRecipe.getOutput(tStartIndex) != null) { - this.mOutputs.add(new FixedPositionedStack(aRecipe.getOutput(tStartIndex), 102, -4, aRecipe.getOutputChance(tStartIndex))); - } - tStartIndex++; - if (aRecipe.getOutput(tStartIndex) != null) { - this.mOutputs.add(new FixedPositionedStack(aRecipe.getOutput(tStartIndex), 120, -4, aRecipe.getOutputChance(tStartIndex))); - } - tStartIndex++; - if (aRecipe.getOutput(tStartIndex) != null) { - this.mOutputs.add(new FixedPositionedStack(aRecipe.getOutput(tStartIndex), 138, -4, aRecipe.getOutputChance(tStartIndex))); - } - tStartIndex++; - if (aRecipe.getOutput(tStartIndex) != null) { - this.mOutputs.add(new FixedPositionedStack(aRecipe.getOutput(tStartIndex), 102, 14, aRecipe.getOutputChance(tStartIndex))); - } - tStartIndex++; - if (aRecipe.getOutput(tStartIndex) != null) { - this.mOutputs.add(new FixedPositionedStack(aRecipe.getOutput(tStartIndex), 120, 14, aRecipe.getOutputChance(tStartIndex))); - } - tStartIndex++; - if (aRecipe.getOutput(tStartIndex) != null) { - this.mOutputs.add(new FixedPositionedStack(aRecipe.getOutput(tStartIndex), 138, 14, aRecipe.getOutputChance(tStartIndex))); - } - tStartIndex++; - if (aRecipe.getOutput(tStartIndex) != null) { - this.mOutputs.add(new FixedPositionedStack(aRecipe.getOutput(tStartIndex), 102, 32, aRecipe.getOutputChance(tStartIndex))); - } - tStartIndex++; - if (aRecipe.getOutput(tStartIndex) != null) { - this.mOutputs.add(new FixedPositionedStack(aRecipe.getOutput(tStartIndex), 120, 32, aRecipe.getOutputChance(tStartIndex))); - } - tStartIndex++; - break; - default: - if (aRecipe.getOutput(tStartIndex) != null) { - this.mOutputs.add(new FixedPositionedStack(aRecipe.getOutput(tStartIndex), 102, -4, aRecipe.getOutputChance(tStartIndex))); - } - tStartIndex++; - if (aRecipe.getOutput(tStartIndex) != null) { - this.mOutputs.add(new FixedPositionedStack(aRecipe.getOutput(tStartIndex), 120, -4, aRecipe.getOutputChance(tStartIndex))); - } - tStartIndex++; - if (aRecipe.getOutput(tStartIndex) != null) { - this.mOutputs.add(new FixedPositionedStack(aRecipe.getOutput(tStartIndex), 138, -4, aRecipe.getOutputChance(tStartIndex))); - } - tStartIndex++; - if (aRecipe.getOutput(tStartIndex) != null) { - this.mOutputs.add(new FixedPositionedStack(aRecipe.getOutput(tStartIndex), 102, 14, aRecipe.getOutputChance(tStartIndex))); - } - tStartIndex++; - if (aRecipe.getOutput(tStartIndex) != null) { - this.mOutputs.add(new FixedPositionedStack(aRecipe.getOutput(tStartIndex), 120, 14, aRecipe.getOutputChance(tStartIndex))); - } - tStartIndex++; - if (aRecipe.getOutput(tStartIndex) != null) { - this.mOutputs.add(new FixedPositionedStack(aRecipe.getOutput(tStartIndex), 138, 14, aRecipe.getOutputChance(tStartIndex))); - } - tStartIndex++; - if (aRecipe.getOutput(tStartIndex) != null) { - this.mOutputs.add(new FixedPositionedStack(aRecipe.getOutput(tStartIndex), 102, 32, aRecipe.getOutputChance(tStartIndex))); - } - tStartIndex++; - if (aRecipe.getOutput(tStartIndex) != null) { - this.mOutputs.add(new FixedPositionedStack(aRecipe.getOutput(tStartIndex), 120, 32, aRecipe.getOutputChance(tStartIndex))); - } - tStartIndex++; - if (aRecipe.getOutput(tStartIndex) != null) { - this.mOutputs.add(new FixedPositionedStack(aRecipe.getOutput(tStartIndex), 138, 32, aRecipe.getOutputChance(tStartIndex))); - } - tStartIndex++; - } - - - if ((aRecipe.mFluidInputs.length > 0) && (aRecipe.mFluidInputs[0] != null) && (aRecipe.mFluidInputs[0].getFluid() != null)) { - this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(aRecipe.mFluidInputs[0], true), 48, 52)); - if ((aRecipe.mFluidInputs.length > 1) && (aRecipe.mFluidInputs[1] != null) && (aRecipe.mFluidInputs[1].getFluid() != null)) { - this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(aRecipe.mFluidInputs[1], true), 30, 52)); - } - } - if (aRecipe.mFluidOutputs.length > 1) { - if (aRecipe.mFluidOutputs[0] != null && (aRecipe.mFluidOutputs[0].getFluid() != null)) { - this.mOutputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(aRecipe.mFluidOutputs[0], true), 120, 5)); - } - if (aRecipe.mFluidOutputs[1] != null && (aRecipe.mFluidOutputs[1].getFluid() != null)) { - this.mOutputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(aRecipe.mFluidOutputs[1], true), 138, 5)); - } - if (aRecipe.mFluidOutputs.length > 2 && aRecipe.mFluidOutputs[2] != null && (aRecipe.mFluidOutputs[2].getFluid() != null)) { - this.mOutputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(aRecipe.mFluidOutputs[2], true), 102, 23)); - } - if (aRecipe.mFluidOutputs.length > 3 && aRecipe.mFluidOutputs[3] != null && (aRecipe.mFluidOutputs[3].getFluid() != null)) { - this.mOutputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(aRecipe.mFluidOutputs[3], true), 120, 23)); - } - if (aRecipe.mFluidOutputs.length > 4 && aRecipe.mFluidOutputs[4] != null && (aRecipe.mFluidOutputs[4].getFluid() != null)) { - this.mOutputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(aRecipe.mFluidOutputs[4], true), 138, 23)); - } - } else if ((aRecipe.mFluidOutputs.length > 0) && (aRecipe.mFluidOutputs[0] != null) && (aRecipe.mFluidOutputs[0].getFluid() != null)) { - this.mOutputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(aRecipe.mFluidOutputs[0], true), 102, 52)); - } - - } - - @Override - public List<PositionedStack> getIngredients() { - return this.getCycledIngredients(GTPP_NEI_DefaultHandler.this.cycleticks / 10, this.mInputs); - } - - @Override - public PositionedStack getResult() { - return null; - } - - @Override - public List<PositionedStack> getOtherStacks() { - return this.mOutputs; - } - } -} diff --git a/src/Java/gtPlusPlus/nei/GT_NEI_FlotationCell.java b/src/Java/gtPlusPlus/nei/GT_NEI_FlotationCell.java deleted file mode 100644 index c4eff20a27..0000000000 --- a/src/Java/gtPlusPlus/nei/GT_NEI_FlotationCell.java +++ /dev/null @@ -1,462 +0,0 @@ -package gtPlusPlus.nei; - -import java.awt.Point; -import java.awt.Rectangle; -import java.util.*; - -import org.lwjgl.opengl.GL11; - -import codechicken.lib.gui.GuiDraw; -import codechicken.nei.PositionedStack; -import codechicken.nei.guihook.GuiContainerManager; -import codechicken.nei.guihook.IContainerInputHandler; -import codechicken.nei.guihook.IContainerTooltipHandler; -import codechicken.nei.recipe.*; -import cpw.mods.fml.common.event.FMLInterModComms; -import gregtech.api.enums.GT_Values; -import gregtech.api.enums.OrePrefixes; -import gregtech.api.gui.GT_GUIContainer_BasicMachine; -import gregtech.api.objects.ItemData; -import gregtech.api.util.*; -import gregtech.api.util.GT_Recipe.GT_Recipe_Map; -import gregtech.api.util.GTPP_Recipe.GTPP_Recipe_Map; -import gtPlusPlus.core.util.minecraft.ItemUtils; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidContainerRegistry; -import net.minecraftforge.fluids.FluidStack; - -public class GT_NEI_FlotationCell -extends TemplateRecipeHandler { - public static final int sOffsetX = 5; - public static final int sOffsetY = 11; - - static { - GuiContainerManager.addInputHandler(new GT_RectHandler()); - GuiContainerManager.addTooltipHandler(new GT_RectHandler()); - } - - protected GT_Recipe_Map mRecipeMap; - - public GT_NEI_FlotationCell() { - this.mRecipeMap = GTPP_Recipe_Map.sFlotationCellRecipes; - this.transferRects.add(new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(65, 13, 36, 18), this.getRecipeMapName(), new Object[0])); - if (!NEI_GT_Config.sIsAdded) { - FMLInterModComms.sendRuntimeMessage(GT_Values.GT, "NEIPlugins", "register-crafting-handler", "gregtechplusplus@" + this.getRecipeName() + "@" + this.getRecipeMapName()); - GuiCraftingRecipe.craftinghandlers.add(this); - GuiUsageRecipe.usagehandlers.add(this); - } - } - - public List<GTPP_Recipe> getSortedRecipes() { - List<GTPP_Recipe> result = new ArrayList(this.mRecipeMap.mRecipeList); - Collections.sort(result); - return result; - } - - public static void drawText(final int aX, final int aY, final String aString, final int aColor) { - Minecraft.getMinecraft().fontRenderer.drawString(aString, aX, aY, aColor); - } - - @Override - public TemplateRecipeHandler newInstance() { - return new GT_NEI_FlotationCell(); - } - - @Override - public void loadCraftingRecipes(final String outputId, final Object... results) { - if (outputId.equals(getRecipeMapName())) { - for (GTPP_Recipe tRecipe : getSortedRecipes()) { - if (!tRecipe.mHidden) { - this.arecipes.add(new CachedDefaultRecipe(tRecipe)); - } - } - } else { - super.loadCraftingRecipes(outputId, results); - } - } - - @Override - public void loadCraftingRecipes(final ItemStack aResult) { - ItemData tPrefixMaterial = GT_OreDictUnificator.getAssociation(aResult); - - ArrayList<ItemStack> tResults = new ArrayList<ItemStack>(); - tResults.add(aResult); - tResults.add(GT_OreDictUnificator.get(true, aResult)); - if ((tPrefixMaterial != null) && (!tPrefixMaterial.mBlackListed) && (!tPrefixMaterial.mPrefix.mFamiliarPrefixes.isEmpty())) { - for (OrePrefixes tPrefix : tPrefixMaterial.mPrefix.mFamiliarPrefixes) { - tResults.add(GT_OreDictUnificator.get(tPrefix, tPrefixMaterial.mMaterial.mMaterial, 1L)); - } - } - FluidStack tFluid = GT_Utility.getFluidForFilledItem(aResult, true); - if (tFluid != null) { - tResults.add(GT_Utility.getFluidDisplayStack(tFluid, false)); - for (FluidContainerRegistry.FluidContainerData tData : FluidContainerRegistry.getRegisteredFluidContainerData()) { - if (tData.fluid.isFluidEqual(tFluid)) { - tResults.add(GT_Utility.copy(new Object[]{tData.filledContainer})); - } - } - } - for (GTPP_Recipe tRecipe : getSortedRecipes()) { - if (!tRecipe.mHidden) { - CachedDefaultRecipe tNEIRecipe = new CachedDefaultRecipe(tRecipe); - for (ItemStack tStack : tResults) { - if (tNEIRecipe.contains(tNEIRecipe.mOutputs, tStack)) { - this.arecipes.add(tNEIRecipe); - break; - } - } - } - } - //CachedDefaultRecipe tNEIRecipe; - } - - public void loadUsageRecipes(ItemStack aInput) { - ItemData tPrefixMaterial = GT_OreDictUnificator.getAssociation(aInput); - - ArrayList<ItemStack> tInputs = new ArrayList<ItemStack>(); - tInputs.add(aInput); - tInputs.add(GT_OreDictUnificator.get(false, aInput)); - if ((tPrefixMaterial != null) && (!tPrefixMaterial.mPrefix.mFamiliarPrefixes.isEmpty())) { - for (OrePrefixes tPrefix : tPrefixMaterial.mPrefix.mFamiliarPrefixes) { - tInputs.add(GT_OreDictUnificator.get(tPrefix, tPrefixMaterial.mMaterial.mMaterial, 1L)); - } - } - FluidStack tFluid = GT_Utility.getFluidForFilledItem(aInput, true); - if (tFluid != null) { - tInputs.add(GT_Utility.getFluidDisplayStack(tFluid, false)); - for (FluidContainerRegistry.FluidContainerData tData : FluidContainerRegistry.getRegisteredFluidContainerData()) { - if (tData.fluid.isFluidEqual(tFluid)) { - tInputs.add(GT_Utility.copy(new Object[]{tData.filledContainer})); - } - } - } - for (GTPP_Recipe tRecipe : getSortedRecipes()) { - if (!tRecipe.mHidden) { - CachedDefaultRecipe tNEIRecipe = new CachedDefaultRecipe(tRecipe); - for (ItemStack tStack : tInputs) { - if (tNEIRecipe.contains(tNEIRecipe.mInputs, tStack)) { - this.arecipes.add(tNEIRecipe); - break; - } - } - } - } - //CachedDefaultRecipe tNEIRecipe; - } - - public String getRecipeMapName() { - return this.mRecipeMap.mNEIName; - } - - @Override - public String getOverlayIdentifier() { - return this.mRecipeMap.mNEIName; - } - - @Override - public void drawBackground(final int recipe) { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - GuiDraw.changeTexture(this.getGuiTexture()); - GuiDraw.drawTexturedModalRect(-4, -8, 1, 3, 174, 78); - } - - @Override - public int recipiesPerPage() { - return 1; - } - - @Override - public String getRecipeName() { - return GT_LanguageManager.getTranslation(this.mRecipeMap.mUnlocalizedName); - } - - @Override - public String getGuiTexture() { - return this.mRecipeMap.mNEIGUIPath; - } - - @Override - public List<String> handleItemTooltip(final GuiRecipe gui, final ItemStack aStack, final List<String> currenttip, final int aRecipeIndex) { - final TemplateRecipeHandler.CachedRecipe tObject = this.arecipes.get(aRecipeIndex); - if ((tObject instanceof CachedDefaultRecipe)) { - final CachedDefaultRecipe tRecipe = (CachedDefaultRecipe) tObject; - for (final PositionedStack tStack : tRecipe.mOutputs) { - if (aStack == tStack.item) { - if ((!(tStack instanceof FixedPositionedStack)) || (((FixedPositionedStack) tStack).mChance <= 0) || (((FixedPositionedStack) tStack).mChance == 10000)) { - break; - } - currenttip.add("Chance: " + (((FixedPositionedStack) tStack).mChance / 100) + "." + ((((FixedPositionedStack) tStack).mChance % 100) < 10 ? "0" + (((FixedPositionedStack) tStack).mChance % 100) : Integer.valueOf(((FixedPositionedStack) tStack).mChance % 100)) + "%"); - break; - } - } - for (final PositionedStack tStack : tRecipe.mInputs) { - if (GT_Utility.areStacksEqual(aStack, tStack.item)) { - if ((gregtech.api.enums.ItemList.Display_Fluid.isStackEqual(tStack.item, true, true)) || - (tStack.item.stackSize != 0)) { - break; - } - if (ItemUtils.isControlCircuit(aStack)) { - currenttip.add("Does not get consumed in the process"); - } - break; - } - } - } - return currenttip; - } - - @Override - public void drawExtras(final int aRecipeIndex) { - final long tEUt = ((CachedDefaultRecipe) this.arecipes.get(aRecipeIndex)).mRecipe.mEUt; - final int tDuration = ((CachedDefaultRecipe) this.arecipes.get(aRecipeIndex)).mRecipe.mDuration; - if (tEUt != 0) { - drawText(10, 73, "Total: " + (long) (tDuration * tEUt) + " EU", -16777216); - //drawText(10, 83, "Usage: " + tEUt + " EU/t", -16777216); - if (this.mRecipeMap.mShowVoltageAmperageInNEI) { - drawText(10, 83, "Voltage: " + (tEUt / this.mRecipeMap.mAmperage) + " EU/t", -16777216); - drawText(10, 93, "Amperage: " + this.mRecipeMap.mAmperage, -16777216); - } else { - drawText(10, 93, "Voltage: unspecified", -16777216); - drawText(10, 103, "Amperage: unspecified", -16777216); - } - } - if (tDuration > 0) { - drawText(10, 103, "Time: " + (tDuration < 20 ? "< 1" : Integer.valueOf(tDuration / 20)) + " secs", -16777216); - } - //if ((GT_Utility.isStringValid(this.mRecipeMap.mNEISpecialValuePre)) || (GT_Utility.isStringValid(this.mRecipeMap.mNEISpecialValuePost))) { - //drawText(10, 113, this.mRecipeMap.mNEISpecialValuePre + (((CachedDefaultRecipe) this.arecipes.get(aRecipeIndex)).mRecipe.mSpecialValue * this.mRecipeMap.mNEISpecialValueMultiplier) + this.mRecipeMap.mNEISpecialValuePost, -16777216); - //} - } - - public static class GT_RectHandler - implements IContainerInputHandler, IContainerTooltipHandler { - @Override - public boolean mouseClicked(final GuiContainer gui, final int mousex, final int mousey, final int button) { - if (this.canHandle(gui)) { - if (button == 0) { - return this.transferRect(gui, false); - } - if (button == 1) { - return this.transferRect(gui, true); - } - } - return false; - } - - @Override - public boolean lastKeyTyped(final GuiContainer gui, final char keyChar, final int keyCode) { - return false; - } - - public boolean canHandle(final GuiContainer gui) { - return (((gui instanceof GT_GUIContainer_BasicMachine)) && (GT_Utility.isStringValid(((GT_GUIContainer_BasicMachine) gui).mNEI)) /*|| ((gui instanceof GT_GUIContainer_FusionReactor)) && (GT_Utility.isStringValid(((GT_GUIContainer_FusionReactor) gui).mNEI))*/); - } - - @Override - public List<String> handleTooltip(final GuiContainer gui, final int mousex, final int mousey, final List<String> currenttip) { - if ((this.canHandle(gui)) && (currenttip.isEmpty())) { - if ((gui instanceof GT_GUIContainer_BasicMachine) && new Rectangle(65, 13, 36, 18).contains(new Point(GuiDraw.getMousePosition().x - ((GT_GUIContainer_BasicMachine) gui).getLeft() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[0], GuiDraw.getMousePosition().y - ((GT_GUIContainer_BasicMachine) gui).getTop() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[1]))) { - currenttip.add("Recipes"); - } /*else if (gui instanceof GT_GUIContainer_FusionReactor && new Rectangle(145, 0, 24, 24).contains(new Point(GuiDraw.getMousePosition().x - ((GT_GUIContainer_FusionReactor) gui).getLeft() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[0], GuiDraw.getMousePosition().y - ((GT_GUIContainer_FusionReactor) gui).getTop() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[1]))) { - currenttip.add("Recipes"); - }*/ - - } - return currenttip; - } - - private boolean transferRect(final GuiContainer gui, final boolean usage) { - if (gui instanceof GT_GUIContainer_BasicMachine) { - return (this.canHandle(gui)) && (new Rectangle(65, 13, 36, 18).contains(new Point(GuiDraw.getMousePosition().x - ((GT_GUIContainer_BasicMachine) gui).getLeft() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[0], GuiDraw.getMousePosition().y - ((GT_GUIContainer_BasicMachine) gui).getTop() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[1]))) && (usage ? GuiUsageRecipe.openRecipeGui(((GT_GUIContainer_BasicMachine) gui).mNEI, new Object[0]) : GuiCraftingRecipe.openRecipeGui(((GT_GUIContainer_BasicMachine) gui).mNEI, new Object[0])); - } /*else if (gui instanceof GT_GUIContainer_FusionReactor) { - return (canHandle(gui)) && (new Rectangle(145, 0, 24, 24).contains(new Point(GuiDraw.getMousePosition().x - ((GT_GUIContainer_FusionReactor) gui).getLeft() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[0], GuiDraw.getMousePosition().y - ((GT_GUIContainer_FusionReactor) gui).getTop() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[1]))) && (usage ? GuiUsageRecipe.openRecipeGui(((GT_GUIContainer_FusionReactor) gui).mNEI, new Object[0]) : GuiCraftingRecipe.openRecipeGui(((GT_GUIContainer_FusionReactor) gui).mNEI, new Object[0])); - }*/ - return false; - } - - @Override - public List<String> handleItemDisplayName(final GuiContainer gui, final ItemStack itemstack, final List<String> currenttip) { - return currenttip; - } - - @Override - public List<String> handleItemTooltip(final GuiContainer gui, final ItemStack itemstack, final int mousex, final int mousey, final List<String> currenttip) { - return currenttip; - } - - @Override - public boolean keyTyped(final GuiContainer gui, final char keyChar, final int keyCode) { - return false; - } - - @Override - public void onKeyTyped(final GuiContainer gui, final char keyChar, final int keyID) { - } - - @Override - public void onMouseClicked(final GuiContainer gui, final int mousex, final int mousey, final int button) { - } - - @Override - public void onMouseUp(final GuiContainer gui, final int mousex, final int mousey, final int button) { - } - - @Override - public boolean mouseScrolled(final GuiContainer gui, final int mousex, final int mousey, final int scrolled) { - return false; - } - - @Override - public void onMouseScrolled(final GuiContainer gui, final int mousex, final int mousey, final int scrolled) { - } - - @Override - public void onMouseDragged(final GuiContainer gui, final int mousex, final int mousey, final int button, final long heldTime) { - } - } - - public class FixedPositionedStack - extends PositionedStack { - public final int mChance; - public boolean permutated = false; - - public FixedPositionedStack(final Object object, final int x, final int y) { - this(object, x, y, 0); - } - - public FixedPositionedStack(final Object object, final int x, final int y, final int aChance) { - super(object, x, y, true); - this.mChance = aChance; - } - - @Override - public void generatePermutations() { - if (this.permutated) { - return; - } - final ArrayList<ItemStack> tDisplayStacks = new ArrayList<ItemStack>(); - for (final ItemStack tStack : this.items) { - if (GT_Utility.isStackValid(tStack)) { - if (tStack.getItemDamage() == 32767) { - final List<ItemStack> permutations = codechicken.nei.ItemList.itemMap.get(tStack.getItem()); - if (!permutations.isEmpty()) { - ItemStack stack; - for (final Iterator<ItemStack> i$ = permutations.iterator(); i$.hasNext(); tDisplayStacks.add(GT_Utility.copyAmount(tStack.stackSize, new Object[]{stack}))) { - stack = i$.next(); - } - } else { - final ItemStack base = new ItemStack(tStack.getItem(), tStack.stackSize); - base.stackTagCompound = tStack.stackTagCompound; - tDisplayStacks.add(base); - } - } else { - tDisplayStacks.add(GT_Utility.copy(new Object[]{tStack})); - } - } - } - this.items = (tDisplayStacks.toArray(new ItemStack[0])); - if (this.items.length == 0) { - this.items = new ItemStack[]{new ItemStack(Blocks.fire)}; - } - this.permutated = true; - this.setPermutationToRender(0); - } - } - - public class CachedDefaultRecipe - extends TemplateRecipeHandler.CachedRecipe { - public final GT_Recipe mRecipe; - public final List<PositionedStack> mOutputs = new ArrayList<PositionedStack>(); - public final List<PositionedStack> mInputs = new ArrayList<PositionedStack>(); - - public CachedDefaultRecipe(final GT_Recipe aRecipe) { - super(); - this.mRecipe = aRecipe; - - int tStartIndex = 0; - - - if (aRecipe.getRepresentativeInput(tStartIndex) != null) { - this.mInputs.add(new FixedPositionedStack(aRecipe.getRepresentativeInput(tStartIndex), 12, 5)); - } - tStartIndex++; - if (aRecipe.getRepresentativeInput(tStartIndex) != null) { - this.mInputs.add(new FixedPositionedStack(aRecipe.getRepresentativeInput(tStartIndex), 30, 5)); - } - tStartIndex++; - if (aRecipe.getRepresentativeInput(tStartIndex) != null) { - this.mInputs.add(new FixedPositionedStack(aRecipe.getRepresentativeInput(tStartIndex), 48, 5)); - } - tStartIndex++; - if (aRecipe.getRepresentativeInput(tStartIndex) != null) { - this.mInputs.add(new FixedPositionedStack(aRecipe.getRepresentativeInput(tStartIndex), 12, 23)); - } - tStartIndex++; - if (aRecipe.getRepresentativeInput(tStartIndex) != null) { - this.mInputs.add(new FixedPositionedStack(aRecipe.getRepresentativeInput(tStartIndex), 30, 23)); - } - tStartIndex++; - if (aRecipe.getRepresentativeInput(tStartIndex) != null) { - this.mInputs.add(new FixedPositionedStack(aRecipe.getRepresentativeInput(tStartIndex), 48, 23)); - } - tStartIndex++; - - if (aRecipe.mSpecialItems != null) { - this.mInputs.add(new FixedPositionedStack(aRecipe.mSpecialItems, 120, 52)); - } - tStartIndex = 0; - - //Four Output Slots - if (aRecipe.getOutput(tStartIndex) != null) { - this.mOutputs.add(new FixedPositionedStack(aRecipe.getOutput(tStartIndex), 102, 5, aRecipe.getOutputChance(tStartIndex))); - } - tStartIndex++; - if (aRecipe.getOutput(tStartIndex) != null) { - this.mOutputs.add(new FixedPositionedStack(aRecipe.getOutput(tStartIndex), 120, 5, aRecipe.getOutputChance(tStartIndex))); - } - tStartIndex++; - if (aRecipe.getOutput(tStartIndex) != null) { - this.mOutputs.add(new FixedPositionedStack(aRecipe.getOutput(tStartIndex), 102, 23, aRecipe.getOutputChance(tStartIndex))); - } - tStartIndex++; - if (aRecipe.getOutput(tStartIndex) != null) { - this.mOutputs.add(new FixedPositionedStack(aRecipe.getOutput(tStartIndex), 120, 23, aRecipe.getOutputChance(tStartIndex))); - } - tStartIndex++; - - if ((aRecipe.mFluidInputs.length > 0) && (aRecipe.mFluidInputs[0] != null) && (aRecipe.mFluidInputs[0].getFluid() != null)) { - this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(aRecipe.mFluidInputs[0], true), 30, 52)); - if ((aRecipe.mFluidInputs.length > 1) && (aRecipe.mFluidInputs[1] != null) && (aRecipe.mFluidInputs[1].getFluid() != null)) { - this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(aRecipe.mFluidInputs[1], true), 48, 52)); - } - } - - if (aRecipe.mFluidOutputs.length > 0) { - if ((aRecipe.mFluidOutputs[0] != null) && (aRecipe.mFluidOutputs[0].getFluid() != null)) { - this.mOutputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(aRecipe.mFluidOutputs[0], true), 102, 52)); - } - if ((aRecipe.mFluidOutputs.length > 1) && (aRecipe.mFluidOutputs[1] != null) && (aRecipe.mFluidOutputs[1].getFluid() != null)) { - this.mOutputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(aRecipe.mFluidOutputs[1], true), 120, 52)); - } - } - } - - @Override - public List<PositionedStack> getIngredients() { - return this.getCycledIngredients(GT_NEI_FlotationCell.this.cycleticks / 10, this.mInputs); - } - - @Override - public PositionedStack getResult() { - return null; - } - - @Override - public List<PositionedStack> getOtherStacks() { - return this.mOutputs; - } - } -} diff --git a/src/Java/gtPlusPlus/nei/GT_NEI_FluidReactor.java b/src/Java/gtPlusPlus/nei/GT_NEI_FluidReactor.java deleted file mode 100644 index 213d022478..0000000000 --- a/src/Java/gtPlusPlus/nei/GT_NEI_FluidReactor.java +++ /dev/null @@ -1,507 +0,0 @@ -package gtPlusPlus.nei; - -import java.awt.Point; -import java.awt.Rectangle; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; - -import org.lwjgl.opengl.GL11; - -import codechicken.lib.gui.GuiDraw; -import codechicken.nei.PositionedStack; -import codechicken.nei.guihook.GuiContainerManager; -import codechicken.nei.guihook.IContainerInputHandler; -import codechicken.nei.guihook.IContainerTooltipHandler; -import codechicken.nei.recipe.GuiCraftingRecipe; -import codechicken.nei.recipe.GuiRecipe; -import codechicken.nei.recipe.GuiUsageRecipe; -import codechicken.nei.recipe.TemplateRecipeHandler; -import cpw.mods.fml.common.event.FMLInterModComms; -import gregtech.api.enums.GT_Values; -import gregtech.api.enums.OrePrefixes; -import gregtech.api.gui.GT_GUIContainer_BasicMachine; -import gregtech.api.objects.ItemData; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Recipe; -import gregtech.api.util.GT_Utility; -import gregtech.api.util.GTPP_Recipe; -import gregtech.api.util.GTPP_Recipe.GTPP_Recipe_Map; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.minecraft.ItemUtils; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidContainerRegistry; -import net.minecraftforge.fluids.FluidStack; - -public class GT_NEI_FluidReactor -extends TemplateRecipeHandler { - public static final int sOffsetX = 5; - public static final int sOffsetY = 11; - - static { - GuiContainerManager.addInputHandler(new GT_RectHandler()); - GuiContainerManager.addTooltipHandler(new GT_RectHandler()); - } - - protected GTPP_Recipe_Map mRecipeMap; - - public GT_NEI_FluidReactor() { - this.mRecipeMap = GTPP_Recipe_Map.sChemicalPlantRecipes; - this.transferRects.add(new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(65, 13, 36, 18), this.getRecipeMapName(), new Object[0])); - if (!NEI_GT_Config.sIsAdded) { - FMLInterModComms.sendRuntimeMessage(GT_Values.GT, "NEIPlugins", "register-crafting-handler", "gregtechplusplus@" + this.getRecipeName() + "@" + this.getRecipeMapName()); - GuiCraftingRecipe.craftinghandlers.add(this); - GuiUsageRecipe.usagehandlers.add(this); - } - } - - public List<GTPP_Recipe> getSortedRecipes() { - List<GTPP_Recipe> result = new ArrayList(this.mRecipeMap.mRecipeList); - Collections.sort(result); - return result; - } - - public static void drawText(final int aX, final int aY, final String aString, final int aColor) { - Minecraft.getMinecraft().fontRenderer.drawString(aString, aX, aY, aColor); - } - - @Override - public TemplateRecipeHandler newInstance() { - return new GT_NEI_FluidReactor(); - } - - @Override - public void loadCraftingRecipes(final String outputId, final Object... results) { - if (outputId.equals(getRecipeMapName())) { - for (GTPP_Recipe tRecipe : getSortedRecipes()) { - if (!tRecipe.mHidden) { - this.arecipes.add(new CachedDefaultRecipe(tRecipe)); - } - } - } else { - super.loadCraftingRecipes(outputId, results); - } - } - - @Override - public void loadCraftingRecipes(final ItemStack aResult) { - ItemData tPrefixMaterial = GT_OreDictUnificator.getAssociation(aResult); - - ArrayList<ItemStack> tResults = new ArrayList<ItemStack>(); - tResults.add(aResult); - tResults.add(GT_OreDictUnificator.get(true, aResult)); - if ((tPrefixMaterial != null) && (!tPrefixMaterial.mBlackListed) && (!tPrefixMaterial.mPrefix.mFamiliarPrefixes.isEmpty())) { - for (OrePrefixes tPrefix : tPrefixMaterial.mPrefix.mFamiliarPrefixes) { - tResults.add(GT_OreDictUnificator.get(tPrefix, tPrefixMaterial.mMaterial.mMaterial, 1L)); - } - } - FluidStack tFluid = GT_Utility.getFluidForFilledItem(aResult, true); - if (tFluid != null) { - tResults.add(GT_Utility.getFluidDisplayStack(tFluid, false)); - for (FluidContainerRegistry.FluidContainerData tData : FluidContainerRegistry.getRegisteredFluidContainerData()) { - if (tData.fluid.isFluidEqual(tFluid)) { - tResults.add(GT_Utility.copy(new Object[]{tData.filledContainer})); - } - } - } - for (GTPP_Recipe tRecipe : getSortedRecipes()) { - if (!tRecipe.mHidden) { - CachedDefaultRecipe tNEIRecipe = new CachedDefaultRecipe(tRecipe); - for (ItemStack tStack : tResults) { - if (tNEIRecipe.contains(tNEIRecipe.mOutputs, tStack)) { - this.arecipes.add(tNEIRecipe); - break; - } - } - } - } - //CachedDefaultRecipe tNEIRecipe; - } - - public void loadUsageRecipes(ItemStack aInput) { - ItemData tPrefixMaterial = GT_OreDictUnificator.getAssociation(aInput); - - ArrayList<ItemStack> tInputs = new ArrayList<ItemStack>(); - tInputs.add(aInput); - tInputs.add(GT_OreDictUnificator.get(false, aInput)); - if ((tPrefixMaterial != null) && (!tPrefixMaterial.mPrefix.mFamiliarPrefixes.isEmpty())) { - for (OrePrefixes tPrefix : tPrefixMaterial.mPrefix.mFamiliarPrefixes) { - tInputs.add(GT_OreDictUnificator.get(tPrefix, tPrefixMaterial.mMaterial.mMaterial, 1L)); - } - } - FluidStack tFluid = GT_Utility.getFluidForFilledItem(aInput, true); - if (tFluid != null) { - tInputs.add(GT_Utility.getFluidDisplayStack(tFluid, false)); - for (FluidContainerRegistry.FluidContainerData tData : FluidContainerRegistry.getRegisteredFluidContainerData()) { - if (tData.fluid.isFluidEqual(tFluid)) { - tInputs.add(GT_Utility.copy(new Object[]{tData.filledContainer})); - } - } - } - for (GTPP_Recipe tRecipe : getSortedRecipes()) { - if (!tRecipe.mHidden) { - CachedDefaultRecipe tNEIRecipe = new CachedDefaultRecipe(tRecipe); - for (ItemStack tStack : tInputs) { - if (tNEIRecipe.contains(tNEIRecipe.mInputs, tStack)) { - this.arecipes.add(tNEIRecipe); - break; - } - } - } - } - //CachedDefaultRecipe tNEIRecipe; - } - - public String getRecipeMapName() { - return this.mRecipeMap.mNEIName; - } - - @Override - public String getOverlayIdentifier() { - //return this.mRecipeMap.mNEIName; - return ""; - } - - @Override - public void drawBackground(final int recipe) { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - GuiDraw.changeTexture(this.getGuiTexture()); - GuiDraw.drawTexturedModalRect(-4, -8, 1, 3, 174, 78); - } - - @Override - public int recipiesPerPage() { - return 1; - } - - @Override - public String getRecipeName() { - //return GT_LanguageManager.getTranslation(this.mRecipeMap.mUnlocalizedName); - return " Chem Plant"; - } - - @Override - public String getGuiTexture() { - return CORE.MODID+":textures/gui/FluidReactor.png"; - } - - @Override - public List<String> handleItemTooltip(final GuiRecipe gui, final ItemStack aStack, final List<String> currenttip, final int aRecipeIndex) { - final TemplateRecipeHandler.CachedRecipe tObject = this.arecipes.get(aRecipeIndex); - if ((tObject instanceof CachedDefaultRecipe)) { - final CachedDefaultRecipe tRecipe = (CachedDefaultRecipe) tObject; - for (final PositionedStack tStack : tRecipe.mOutputs) { - if (aStack == tStack.item) { - if ((!(tStack instanceof FixedPositionedStack)) || (((FixedPositionedStack) tStack).mChance <= 0) || (((FixedPositionedStack) tStack).mChance == 10000)) { - break; - } - currenttip.add("Chance: " + (((FixedPositionedStack) tStack).mChance / 100) + "." + ((((FixedPositionedStack) tStack).mChance % 100) < 10 ? "0" + (((FixedPositionedStack) tStack).mChance % 100) : Integer.valueOf(((FixedPositionedStack) tStack).mChance % 100)) + "%"); - break; - } - } - for (final PositionedStack tStack : tRecipe.mInputs) { - if (GT_Utility.areStacksEqual(aStack, tStack.item)) { - if ((gregtech.api.enums.ItemList.Display_Fluid.isStackEqual(tStack.item, true, true)) || - (tStack.item.stackSize != 0)) { - break; - } - if (ItemUtils.isCatalyst(aStack)) { - currenttip.add("Does not always get consumed in the process"); - currenttip.add("Higher tier pipe casings allow this item to last longer"); - } - else if (ItemUtils.isControlCircuit(aStack)) { - currenttip.add("Does not get consumed in the process"); - } - break; - } - } - } - return currenttip; - } - - @Override - public void drawExtras(final int aRecipeIndex) { - final long tEUt = ((CachedDefaultRecipe) this.arecipes.get(aRecipeIndex)).mRecipe.mEUt; - final int tDuration = ((CachedDefaultRecipe) this.arecipes.get(aRecipeIndex)).mRecipe.mDuration; - if (tEUt != 0) { - drawText(10, 73, "Total: " + (long) (tDuration * tEUt) + " EU", -16777216); - //drawText(10, 83, "Usage: " + tEUt + " EU/t", -16777216); - if (this.mRecipeMap.mShowVoltageAmperageInNEI) { - drawText(10, 83, "Voltage: " + (tEUt / this.mRecipeMap.mAmperage) + " EU/t", -16777216); - drawText(10, 93, "Amperage: " + this.mRecipeMap.mAmperage, -16777216); - } else { - drawText(10, 93, "Voltage: unspecified", -16777216); - drawText(10, 103, "Amperage: unspecified", -16777216); - } - } - if (tDuration > 0) { - drawText(10, 103, "Time: " + (tDuration < 20 ? "< 1" : Integer.valueOf(tDuration / 20)) + " secs", -16777216); - } - if ((GT_Utility.isStringValid(this.mRecipeMap.mNEISpecialValuePre)) || (GT_Utility.isStringValid(this.mRecipeMap.mNEISpecialValuePost))) { - int aTier = (((CachedDefaultRecipe) this.arecipes.get(aRecipeIndex)).mRecipe.mSpecialValue); - String aTierMaterial = " - "; - if (aTier <= 0) { - aTierMaterial += "Bronze"; - } - else if (aTier == 1) { - aTierMaterial += "Steel"; - } - else if (aTier == 2) { - aTierMaterial += "Aluminium"; - } - else if (aTier == 3) { - aTierMaterial += "Stainless Steel"; - } - else if (aTier == 4) { - aTierMaterial += "Titanium"; - } - else if (aTier == 5) { - aTierMaterial += "Tungsten Steel"; - } - else if (aTier == 6) { - aTierMaterial += "Laurenium"; - } - else if (aTier == 7) { - aTierMaterial += "Botmium"; - } - - drawText(10, 113, this.mRecipeMap.mNEISpecialValuePre + (((CachedDefaultRecipe) this.arecipes.get(aRecipeIndex)).mRecipe.mSpecialValue * this.mRecipeMap.mNEISpecialValueMultiplier) + aTierMaterial, -16777216); - } - } - - public static class GT_RectHandler - implements IContainerInputHandler, IContainerTooltipHandler { - @Override - public boolean mouseClicked(final GuiContainer gui, final int mousex, final int mousey, final int button) { - if (this.canHandle(gui)) { - if (button == 0) { - return this.transferRect(gui, false); - } - if (button == 1) { - return this.transferRect(gui, true); - } - } - return false; - } - - @Override - public boolean lastKeyTyped(final GuiContainer gui, final char keyChar, final int keyCode) { - return false; - } - - public boolean canHandle(final GuiContainer gui) { - return (((gui instanceof GT_GUIContainer_BasicMachine)) && (GT_Utility.isStringValid(((GT_GUIContainer_BasicMachine) gui).mNEI)) /*|| ((gui instanceof GT_GUIContainer_FusionReactor)) && (GT_Utility.isStringValid(((GT_GUIContainer_FusionReactor) gui).mNEI))*/); - } - - @Override - public List<String> handleTooltip(final GuiContainer gui, final int mousex, final int mousey, final List<String> currenttip) { - if ((this.canHandle(gui)) && (currenttip.isEmpty())) { - if ((gui instanceof GT_GUIContainer_BasicMachine) && new Rectangle(65, 13, 36, 18).contains(new Point(GuiDraw.getMousePosition().x - ((GT_GUIContainer_BasicMachine) gui).getLeft() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[0], GuiDraw.getMousePosition().y - ((GT_GUIContainer_BasicMachine) gui).getTop() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[1]))) { - currenttip.add("Recipes"); - } /*else if (gui instanceof GT_GUIContainer_FusionReactor && new Rectangle(145, 0, 24, 24).contains(new Point(GuiDraw.getMousePosition().x - ((GT_GUIContainer_FusionReactor) gui).getLeft() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[0], GuiDraw.getMousePosition().y - ((GT_GUIContainer_FusionReactor) gui).getTop() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[1]))) { - currenttip.add("Recipes"); - }*/ - - } - return currenttip; - } - - private boolean transferRect(final GuiContainer gui, final boolean usage) { - if (gui instanceof GT_GUIContainer_BasicMachine) { - return (this.canHandle(gui)) && (new Rectangle(65, 13, 36, 18).contains(new Point(GuiDraw.getMousePosition().x - ((GT_GUIContainer_BasicMachine) gui).getLeft() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[0], GuiDraw.getMousePosition().y - ((GT_GUIContainer_BasicMachine) gui).getTop() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[1]))) && (usage ? GuiUsageRecipe.openRecipeGui(((GT_GUIContainer_BasicMachine) gui).mNEI, new Object[0]) : GuiCraftingRecipe.openRecipeGui(((GT_GUIContainer_BasicMachine) gui).mNEI, new Object[0])); - } /*else if (gui instanceof GT_GUIContainer_FusionReactor) { - return (canHandle(gui)) && (new Rectangle(145, 0, 24, 24).contains(new Point(GuiDraw.getMousePosition().x - ((GT_GUIContainer_FusionReactor) gui).getLeft() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[0], GuiDraw.getMousePosition().y - ((GT_GUIContainer_FusionReactor) gui).getTop() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[1]))) && (usage ? GuiUsageRecipe.openRecipeGui(((GT_GUIContainer_FusionReactor) gui).mNEI, new Object[0]) : GuiCraftingRecipe.openRecipeGui(((GT_GUIContainer_FusionReactor) gui).mNEI, new Object[0])); - }*/ - return false; - } - - @Override - public List<String> handleItemDisplayName(final GuiContainer gui, final ItemStack itemstack, final List<String> currenttip) { - return currenttip; - } - - @Override - public List<String> handleItemTooltip(final GuiContainer gui, final ItemStack itemstack, final int mousex, final int mousey, final List<String> currenttip) { - return currenttip; - } - - @Override - public boolean keyTyped(final GuiContainer gui, final char keyChar, final int keyCode) { - return false; - } - - @Override - public void onKeyTyped(final GuiContainer gui, final char keyChar, final int keyID) { - } - - @Override - public void onMouseClicked(final GuiContainer gui, final int mousex, final int mousey, final int button) { - } - - @Override - public void onMouseUp(final GuiContainer gui, final int mousex, final int mousey, final int button) { - } - - @Override - public boolean mouseScrolled(final GuiContainer gui, final int mousex, final int mousey, final int scrolled) { - return false; - } - - @Override - public void onMouseScrolled(final GuiContainer gui, final int mousex, final int mousey, final int scrolled) { - } - - @Override - public void onMouseDragged(final GuiContainer gui, final int mousex, final int mousey, final int button, final long heldTime) { - } - } - - public class FixedPositionedStack - extends PositionedStack { - public final int mChance; - public boolean permutated = false; - - public FixedPositionedStack(final Object object, final int x, final int y) { - this(object, x, y, 0); - } - - public FixedPositionedStack(final Object object, final int x, final int y, final int aChance) { - super(object, x, y, true); - this.mChance = aChance; - } - - @Override - public void generatePermutations() { - if (this.permutated) { - return; - } - final ArrayList<ItemStack> tDisplayStacks = new ArrayList<ItemStack>(); - for (final ItemStack tStack : this.items) { - if (GT_Utility.isStackValid(tStack)) { - if (tStack.getItemDamage() == 32767) { - final List<ItemStack> permutations = codechicken.nei.ItemList.itemMap.get(tStack.getItem()); - if (!permutations.isEmpty()) { - ItemStack stack; - for (final Iterator<ItemStack> i$ = permutations.iterator(); i$.hasNext(); tDisplayStacks.add(GT_Utility.copyAmount(tStack.stackSize, new Object[]{stack}))) { - stack = i$.next(); - } - } else { - final ItemStack base = new ItemStack(tStack.getItem(), tStack.stackSize); - base.stackTagCompound = tStack.stackTagCompound; - tDisplayStacks.add(base); - } - } else { - tDisplayStacks.add(GT_Utility.copy(new Object[]{tStack})); - } - } - } - this.items = (tDisplayStacks.toArray(new ItemStack[0])); - if (this.items.length == 0) { - this.items = new ItemStack[]{new ItemStack(Blocks.fire)}; - } - this.permutated = true; - this.setPermutationToRender(0); - } - } - - public class CachedDefaultRecipe - extends TemplateRecipeHandler.CachedRecipe { - public final GT_Recipe mRecipe; - public final List<PositionedStack> mOutputs = new ArrayList<PositionedStack>(); - public final List<PositionedStack> mInputs = new ArrayList<PositionedStack>(); - - public CachedDefaultRecipe(final GT_Recipe aRecipe) { - super(); - this.mRecipe = aRecipe; - - int tStartIndex = 0; - - // Four Input Slots - if (aRecipe.getRepresentativeInput(tStartIndex) != null) { - this.mInputs.add(new FixedPositionedStack(aRecipe.getRepresentativeInput(tStartIndex), 3, -4)); - } - tStartIndex++; - if (aRecipe.getRepresentativeInput(tStartIndex) != null) { - this.mInputs.add(new FixedPositionedStack(aRecipe.getRepresentativeInput(tStartIndex), 21, -4)); - } - tStartIndex++; - if (aRecipe.getRepresentativeInput(tStartIndex) != null) { - this.mInputs.add(new FixedPositionedStack(aRecipe.getRepresentativeInput(tStartIndex), 39, -4)); - } - tStartIndex++; - if (aRecipe.getRepresentativeInput(tStartIndex) != null) { - this.mInputs.add(new FixedPositionedStack(aRecipe.getRepresentativeInput(tStartIndex), 57, -4)); - } - tStartIndex++; - - - if (aRecipe.mSpecialItems != null) { - this.mInputs.add(new FixedPositionedStack(aRecipe.mSpecialItems, 120, 52)); - } - tStartIndex = 0; - - //Four Output Slots - if (aRecipe.getOutput(tStartIndex) != null) { - this.mOutputs.add(new FixedPositionedStack(aRecipe.getOutput(tStartIndex), 102, 5, aRecipe.getOutputChance(tStartIndex))); - } - tStartIndex++; - if (aRecipe.getOutput(tStartIndex) != null) { - this.mOutputs.add(new FixedPositionedStack(aRecipe.getOutput(tStartIndex), 120, 5, aRecipe.getOutputChance(tStartIndex))); - } - tStartIndex++; - if (aRecipe.getOutput(tStartIndex) != null) { - this.mOutputs.add(new FixedPositionedStack(aRecipe.getOutput(tStartIndex), 102, 23, aRecipe.getOutputChance(tStartIndex))); - } - tStartIndex++; - if (aRecipe.getOutput(tStartIndex) != null) { - this.mOutputs.add(new FixedPositionedStack(aRecipe.getOutput(tStartIndex), 120, 23, aRecipe.getOutputChance(tStartIndex))); - } - tStartIndex++; - - - //New fluid display behaviour when 3 fluid inputs are detected. (Basically a mix of the code below for outputs an the code above for 9 input slots.) - if (aRecipe.mFluidInputs.length >= 1) { - if ((aRecipe.mFluidInputs[0] != null) && (aRecipe.mFluidInputs[0].getFluid() != null)) { - this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(aRecipe.mFluidInputs[0], true), 3, 31)); - } - if ((aRecipe.mFluidInputs.length > 1) && (aRecipe.mFluidInputs[1] != null) && (aRecipe.mFluidInputs[1].getFluid() != null)) { - this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(aRecipe.mFluidInputs[1], true), 21, 31)); - } - if ((aRecipe.mFluidInputs.length > 2) && (aRecipe.mFluidInputs[2] != null) && (aRecipe.mFluidInputs[2].getFluid() != null)) { - this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(aRecipe.mFluidInputs[2], true), 39, 31)); - } - if ((aRecipe.mFluidInputs.length > 3) && (aRecipe.mFluidInputs[3] != null) && (aRecipe.mFluidInputs[3].getFluid() != null)) { - this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(aRecipe.mFluidInputs[3], true), 57, 31)); - } - } - - if (aRecipe.mFluidOutputs.length > 0) { - if ((aRecipe.mFluidOutputs[0] != null) && (aRecipe.mFluidOutputs[0].getFluid() != null)) { - this.mOutputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(aRecipe.mFluidOutputs[0], true), 138, 5)); - } - if ((aRecipe.mFluidOutputs.length > 1) && (aRecipe.mFluidOutputs[1] != null) && (aRecipe.mFluidOutputs[1].getFluid() != null)) { - this.mOutputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(aRecipe.mFluidOutputs[1], true), 138, 23)); - } - } - } - - @Override - public List<PositionedStack> getIngredients() { - return this.getCycledIngredients(GT_NEI_FluidReactor.this.cycleticks / 10, this.mInputs); - } - - @Override - public PositionedStack getResult() { - return null; - } - - @Override - public List<PositionedStack> getOtherStacks() { - return this.mOutputs; - } - } -} diff --git a/src/Java/gtPlusPlus/nei/GT_NEI_MillingMachine.java b/src/Java/gtPlusPlus/nei/GT_NEI_MillingMachine.java deleted file mode 100644 index 8aea87b6d4..0000000000 --- a/src/Java/gtPlusPlus/nei/GT_NEI_MillingMachine.java +++ /dev/null @@ -1,472 +0,0 @@ -package gtPlusPlus.nei; - -import java.awt.Point; -import java.awt.Rectangle; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; - -import org.lwjgl.opengl.GL11; - -import codechicken.lib.gui.GuiDraw; -import codechicken.nei.PositionedStack; -import codechicken.nei.guihook.GuiContainerManager; -import codechicken.nei.guihook.IContainerInputHandler; -import codechicken.nei.guihook.IContainerTooltipHandler; -import codechicken.nei.recipe.GuiCraftingRecipe; -import codechicken.nei.recipe.GuiRecipe; -import codechicken.nei.recipe.GuiUsageRecipe; -import codechicken.nei.recipe.TemplateRecipeHandler; -import cpw.mods.fml.common.event.FMLInterModComms; -import gregtech.api.enums.GT_Values; -import gregtech.api.enums.OrePrefixes; -import gregtech.api.gui.GT_GUIContainer_BasicMachine; -import gregtech.api.objects.ItemData; -import gregtech.api.util.GT_LanguageManager; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Recipe; -import gregtech.api.util.GT_Recipe.GT_Recipe_Map; -import gregtech.api.util.GT_Utility; -import gregtech.api.util.GTPP_Recipe; -import gregtech.api.util.GTPP_Recipe.GTPP_Recipe_Map; -import gtPlusPlus.core.util.minecraft.ItemUtils; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidContainerRegistry; -import net.minecraftforge.fluids.FluidStack; - -public class GT_NEI_MillingMachine -extends TemplateRecipeHandler { - public static final int sOffsetX = 5; - public static final int sOffsetY = 11; - - static { - GuiContainerManager.addInputHandler(new GT_RectHandler()); - GuiContainerManager.addTooltipHandler(new GT_RectHandler()); - } - - protected GT_Recipe_Map mRecipeMap; - - public GT_NEI_MillingMachine() { - this.mRecipeMap = GTPP_Recipe_Map.sOreMillRecipes; - this.transferRects.add(new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(65, 13, 36, 18), this.getRecipeMapName(), new Object[0])); - if (!NEI_GT_Config.sIsAdded) { - FMLInterModComms.sendRuntimeMessage(GT_Values.GT, "NEIPlugins", "register-crafting-handler", "gregtechplusplus@" + this.getRecipeName() + "@" + this.getRecipeMapName()); - GuiCraftingRecipe.craftinghandlers.add(this); - GuiUsageRecipe.usagehandlers.add(this); - } - } - - public List<GTPP_Recipe> getSortedRecipes() { - List<GTPP_Recipe> result = new ArrayList(this.mRecipeMap.mRecipeList); - Collections.sort(result); - return result; - } - - public static void drawText(final int aX, final int aY, final String aString, final int aColor) { - Minecraft.getMinecraft().fontRenderer.drawString(aString, aX, aY, aColor); - } - - @Override - public TemplateRecipeHandler newInstance() { - return new GT_NEI_MillingMachine(); - } - - @Override - public void loadCraftingRecipes(final String outputId, final Object... results) { - if (outputId.equals(getRecipeMapName())) { - for (GTPP_Recipe tRecipe : getSortedRecipes()) { - if (!tRecipe.mHidden) { - this.arecipes.add(new CachedDefaultRecipe(tRecipe)); - } - } - } else { - super.loadCraftingRecipes(outputId, results); - } - } - - @Override - public void loadCraftingRecipes(final ItemStack aResult) { - ItemData tPrefixMaterial = GT_OreDictUnificator.getAssociation(aResult); - - ArrayList<ItemStack> tResults = new ArrayList<ItemStack>(); - tResults.add(aResult); - tResults.add(GT_OreDictUnificator.get(true, aResult)); - if ((tPrefixMaterial != null) && (!tPrefixMaterial.mBlackListed) && (!tPrefixMaterial.mPrefix.mFamiliarPrefixes.isEmpty())) { - for (OrePrefixes tPrefix : tPrefixMaterial.mPrefix.mFamiliarPrefixes) { - tResults.add(GT_OreDictUnificator.get(tPrefix, tPrefixMaterial.mMaterial.mMaterial, 1L)); - } - } - FluidStack tFluid = GT_Utility.getFluidForFilledItem(aResult, true); - if (tFluid != null) { - tResults.add(GT_Utility.getFluidDisplayStack(tFluid, false)); - for (FluidContainerRegistry.FluidContainerData tData : FluidContainerRegistry.getRegisteredFluidContainerData()) { - if (tData.fluid.isFluidEqual(tFluid)) { - tResults.add(GT_Utility.copy(new Object[]{tData.filledContainer})); - } - } - } - for (GTPP_Recipe tRecipe : getSortedRecipes()) { - if (!tRecipe.mHidden) { - CachedDefaultRecipe tNEIRecipe = new CachedDefaultRecipe(tRecipe); - for (ItemStack tStack : tResults) { - if (tNEIRecipe.contains(tNEIRecipe.mOutputs, tStack)) { - this.arecipes.add(tNEIRecipe); - break; - } - } - } - } - //CachedDefaultRecipe tNEIRecipe; - } - - public void loadUsageRecipes(ItemStack aInput) { - ItemData tPrefixMaterial = GT_OreDictUnificator.getAssociation(aInput); - - ArrayList<ItemStack> tInputs = new ArrayList<ItemStack>(); - tInputs.add(aInput); - tInputs.add(GT_OreDictUnificator.get(false, aInput)); - if ((tPrefixMaterial != null) && (!tPrefixMaterial.mPrefix.mFamiliarPrefixes.isEmpty())) { - for (OrePrefixes tPrefix : tPrefixMaterial.mPrefix.mFamiliarPrefixes) { - tInputs.add(GT_OreDictUnificator.get(tPrefix, tPrefixMaterial.mMaterial.mMaterial, 1L)); - } - } - FluidStack tFluid = GT_Utility.getFluidForFilledItem(aInput, true); - if (tFluid != null) { - tInputs.add(GT_Utility.getFluidDisplayStack(tFluid, false)); - for (FluidContainerRegistry.FluidContainerData tData : FluidContainerRegistry.getRegisteredFluidContainerData()) { - if (tData.fluid.isFluidEqual(tFluid)) { - tInputs.add(GT_Utility.copy(new Object[]{tData.filledContainer})); - } - } - } - for (GTPP_Recipe tRecipe : getSortedRecipes()) { - if (!tRecipe.mHidden) { - CachedDefaultRecipe tNEIRecipe = new CachedDefaultRecipe(tRecipe); - for (ItemStack tStack : tInputs) { - if (tNEIRecipe.contains(tNEIRecipe.mInputs, tStack)) { - this.arecipes.add(tNEIRecipe); - break; - } - } - } - } - //CachedDefaultRecipe tNEIRecipe; - } - - public String getRecipeMapName() { - return this.mRecipeMap.mNEIName; - } - - @Override - public String getOverlayIdentifier() { - return this.mRecipeMap.mNEIName; - } - - @Override - public void drawBackground(final int recipe) { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - GuiDraw.changeTexture(this.getGuiTexture()); - GuiDraw.drawTexturedModalRect(-4, -8, 1, 3, 174, 78); - } - - @Override - public int recipiesPerPage() { - return 1; - } - - @Override - public String getRecipeName() { - return GT_LanguageManager.getTranslation(this.mRecipeMap.mUnlocalizedName); - } - - @Override - public String getGuiTexture() { - return this.mRecipeMap.mNEIGUIPath; - } - - @Override - public List<String> handleItemTooltip(final GuiRecipe gui, final ItemStack aStack, final List<String> currenttip, final int aRecipeIndex) { - final TemplateRecipeHandler.CachedRecipe tObject = this.arecipes.get(aRecipeIndex); - if ((tObject instanceof CachedDefaultRecipe)) { - final CachedDefaultRecipe tRecipe = (CachedDefaultRecipe) tObject; - for (final PositionedStack tStack : tRecipe.mOutputs) { - if (aStack == tStack.item) { - if ((!(tStack instanceof FixedPositionedStack)) || (((FixedPositionedStack) tStack).mChance <= 0) || (((FixedPositionedStack) tStack).mChance == 10000)) { - break; - } - currenttip.add("Chance: " + (((FixedPositionedStack) tStack).mChance / 100) + "." + ((((FixedPositionedStack) tStack).mChance % 100) < 10 ? "0" + (((FixedPositionedStack) tStack).mChance % 100) : Integer.valueOf(((FixedPositionedStack) tStack).mChance % 100)) + "%"); - break; - } - } - for (final PositionedStack tStack : tRecipe.mInputs) { - if (GT_Utility.areStacksEqual(aStack, tStack.item)) { - if ((gregtech.api.enums.ItemList.Display_Fluid.isStackEqual(tStack.item, true, true)) || - (tStack.item.stackSize != 0)) { - break; - } - if (ItemUtils.isMillingBall(aStack)) { - currenttip.add("Does not always get consumed in the process"); - } - else if (ItemUtils.isControlCircuit(aStack)) { - currenttip.add("Does not get consumed in the process"); - } - break; - } - } - } - return currenttip; - } - - @Override - public void drawExtras(final int aRecipeIndex) { - final long tEUt = ((CachedDefaultRecipe) this.arecipes.get(aRecipeIndex)).mRecipe.mEUt; - final int tDuration = ((CachedDefaultRecipe) this.arecipes.get(aRecipeIndex)).mRecipe.mDuration; - if (tEUt != 0) { - drawText(10, 73, "Total: " + (long) (tDuration * tEUt) + " EU", -16777216); - //drawText(10, 83, "Usage: " + tEUt + " EU/t", -16777216); - if (this.mRecipeMap.mShowVoltageAmperageInNEI) { - drawText(10, 83, "Voltage: " + (tEUt / this.mRecipeMap.mAmperage) + " EU/t", -16777216); - drawText(10, 93, "Amperage: " + this.mRecipeMap.mAmperage, -16777216); - } else { - drawText(10, 93, "Voltage: unspecified", -16777216); - drawText(10, 103, "Amperage: unspecified", -16777216); - } - } - if (tDuration > 0) { - drawText(10, 103, "Time: " + (tDuration < 20 ? "< 1" : Integer.valueOf(tDuration / 20)) + " secs", -16777216); - } - if ((GT_Utility.isStringValid(this.mRecipeMap.mNEISpecialValuePre)) || (GT_Utility.isStringValid(this.mRecipeMap.mNEISpecialValuePost))) { - drawText(10, 113, this.mRecipeMap.mNEISpecialValuePre + (((CachedDefaultRecipe) this.arecipes.get(aRecipeIndex)).mRecipe.mSpecialValue * this.mRecipeMap.mNEISpecialValueMultiplier) + this.mRecipeMap.mNEISpecialValuePost, -16777216); - } - } - - public static class GT_RectHandler - implements IContainerInputHandler, IContainerTooltipHandler { - @Override - public boolean mouseClicked(final GuiContainer gui, final int mousex, final int mousey, final int button) { - if (this.canHandle(gui)) { - if (button == 0) { - return this.transferRect(gui, false); - } - if (button == 1) { - return this.transferRect(gui, true); - } - } - return false; - } - - @Override - public boolean lastKeyTyped(final GuiContainer gui, final char keyChar, final int keyCode) { - return false; - } - - public boolean canHandle(final GuiContainer gui) { - return (((gui instanceof GT_GUIContainer_BasicMachine)) && (GT_Utility.isStringValid(((GT_GUIContainer_BasicMachine) gui).mNEI)) /*|| ((gui instanceof GT_GUIContainer_FusionReactor)) && (GT_Utility.isStringValid(((GT_GUIContainer_FusionReactor) gui).mNEI))*/); - } - - @Override - public List<String> handleTooltip(final GuiContainer gui, final int mousex, final int mousey, final List<String> currenttip) { - if ((this.canHandle(gui)) && (currenttip.isEmpty())) { - if ((gui instanceof GT_GUIContainer_BasicMachine) && new Rectangle(65, 13, 36, 18).contains(new Point(GuiDraw.getMousePosition().x - ((GT_GUIContainer_BasicMachine) gui).getLeft() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[0], GuiDraw.getMousePosition().y - ((GT_GUIContainer_BasicMachine) gui).getTop() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[1]))) { - currenttip.add("Recipes"); - } /*else if (gui instanceof GT_GUIContainer_FusionReactor && new Rectangle(145, 0, 24, 24).contains(new Point(GuiDraw.getMousePosition().x - ((GT_GUIContainer_FusionReactor) gui).getLeft() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[0], GuiDraw.getMousePosition().y - ((GT_GUIContainer_FusionReactor) gui).getTop() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[1]))) { - currenttip.add("Recipes"); - }*/ - - } - return currenttip; - } - - private boolean transferRect(final GuiContainer gui, final boolean usage) { - if (gui instanceof GT_GUIContainer_BasicMachine) { - return (this.canHandle(gui)) && (new Rectangle(65, 13, 36, 18).contains(new Point(GuiDraw.getMousePosition().x - ((GT_GUIContainer_BasicMachine) gui).getLeft() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[0], GuiDraw.getMousePosition().y - ((GT_GUIContainer_BasicMachine) gui).getTop() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[1]))) && (usage ? GuiUsageRecipe.openRecipeGui(((GT_GUIContainer_BasicMachine) gui).mNEI, new Object[0]) : GuiCraftingRecipe.openRecipeGui(((GT_GUIContainer_BasicMachine) gui).mNEI, new Object[0])); - } /*else if (gui instanceof GT_GUIContainer_FusionReactor) { - return (canHandle(gui)) && (new Rectangle(145, 0, 24, 24).contains(new Point(GuiDraw.getMousePosition().x - ((GT_GUIContainer_FusionReactor) gui).getLeft() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[0], GuiDraw.getMousePosition().y - ((GT_GUIContainer_FusionReactor) gui).getTop() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[1]))) && (usage ? GuiUsageRecipe.openRecipeGui(((GT_GUIContainer_FusionReactor) gui).mNEI, new Object[0]) : GuiCraftingRecipe.openRecipeGui(((GT_GUIContainer_FusionReactor) gui).mNEI, new Object[0])); - }*/ - return false; - } - - @Override - public List<String> handleItemDisplayName(final GuiContainer gui, final ItemStack itemstack, final List<String> currenttip) { - return currenttip; - } - - @Override - public List<String> handleItemTooltip(final GuiContainer gui, final ItemStack itemstack, final int mousex, final int mousey, final List<String> currenttip) { - return currenttip; - } - - @Override - public boolean keyTyped(final GuiContainer gui, final char keyChar, final int keyCode) { - return false; - } - - @Override - public void onKeyTyped(final GuiContainer gui, final char keyChar, final int keyID) { - } - - @Override - public void onMouseClicked(final GuiContainer gui, final int mousex, final int mousey, final int button) { - } - - @Override - public void onMouseUp(final GuiContainer gui, final int mousex, final int mousey, final int button) { - } - - @Override - public boolean mouseScrolled(final GuiContainer gui, final int mousex, final int mousey, final int scrolled) { - return false; - } - - @Override - public void onMouseScrolled(final GuiContainer gui, final int mousex, final int mousey, final int scrolled) { - } - - @Override - public void onMouseDragged(final GuiContainer gui, final int mousex, final int mousey, final int button, final long heldTime) { - } - } - - public class FixedPositionedStack - extends PositionedStack { - public final int mChance; - public boolean permutated = false; - - public FixedPositionedStack(final Object object, final int x, final int y) { - this(object, x, y, 0); - } - - public FixedPositionedStack(final Object object, final int x, final int y, final int aChance) { - super(object, x, y, true); - this.mChance = aChance; - } - - @Override - public void generatePermutations() { - if (this.permutated) { - return; - } - final ArrayList<ItemStack> tDisplayStacks = new ArrayList<ItemStack>(); - for (final ItemStack tStack : this.items) { - if (GT_Utility.isStackValid(tStack)) { - if (tStack.getItemDamage() == 32767) { - final List<ItemStack> permutations = codechicken.nei.ItemList.itemMap.get(tStack.getItem()); - if (!permutations.isEmpty()) { - ItemStack stack; - for (final Iterator<ItemStack> i$ = permutations.iterator(); i$.hasNext(); tDisplayStacks.add(GT_Utility.copyAmount(tStack.stackSize, new Object[]{stack}))) { - stack = i$.next(); - } - } else { - final ItemStack base = new ItemStack(tStack.getItem(), tStack.stackSize); - base.stackTagCompound = tStack.stackTagCompound; - tDisplayStacks.add(base); - } - } else { - tDisplayStacks.add(GT_Utility.copy(new Object[]{tStack})); - } - } - } - this.items = (tDisplayStacks.toArray(new ItemStack[0])); - if (this.items.length == 0) { - this.items = new ItemStack[]{new ItemStack(Blocks.fire)}; - } - this.permutated = true; - this.setPermutationToRender(0); - } - } - - public class CachedDefaultRecipe - extends TemplateRecipeHandler.CachedRecipe { - public final GT_Recipe mRecipe; - public final List<PositionedStack> mOutputs = new ArrayList<PositionedStack>(); - public final List<PositionedStack> mInputs = new ArrayList<PositionedStack>(); - - public CachedDefaultRecipe(final GT_Recipe aRecipe) { - super(); - this.mRecipe = aRecipe; - - int tStartIndex = 0; - - if (aRecipe.getRepresentativeInput(tStartIndex) != null) { - this.mInputs.add(new FixedPositionedStack(aRecipe.getRepresentativeInput(tStartIndex), 12, 14)); - } - tStartIndex++; - if (aRecipe.getRepresentativeInput(tStartIndex) != null) { - this.mInputs.add(new FixedPositionedStack(aRecipe.getRepresentativeInput(tStartIndex), 30, 14)); - } - tStartIndex++; - if (aRecipe.getRepresentativeInput(tStartIndex) != null) { - this.mInputs.add(new FixedPositionedStack(aRecipe.getRepresentativeInput(tStartIndex), 48, 14)); - } - tStartIndex++; - - if (aRecipe.mSpecialItems != null) { - this.mInputs.add(new FixedPositionedStack(aRecipe.mSpecialItems, 120, 52)); - } - tStartIndex = 0; - - //Four Output Slots - if (aRecipe.getOutput(tStartIndex) != null) { - this.mOutputs.add(new FixedPositionedStack(aRecipe.getOutput(tStartIndex), 102, 5, aRecipe.getOutputChance(tStartIndex))); - } - tStartIndex++; - if (aRecipe.getOutput(tStartIndex) != null) { - this.mOutputs.add(new FixedPositionedStack(aRecipe.getOutput(tStartIndex), 120, 5, aRecipe.getOutputChance(tStartIndex))); - } - tStartIndex++; - if (aRecipe.getOutput(tStartIndex) != null) { - this.mOutputs.add(new FixedPositionedStack(aRecipe.getOutput(tStartIndex), 102, 23, aRecipe.getOutputChance(tStartIndex))); - } - tStartIndex++; - if (aRecipe.getOutput(tStartIndex) != null) { - this.mOutputs.add(new FixedPositionedStack(aRecipe.getOutput(tStartIndex), 120, 23, aRecipe.getOutputChance(tStartIndex))); - } - tStartIndex++; - - - //New fluid display behaviour when 3 fluid inputs are detected. (Basically a mix of the code below for outputs an the code above for 9 input slots.) - if (aRecipe.mFluidInputs.length >= 1) { - if ((aRecipe.mFluidInputs[0] != null) && (aRecipe.mFluidInputs[0].getFluid() != null)) { - this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(aRecipe.mFluidInputs[0], true), 3, 31)); - } - if ((aRecipe.mFluidInputs.length > 1) && (aRecipe.mFluidInputs[1] != null) && (aRecipe.mFluidInputs[1].getFluid() != null)) { - this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(aRecipe.mFluidInputs[1], true), 21, 31)); - } - if ((aRecipe.mFluidInputs.length > 2) && (aRecipe.mFluidInputs[2] != null) && (aRecipe.mFluidInputs[2].getFluid() != null)) { - this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(aRecipe.mFluidInputs[2], true), 39, 31)); - } - if ((aRecipe.mFluidInputs.length > 3) && (aRecipe.mFluidInputs[3] != null) && (aRecipe.mFluidInputs[3].getFluid() != null)) { - this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(aRecipe.mFluidInputs[3], true), 57, 31)); - } - } - - if (aRecipe.mFluidOutputs.length > 0) { - if ((aRecipe.mFluidOutputs[0] != null) && (aRecipe.mFluidOutputs[0].getFluid() != null)) { - this.mOutputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(aRecipe.mFluidOutputs[0], true), 138, 5)); - } - if ((aRecipe.mFluidOutputs.length > 1) && (aRecipe.mFluidOutputs[1] != null) && (aRecipe.mFluidOutputs[1].getFluid() != null)) { - this.mOutputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(aRecipe.mFluidOutputs[1], true), 138, 23)); - } - } - } - - @Override - public List<PositionedStack> getIngredients() { - return this.getCycledIngredients(GT_NEI_MillingMachine.this.cycleticks / 10, this.mInputs); - } - - @Override - public PositionedStack getResult() { - return null; - } - - @Override - public List<PositionedStack> getOtherStacks() { - return this.mOutputs; - } - } -} diff --git a/src/Java/gtPlusPlus/nei/GT_NEI_RFPP.java b/src/Java/gtPlusPlus/nei/GT_NEI_RFPP.java deleted file mode 100644 index 93ad7a775b..0000000000 --- a/src/Java/gtPlusPlus/nei/GT_NEI_RFPP.java +++ /dev/null @@ -1,515 +0,0 @@ -package gtPlusPlus.nei; - -import java.awt.Point; -import java.awt.Rectangle; -import java.util.*; - -import org.lwjgl.opengl.GL11; - -import codechicken.lib.gui.GuiDraw; -import codechicken.nei.PositionedStack; -import codechicken.nei.guihook.GuiContainerManager; -import codechicken.nei.guihook.IContainerInputHandler; -import codechicken.nei.guihook.IContainerTooltipHandler; -import codechicken.nei.recipe.*; -import cpw.mods.fml.common.event.FMLInterModComms; -import gregtech.api.enums.GT_Values; -import gregtech.api.enums.OrePrefixes; -import gregtech.api.gui.GT_GUIContainer_BasicMachine; -import gregtech.api.objects.ItemData; -import gregtech.api.util.*; -import gregtech.api.util.GTPP_Recipe.GTPP_Recipe_Map_Internal; -import gtPlusPlus.core.util.minecraft.ItemUtils; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidContainerRegistry; -import net.minecraftforge.fluids.FluidStack; - -public class GT_NEI_RFPP -extends TemplateRecipeHandler { - public static final int sOffsetX = 5; - public static final int sOffsetY = 11; - - static { - GuiContainerManager.addInputHandler(new GT_RectHandler()); - GuiContainerManager.addTooltipHandler(new GT_RectHandler()); - } - - protected GTPP_Recipe_Map_Internal mRecipeMap; - - public GT_NEI_RFPP() { - this.mRecipeMap = GTPP_Recipe.GTPP_Recipe_Map.sFissionFuelProcessing; - this.transferRects.add(new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(65, 13, 36, 18), this.getRecipeMapName(), new Object[0])); - if (!NEI_GT_Config.sIsAdded) { - FMLInterModComms.sendRuntimeMessage(GT_Values.GT, "NEIPlugins", "register-crafting-handler", "gregtechplusplus@" + this.getRecipeName() + "@" + this.getRecipeMapName()); - GuiCraftingRecipe.craftinghandlers.add(this); - GuiUsageRecipe.usagehandlers.add(this); - } - } - - public List<GTPP_Recipe> getSortedRecipes() { - List<GTPP_Recipe> result = new ArrayList(this.mRecipeMap.mRecipeList); - Collections.sort(result); - return result; - } - - public static void drawText(final int aX, final int aY, final String aString, final int aColor) { - Minecraft.getMinecraft().fontRenderer.drawString(aString, aX, aY, aColor); - } - - @Override - public TemplateRecipeHandler newInstance() { - return new GT_NEI_RFPP(); - } - - @Override - public void loadCraftingRecipes(final String outputId, final Object... results) { - if (outputId.equals(getRecipeMapName())) { - for (GTPP_Recipe tRecipe : getSortedRecipes()) { - if (!tRecipe.mHidden) { - this.arecipes.add(new CachedDefaultRecipe(tRecipe)); - } - } - } else { - super.loadCraftingRecipes(outputId, results); - } - } - - @Override - public void loadCraftingRecipes(final ItemStack aResult) { - ItemData tPrefixMaterial = GT_OreDictUnificator.getAssociation(aResult); - - ArrayList<ItemStack> tResults = new ArrayList<ItemStack>(); - tResults.add(aResult); - tResults.add(GT_OreDictUnificator.get(true, aResult)); - if ((tPrefixMaterial != null) && (!tPrefixMaterial.mBlackListed) && (!tPrefixMaterial.mPrefix.mFamiliarPrefixes.isEmpty())) { - for (OrePrefixes tPrefix : tPrefixMaterial.mPrefix.mFamiliarPrefixes) { - tResults.add(GT_OreDictUnificator.get(tPrefix, tPrefixMaterial.mMaterial.mMaterial, 1L)); - } - } - FluidStack tFluid = GT_Utility.getFluidForFilledItem(aResult, true); - if (tFluid != null) { - tResults.add(GT_Utility.getFluidDisplayStack(tFluid, false)); - for (FluidContainerRegistry.FluidContainerData tData : FluidContainerRegistry.getRegisteredFluidContainerData()) { - if (tData.fluid.isFluidEqual(tFluid)) { - tResults.add(GT_Utility.copy(new Object[]{tData.filledContainer})); - } - } - } - for (GTPP_Recipe tRecipe : getSortedRecipes()) { - if (!tRecipe.mHidden) { - CachedDefaultRecipe tNEIRecipe = new CachedDefaultRecipe(tRecipe); - for (ItemStack tStack : tResults) { - if (tNEIRecipe.contains(tNEIRecipe.mOutputs, tStack)) { - this.arecipes.add(tNEIRecipe); - break; - } - } - } - } - //CachedDefaultRecipe tNEIRecipe; - } - - public void loadUsageRecipes(ItemStack aInput) { - ItemData tPrefixMaterial = GT_OreDictUnificator.getAssociation(aInput); - - ArrayList<ItemStack> tInputs = new ArrayList<ItemStack>(); - tInputs.add(aInput); - tInputs.add(GT_OreDictUnificator.get(false, aInput)); - if ((tPrefixMaterial != null) && (!tPrefixMaterial.mPrefix.mFamiliarPrefixes.isEmpty())) { - for (OrePrefixes tPrefix : tPrefixMaterial.mPrefix.mFamiliarPrefixes) { - tInputs.add(GT_OreDictUnificator.get(tPrefix, tPrefixMaterial.mMaterial.mMaterial, 1L)); - } - } - FluidStack tFluid = GT_Utility.getFluidForFilledItem(aInput, true); - if (tFluid != null) { - tInputs.add(GT_Utility.getFluidDisplayStack(tFluid, false)); - for (FluidContainerRegistry.FluidContainerData tData : FluidContainerRegistry.getRegisteredFluidContainerData()) { - if (tData.fluid.isFluidEqual(tFluid)) { - tInputs.add(GT_Utility.copy(new Object[]{tData.filledContainer})); - } - } - } - for (GTPP_Recipe tRecipe : getSortedRecipes()) { - if (!tRecipe.mHidden) { - CachedDefaultRecipe tNEIRecipe = new CachedDefaultRecipe(tRecipe); - for (ItemStack tStack : tInputs) { - if (tNEIRecipe.contains(tNEIRecipe.mInputs, tStack)) { - this.arecipes.add(tNEIRecipe); - break; - } - } - } - } - //CachedDefaultRecipe tNEIRecipe; - } - - public String getRecipeMapName() { - return this.mRecipeMap.mNEIName; - } - - @Override - public String getOverlayIdentifier() { - return this.mRecipeMap.mNEIName; - } - - @Override - public void drawBackground(final int recipe) { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - GuiDraw.changeTexture(this.getGuiTexture()); - GuiDraw.drawTexturedModalRect(-4, -8, 1, 3, 174, 78); - } - - @Override - public int recipiesPerPage() { - return 1; - } - - @Override - public String getRecipeName() { - return GT_LanguageManager.getTranslation(this.mRecipeMap.mUnlocalizedName); - } - - @Override - public String getGuiTexture() { - return this.mRecipeMap.mNEIGUIPath; - } - - @Override - public List<String> handleItemTooltip(final GuiRecipe gui, final ItemStack aStack, final List<String> currenttip, final int aRecipeIndex) { - final TemplateRecipeHandler.CachedRecipe tObject = this.arecipes.get(aRecipeIndex); - if ((tObject instanceof CachedDefaultRecipe)) { - final CachedDefaultRecipe tRecipe = (CachedDefaultRecipe) tObject; - for (final PositionedStack tStack : tRecipe.mOutputs) { - if (aStack == tStack.item) { - if ((!(tStack instanceof FixedPositionedStack)) || (((FixedPositionedStack) tStack).mChance <= 0) || (((FixedPositionedStack) tStack).mChance == 10000)) { - break; - } - currenttip.add("Chance: " + (((FixedPositionedStack) tStack).mChance / 100) + "." + ((((FixedPositionedStack) tStack).mChance % 100) < 10 ? "0" + (((FixedPositionedStack) tStack).mChance % 100) : Integer.valueOf(((FixedPositionedStack) tStack).mChance % 100)) + "%"); - break; - } - } - for (final PositionedStack tStack : tRecipe.mInputs) { - if (GT_Utility.areStacksEqual(aStack, tStack.item)) { - if ((gregtech.api.enums.ItemList.Display_Fluid.isStackEqual(tStack.item, true, true)) || - (tStack.item.stackSize != 0)) { - break; - } - if (ItemUtils.isControlCircuit(aStack)) { - currenttip.add("Does not get consumed in the process"); - } - break; - } - } - } - return currenttip; - } - - @Override - public void drawExtras(final int aRecipeIndex) { - final long tEUt = ((CachedDefaultRecipe) this.arecipes.get(aRecipeIndex)).mRecipe.mEUt; - final int tDuration = ((CachedDefaultRecipe) this.arecipes.get(aRecipeIndex)).mRecipe.mDuration; - if (tEUt != 0) { - drawText(10, 73, "Total: " + (long) (tDuration * tEUt) + " EU", -16777216); - //drawText(10, 83, "Usage: " + tEUt + " EU/t", -16777216); - if (this.mRecipeMap.mShowVoltageAmperageInNEI) { - drawText(10, 83, "Voltage: " + (tEUt / this.mRecipeMap.mAmperage) + " EU/t", -16777216); - drawText(10, 93, "Amperage: " + this.mRecipeMap.mAmperage, -16777216); - } else { - drawText(10, 93, "Voltage: unspecified", -16777216); - drawText(10, 103, "Amperage: unspecified", -16777216); - } - } - if (tDuration > 0) { - drawText(10, 103, "Time: " + (tDuration < 20 ? "< 1" : Integer.valueOf(tDuration / 20)) + " secs", -16777216); - } - //if ((GT_Utility.isStringValid(this.mRecipeMap.mNEISpecialValuePre)) || (GT_Utility.isStringValid(this.mRecipeMap.mNEISpecialValuePost))) { - //drawText(10, 113, this.mRecipeMap.mNEISpecialValuePre + (((CachedDefaultRecipe) this.arecipes.get(aRecipeIndex)).mRecipe.mSpecialValue * this.mRecipeMap.mNEISpecialValueMultiplier) + this.mRecipeMap.mNEISpecialValuePost, -16777216); - //} - } - - public static class GT_RectHandler - implements IContainerInputHandler, IContainerTooltipHandler { - @Override - public boolean mouseClicked(final GuiContainer gui, final int mousex, final int mousey, final int button) { - if (this.canHandle(gui)) { - if (button == 0) { - return this.transferRect(gui, false); - } - if (button == 1) { - return this.transferRect(gui, true); - } - } - return false; - } - - @Override - public boolean lastKeyTyped(final GuiContainer gui, final char keyChar, final int keyCode) { - return false; - } - - public boolean canHandle(final GuiContainer gui) { - return (((gui instanceof GT_GUIContainer_BasicMachine)) && (GT_Utility.isStringValid(((GT_GUIContainer_BasicMachine) gui).mNEI)) /*|| ((gui instanceof GT_GUIContainer_FusionReactor)) && (GT_Utility.isStringValid(((GT_GUIContainer_FusionReactor) gui).mNEI))*/); - } - - @Override - public List<String> handleTooltip(final GuiContainer gui, final int mousex, final int mousey, final List<String> currenttip) { - if ((this.canHandle(gui)) && (currenttip.isEmpty())) { - if ((gui instanceof GT_GUIContainer_BasicMachine) && new Rectangle(65, 13, 36, 18).contains(new Point(GuiDraw.getMousePosition().x - ((GT_GUIContainer_BasicMachine) gui).getLeft() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[0], GuiDraw.getMousePosition().y - ((GT_GUIContainer_BasicMachine) gui).getTop() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[1]))) { - currenttip.add("Recipes"); - } /*else if (gui instanceof GT_GUIContainer_FusionReactor && new Rectangle(145, 0, 24, 24).contains(new Point(GuiDraw.getMousePosition().x - ((GT_GUIContainer_FusionReactor) gui).getLeft() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[0], GuiDraw.getMousePosition().y - ((GT_GUIContainer_FusionReactor) gui).getTop() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[1]))) { - currenttip.add("Recipes"); - }*/ - - } - return currenttip; - } - - private boolean transferRect(final GuiContainer gui, final boolean usage) { - if (gui instanceof GT_GUIContainer_BasicMachine) { - return (this.canHandle(gui)) && (new Rectangle(65, 13, 36, 18).contains(new Point(GuiDraw.getMousePosition().x - ((GT_GUIContainer_BasicMachine) gui).getLeft() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[0], GuiDraw.getMousePosition().y - ((GT_GUIContainer_BasicMachine) gui).getTop() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[1]))) && (usage ? GuiUsageRecipe.openRecipeGui(((GT_GUIContainer_BasicMachine) gui).mNEI, new Object[0]) : GuiCraftingRecipe.openRecipeGui(((GT_GUIContainer_BasicMachine) gui).mNEI, new Object[0])); - } /*else if (gui instanceof GT_GUIContainer_FusionReactor) { - return (canHandle(gui)) && (new Rectangle(145, 0, 24, 24).contains(new Point(GuiDraw.getMousePosition().x - ((GT_GUIContainer_FusionReactor) gui).getLeft() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[0], GuiDraw.getMousePosition().y - ((GT_GUIContainer_FusionReactor) gui).getTop() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[1]))) && (usage ? GuiUsageRecipe.openRecipeGui(((GT_GUIContainer_FusionReactor) gui).mNEI, new Object[0]) : GuiCraftingRecipe.openRecipeGui(((GT_GUIContainer_FusionReactor) gui).mNEI, new Object[0])); - }*/ - return false; - } - - @Override - public List<String> handleItemDisplayName(final GuiContainer gui, final ItemStack itemstack, final List<String> currenttip) { - return currenttip; - } - - @Override - public List<String> handleItemTooltip(final GuiContainer gui, final ItemStack itemstack, final int mousex, final int mousey, final List<String> currenttip) { - return currenttip; - } - - @Override - public boolean keyTyped(final GuiContainer gui, final char keyChar, final int keyCode) { - return false; - } - - @Override - public void onKeyTyped(final GuiContainer gui, final char keyChar, final int keyID) { - } - - @Override - public void onMouseClicked(final GuiContainer gui, final int mousex, final int mousey, final int button) { - } - - @Override - public void onMouseUp(final GuiContainer gui, final int mousex, final int mousey, final int button) { - } - - @Override - public boolean mouseScrolled(final GuiContainer gui, final int mousex, final int mousey, final int scrolled) { - return false; - } - - @Override - public void onMouseScrolled(final GuiContainer gui, final int mousex, final int mousey, final int scrolled) { - } - - @Override - public void onMouseDragged(final GuiContainer gui, final int mousex, final int mousey, final int button, final long heldTime) { - } - } - - public class FixedPositionedStack - extends PositionedStack { - public final int mChance; - public boolean permutated = false; - - public FixedPositionedStack(final Object object, final int x, final int y) { - this(object, x, y, 0); - } - - public FixedPositionedStack(final Object object, final int x, final int y, final int aChance) { - super(object, x, y, true); - this.mChance = aChance; - } - - @Override - public void generatePermutations() { - if (this.permutated) { - return; - } - final ArrayList<ItemStack> tDisplayStacks = new ArrayList<ItemStack>(); - for (final ItemStack tStack : this.items) { - if (GT_Utility.isStackValid(tStack)) { - if (tStack.getItemDamage() == 32767) { - final List<ItemStack> permutations = codechicken.nei.ItemList.itemMap.get(tStack.getItem()); - if (!permutations.isEmpty()) { - ItemStack stack; - for (final Iterator<ItemStack> i$ = permutations.iterator(); i$.hasNext(); tDisplayStacks.add(GT_Utility.copyAmount(tStack.stackSize, new Object[]{stack}))) { - stack = i$.next(); - } - } else { - final ItemStack base = new ItemStack(tStack.getItem(), tStack.stackSize); - base.stackTagCompound = tStack.stackTagCompound; - tDisplayStacks.add(base); - } - } else { - tDisplayStacks.add(GT_Utility.copy(new Object[]{tStack})); - } - } - } - this.items = (tDisplayStacks.toArray(new ItemStack[0])); - if (this.items.length == 0) { - this.items = new ItemStack[]{new ItemStack(Blocks.fire)}; - } - this.permutated = true; - this.setPermutationToRender(0); - } - } - - public class CachedDefaultRecipe - extends TemplateRecipeHandler.CachedRecipe { - public final GT_Recipe mRecipe; - public final List<PositionedStack> mOutputs = new ArrayList<PositionedStack>(); - public final List<PositionedStack> mInputs = new ArrayList<PositionedStack>(); - - public CachedDefaultRecipe(final GT_Recipe aRecipe) { - super(); - this.mRecipe = aRecipe; - - int tStartIndex = 0; - - - if (aRecipe.getRepresentativeInput(tStartIndex) != null) { - this.mInputs.add(new FixedPositionedStack(aRecipe.getRepresentativeInput(tStartIndex), 12, 5)); - } - tStartIndex++; - if (aRecipe.getRepresentativeInput(tStartIndex) != null) { - this.mInputs.add(new FixedPositionedStack(aRecipe.getRepresentativeInput(tStartIndex), 30, 5)); - } - tStartIndex++; - if (aRecipe.getRepresentativeInput(tStartIndex) != null) { - this.mInputs.add(new FixedPositionedStack(aRecipe.getRepresentativeInput(tStartIndex), 48, 5)); - } - tStartIndex++; - if (aRecipe.getRepresentativeInput(tStartIndex) != null) { - this.mInputs.add(new FixedPositionedStack(aRecipe.getRepresentativeInput(tStartIndex), 12, 23)); - } - tStartIndex++; - if (aRecipe.getRepresentativeInput(tStartIndex) != null) { - this.mInputs.add(new FixedPositionedStack(aRecipe.getRepresentativeInput(tStartIndex), 30, 23)); - } - tStartIndex++; - if (aRecipe.getRepresentativeInput(tStartIndex) != null) { - this.mInputs.add(new FixedPositionedStack(aRecipe.getRepresentativeInput(tStartIndex), 48, 23)); - } - tStartIndex++; - - if (aRecipe.mSpecialItems != null) { - this.mInputs.add(new FixedPositionedStack(aRecipe.mSpecialItems, 120, 52)); - } - tStartIndex = 0; - - //Four Output Slots - if (aRecipe.getOutput(tStartIndex) != null) { - this.mOutputs.add(new FixedPositionedStack(aRecipe.getOutput(tStartIndex), 102, 5, aRecipe.getOutputChance(tStartIndex))); - } - tStartIndex++; - if (aRecipe.getOutput(tStartIndex) != null) { - this.mOutputs.add(new FixedPositionedStack(aRecipe.getOutput(tStartIndex), 120, 5, aRecipe.getOutputChance(tStartIndex))); - } - tStartIndex++; - if (aRecipe.getOutput(tStartIndex) != null) { - this.mOutputs.add(new FixedPositionedStack(aRecipe.getOutput(tStartIndex), 102, 23, aRecipe.getOutputChance(tStartIndex))); - } - tStartIndex++; - if (aRecipe.getOutput(tStartIndex) != null) { - this.mOutputs.add(new FixedPositionedStack(aRecipe.getOutput(tStartIndex), 120, 23, aRecipe.getOutputChance(tStartIndex))); - } - tStartIndex++; - - //New fluid display behaviour when 3 fluid inputs are detected. (Basically a mix of the code below for outputs an the code above for 9 input slots.) - if (aRecipe.mFluidInputs.length > 2) { - if ((aRecipe.mFluidInputs[0] != null) && (aRecipe.mFluidInputs[0].getFluid() != null)) { - this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(aRecipe.mFluidInputs[0], true), 12, 5)); - } - if ((aRecipe.mFluidInputs[1] != null) && (aRecipe.mFluidInputs[1].getFluid() != null)) { - this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(aRecipe.mFluidInputs[1], true), 30, 5)); - } - if ((aRecipe.mFluidInputs.length > 2) && (aRecipe.mFluidInputs[2] != null) && (aRecipe.mFluidInputs[2].getFluid() != null)) { - this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(aRecipe.mFluidInputs[2], true), 48, 5)); - } - if ((aRecipe.mFluidInputs.length > 3) && (aRecipe.mFluidInputs[3] != null) && (aRecipe.mFluidInputs[3].getFluid() != null)) { - this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(aRecipe.mFluidInputs[3], true), 12, 23)); - } - if ((aRecipe.mFluidInputs.length > 4) && (aRecipe.mFluidInputs[4] != null) && (aRecipe.mFluidInputs[4].getFluid() != null)) { - this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(aRecipe.mFluidInputs[4], true), 30, 23)); - } - if ((aRecipe.mFluidInputs.length > 5) && (aRecipe.mFluidInputs[5] != null) && (aRecipe.mFluidInputs[5].getFluid() != null)) { - this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(aRecipe.mFluidInputs[5], true), 48, 23)); - } - if ((aRecipe.mFluidInputs.length > 6) && (aRecipe.mFluidInputs[6] != null) && (aRecipe.mFluidInputs[6].getFluid() != null)) { - this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(aRecipe.mFluidInputs[6], true), 12, 41)); - } - if ((aRecipe.mFluidInputs.length > 7) && (aRecipe.mFluidInputs[7] != null) && (aRecipe.mFluidInputs[7].getFluid() != null)) { - this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(aRecipe.mFluidInputs[7], true), 30, 41)); - } - if ((aRecipe.mFluidInputs.length > 8) && (aRecipe.mFluidInputs[8] != null) && (aRecipe.mFluidInputs[8].getFluid() != null)) { - this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(aRecipe.mFluidInputs[8], true), 48, 41)); - } - } - //Returns to old behaviour if fluid inputs < 3 - else if ((aRecipe.mFluidInputs.length > 0) && (aRecipe.mFluidInputs[0] != null) && (aRecipe.mFluidInputs[0].getFluid() != null)) { - this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(aRecipe.mFluidInputs[0], true), 48, 52)); - if ((aRecipe.mFluidInputs.length == 2) && (aRecipe.mFluidInputs[1] != null) && (aRecipe.mFluidInputs[1].getFluid() != null)) { - this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(aRecipe.mFluidInputs[1], true), 30, 52)); - } - } - - if (aRecipe.mFluidOutputs.length > 1) { - if ((aRecipe.mFluidOutputs[0] != null) && (aRecipe.mFluidOutputs[0].getFluid() != null)) { - this.mOutputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(aRecipe.mFluidOutputs[0], true), 102, 5)); - } - if ((aRecipe.mFluidOutputs[1] != null) && (aRecipe.mFluidOutputs[1].getFluid() != null)) { - this.mOutputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(aRecipe.mFluidOutputs[1], true), 120, 5)); - } - if ((aRecipe.mFluidOutputs.length > 2) && (aRecipe.mFluidOutputs[2] != null) && (aRecipe.mFluidOutputs[2].getFluid() != null)) { - this.mOutputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(aRecipe.mFluidOutputs[2], true), 138, 5)); - } - if ((aRecipe.mFluidOutputs.length > 3) && (aRecipe.mFluidOutputs[3] != null) && (aRecipe.mFluidOutputs[3].getFluid() != null)) { - this.mOutputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(aRecipe.mFluidOutputs[3], true), 102, 23)); - } - if ((aRecipe.mFluidOutputs.length > 4) && (aRecipe.mFluidOutputs[4] != null) && (aRecipe.mFluidOutputs[4].getFluid() != null)) { - this.mOutputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(aRecipe.mFluidOutputs[4], true), 120, 23)); - } - if ((aRecipe.mFluidOutputs.length > 5) && (aRecipe.mFluidOutputs[5] != null) && (aRecipe.mFluidOutputs[5].getFluid() != null)) { - this.mOutputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(aRecipe.mFluidOutputs[5], true), 138, 23)); - } - if ((aRecipe.mFluidOutputs.length > 6) && (aRecipe.mFluidOutputs[6] != null) && (aRecipe.mFluidOutputs[6].getFluid() != null)) { - this.mOutputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(aRecipe.mFluidOutputs[6], true), 102, 41)); - } - if ((aRecipe.mFluidOutputs.length > 7) && (aRecipe.mFluidOutputs[7] != null) && (aRecipe.mFluidOutputs[7].getFluid() != null)) { - this.mOutputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(aRecipe.mFluidOutputs[7], true), 120, 41)); - } - if ((aRecipe.mFluidOutputs.length > 8) && (aRecipe.mFluidOutputs[8] != null) && (aRecipe.mFluidOutputs[8].getFluid() != null)) { - this.mOutputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(aRecipe.mFluidOutputs[8], true), 138, 41)); - } - } else if ((aRecipe.mFluidOutputs.length > 0) && (aRecipe.mFluidOutputs[0] != null) && (aRecipe.mFluidOutputs[0].getFluid() != null)) { - this.mOutputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(aRecipe.mFluidOutputs[0], true), 102, 5)); - } - } - - @Override - public List<PositionedStack> getIngredients() { - return this.getCycledIngredients(GT_NEI_RFPP.this.cycleticks / 10, this.mInputs); - } - - @Override - public PositionedStack getResult() { - return null; - } - - @Override - public List<PositionedStack> getOtherStacks() { - return this.mOutputs; - } - } -} diff --git a/src/Java/gtPlusPlus/nei/GT_NEI_VacFurnace.java b/src/Java/gtPlusPlus/nei/GT_NEI_VacFurnace.java deleted file mode 100644 index e17bc6b15e..0000000000 --- a/src/Java/gtPlusPlus/nei/GT_NEI_VacFurnace.java +++ /dev/null @@ -1,482 +0,0 @@ -package gtPlusPlus.nei; - -import java.awt.Point; -import java.awt.Rectangle; -import java.util.*; - -import org.lwjgl.opengl.GL11; - -import codechicken.lib.gui.GuiDraw; -import codechicken.nei.PositionedStack; -import codechicken.nei.guihook.GuiContainerManager; -import codechicken.nei.guihook.IContainerInputHandler; -import codechicken.nei.guihook.IContainerTooltipHandler; -import codechicken.nei.recipe.*; -import cpw.mods.fml.common.event.FMLInterModComms; -import gregtech.api.enums.GT_Values; -import gregtech.api.enums.OrePrefixes; -import gregtech.api.gui.GT_GUIContainer_BasicMachine; -import gregtech.api.objects.ItemData; -import gregtech.api.util.*; -import gregtech.api.util.GT_Recipe.GT_Recipe_Map; -import gregtech.api.util.GTPP_Recipe.GTPP_Recipe_Map; -import gtPlusPlus.core.util.minecraft.ItemUtils; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidContainerRegistry; -import net.minecraftforge.fluids.FluidStack; - -public class GT_NEI_VacFurnace -extends TemplateRecipeHandler { - public static final int sOffsetX = 5; - public static final int sOffsetY = 11; - - static { - GuiContainerManager.addInputHandler(new GT_RectHandler()); - GuiContainerManager.addTooltipHandler(new GT_RectHandler()); - } - - protected GT_Recipe_Map mRecipeMap; - - public GT_NEI_VacFurnace() { - this.mRecipeMap = GTPP_Recipe_Map.sVacuumFurnaceRecipes; - this.transferRects.add(new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(65, 13, 36, 18), this.getRecipeMapName(), new Object[0])); - if (!NEI_GT_Config.sIsAdded) { - FMLInterModComms.sendRuntimeMessage(GT_Values.GT, "NEIPlugins", "register-crafting-handler", "gregtechplusplus@" + this.getRecipeName() + "@" + this.getRecipeMapName()); - GuiCraftingRecipe.craftinghandlers.add(this); - GuiUsageRecipe.usagehandlers.add(this); - } - } - - public List<GTPP_Recipe> getSortedRecipes() { - List<GTPP_Recipe> result = new ArrayList(this.mRecipeMap.mRecipeList); - Collections.sort(result); - return result; - } - - public static void drawText(final int aX, final int aY, final String aString, final int aColor) { - Minecraft.getMinecraft().fontRenderer.drawString(aString, aX, aY, aColor); - } - - @Override - public TemplateRecipeHandler newInstance() { - return new GT_NEI_VacFurnace(); - } - - @Override - public void loadCraftingRecipes(final String outputId, final Object... results) { - if (outputId.equals(getRecipeMapName())) { - for (GTPP_Recipe tRecipe : getSortedRecipes()) { - if (!tRecipe.mHidden) { - this.arecipes.add(new CachedDefaultRecipe(tRecipe)); - } - } - } else { - super.loadCraftingRecipes(outputId, results); - } - } - - @Override - public void loadCraftingRecipes(final ItemStack aResult) { - ItemData tPrefixMaterial = GT_OreDictUnificator.getAssociation(aResult); - - ArrayList<ItemStack> tResults = new ArrayList<ItemStack>(); - tResults.add(aResult); - tResults.add(GT_OreDictUnificator.get(true, aResult)); - if ((tPrefixMaterial != null) && (!tPrefixMaterial.mBlackListed) && (!tPrefixMaterial.mPrefix.mFamiliarPrefixes.isEmpty())) { - for (OrePrefixes tPrefix : tPrefixMaterial.mPrefix.mFamiliarPrefixes) { - tResults.add(GT_OreDictUnificator.get(tPrefix, tPrefixMaterial.mMaterial.mMaterial, 1L)); - } - } - FluidStack tFluid = GT_Utility.getFluidForFilledItem(aResult, true); - if (tFluid != null) { - tResults.add(GT_Utility.getFluidDisplayStack(tFluid, false)); - for (FluidContainerRegistry.FluidContainerData tData : FluidContainerRegistry.getRegisteredFluidContainerData()) { - if (tData.fluid.isFluidEqual(tFluid)) { - tResults.add(GT_Utility.copy(new Object[]{tData.filledContainer})); - } - } - } - for (GTPP_Recipe tRecipe : getSortedRecipes()) { - if (!tRecipe.mHidden) { - CachedDefaultRecipe tNEIRecipe = new CachedDefaultRecipe(tRecipe); - for (ItemStack tStack : tResults) { - if (tNEIRecipe.contains(tNEIRecipe.mOutputs, tStack)) { - this.arecipes.add(tNEIRecipe); - break; - } - } - } - } - //CachedDefaultRecipe tNEIRecipe; - } - - public void loadUsageRecipes(ItemStack aInput) { - ItemData tPrefixMaterial = GT_OreDictUnificator.getAssociation(aInput); - - ArrayList<ItemStack> tInputs = new ArrayList<ItemStack>(); - tInputs.add(aInput); - tInputs.add(GT_OreDictUnificator.get(false, aInput)); - if ((tPrefixMaterial != null) && (!tPrefixMaterial.mPrefix.mFamiliarPrefixes.isEmpty())) { - for (OrePrefixes tPrefix : tPrefixMaterial.mPrefix.mFamiliarPrefixes) { - tInputs.add(GT_OreDictUnificator.get(tPrefix, tPrefixMaterial.mMaterial.mMaterial, 1L)); - } - } - FluidStack tFluid = GT_Utility.getFluidForFilledItem(aInput, true); - if (tFluid != null) { - tInputs.add(GT_Utility.getFluidDisplayStack(tFluid, false)); - for (FluidContainerRegistry.FluidContainerData tData : FluidContainerRegistry.getRegisteredFluidContainerData()) { - if (tData.fluid.isFluidEqual(tFluid)) { - tInputs.add(GT_Utility.copy(new Object[]{tData.filledContainer})); - } - } - } - for (GTPP_Recipe tRecipe : getSortedRecipes()) { - if (!tRecipe.mHidden) { - CachedDefaultRecipe tNEIRecipe = new CachedDefaultRecipe(tRecipe); - for (ItemStack tStack : tInputs) { - if (tNEIRecipe.contains(tNEIRecipe.mInputs, tStack)) { - this.arecipes.add(tNEIRecipe); - break; - } - } - } - } - //CachedDefaultRecipe tNEIRecipe; - } - - public String getRecipeMapName() { - return this.mRecipeMap.mNEIName; - } - - @Override - public String getOverlayIdentifier() { - return this.mRecipeMap.mNEIName; - } - - @Override - public void drawBackground(final int recipe) { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - GuiDraw.changeTexture(this.getGuiTexture()); - GuiDraw.drawTexturedModalRect(-4, -8, 1, 3, 174, 78); - } - - @Override - public int recipiesPerPage() { - return 1; - } - - @Override - public String getRecipeName() { - return GT_LanguageManager.getTranslation(this.mRecipeMap.mUnlocalizedName); - } - - @Override - public String getGuiTexture() { - return GTPP_Recipe.GTPP_Recipe_Map.sFissionFuelProcessing.mNEIGUIPath; - } - - @Override - public List<String> handleItemTooltip(final GuiRecipe gui, final ItemStack aStack, final List<String> currenttip, final int aRecipeIndex) { - final TemplateRecipeHandler.CachedRecipe tObject = this.arecipes.get(aRecipeIndex); - if ((tObject instanceof CachedDefaultRecipe)) { - final CachedDefaultRecipe tRecipe = (CachedDefaultRecipe) tObject; - for (final PositionedStack tStack : tRecipe.mOutputs) { - if (aStack == tStack.item) { - if ((!(tStack instanceof FixedPositionedStack)) || (((FixedPositionedStack) tStack).mChance <= 0) || (((FixedPositionedStack) tStack).mChance == 10000)) { - break; - } - currenttip.add("Chance: " + (((FixedPositionedStack) tStack).mChance / 100) + "." + ((((FixedPositionedStack) tStack).mChance % 100) < 10 ? "0" + (((FixedPositionedStack) tStack).mChance % 100) : Integer.valueOf(((FixedPositionedStack) tStack).mChance % 100)) + "%"); - break; - } - } - for (final PositionedStack tStack : tRecipe.mInputs) { - if (GT_Utility.areStacksEqual(aStack, tStack.item)) { - if ((gregtech.api.enums.ItemList.Display_Fluid.isStackEqual(tStack.item, true, true)) || - (tStack.item.stackSize != 0)) { - break; - } - if (ItemUtils.isControlCircuit(aStack)) { - currenttip.add("Does not get consumed in the process"); - } - break; - } - } - } - return currenttip; - } - - @Override - public void drawExtras(final int aRecipeIndex) { - final long tEUt = ((CachedDefaultRecipe) this.arecipes.get(aRecipeIndex)).mRecipe.mEUt; - final int tDuration = ((CachedDefaultRecipe) this.arecipes.get(aRecipeIndex)).mRecipe.mDuration; - if (tEUt != 0) { - drawText(10, 88, "Total: " + (long) (tDuration * tEUt) + " EU", -16777216); - drawText(10, 98, "Usage: " + tEUt + " EU/t", -16777216); - /*if (this.mRecipeMap.mShowVoltageAmperageInNEI) { - drawText(10, 83, "Voltage: " + (tEUt / this.mRecipeMap.mAmperage) + " EU/t", -16777216); - drawText(10, 93, "Amperage: " + this.mRecipeMap.mAmperage, -16777216); - } else { - drawText(10, 93, "Voltage: unspecified", -16777216); - drawText(10, 103, "Amperage: unspecified", -16777216); - }*/ - } - if (tDuration > 0) { - drawText(10, 108, "Time: " + (tDuration < 20 ? "< 1" : Integer.valueOf(tDuration / 20)) + " secs", -16777216); - } - if ((GT_Utility.isStringValid(this.mRecipeMap.mNEISpecialValuePre)) || (GT_Utility.isStringValid(this.mRecipeMap.mNEISpecialValuePost))) { - drawText(10, 118, this.mRecipeMap.mNEISpecialValuePre + (((CachedDefaultRecipe) this.arecipes.get(aRecipeIndex)).mRecipe.mSpecialValue * this.mRecipeMap.mNEISpecialValueMultiplier) + this.mRecipeMap.mNEISpecialValuePost, -16777216); - } - } - - public static class GT_RectHandler - implements IContainerInputHandler, IContainerTooltipHandler { - @Override - public boolean mouseClicked(final GuiContainer gui, final int mousex, final int mousey, final int button) { - if (this.canHandle(gui)) { - if (button == 0) { - return this.transferRect(gui, false); - } - if (button == 1) { - return this.transferRect(gui, true); - } - } - return false; - } - - @Override - public boolean lastKeyTyped(final GuiContainer gui, final char keyChar, final int keyCode) { - return false; - } - - public boolean canHandle(final GuiContainer gui) { - return (((gui instanceof GT_GUIContainer_BasicMachine)) && (GT_Utility.isStringValid(((GT_GUIContainer_BasicMachine) gui).mNEI)) /*|| ((gui instanceof GT_GUIContainer_FusionReactor)) && (GT_Utility.isStringValid(((GT_GUIContainer_FusionReactor) gui).mNEI))*/); - } - - @Override - public List<String> handleTooltip(final GuiContainer gui, final int mousex, final int mousey, final List<String> currenttip) { - if ((this.canHandle(gui)) && (currenttip.isEmpty())) { - if ((gui instanceof GT_GUIContainer_BasicMachine) && new Rectangle(65, 13, 36, 18).contains(new Point(GuiDraw.getMousePosition().x - ((GT_GUIContainer_BasicMachine) gui).getLeft() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[0], GuiDraw.getMousePosition().y - ((GT_GUIContainer_BasicMachine) gui).getTop() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[1]))) { - currenttip.add("Recipes"); - } /*else if (gui instanceof GT_GUIContainer_FusionReactor && new Rectangle(145, 0, 24, 24).contains(new Point(GuiDraw.getMousePosition().x - ((GT_GUIContainer_FusionReactor) gui).getLeft() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[0], GuiDraw.getMousePosition().y - ((GT_GUIContainer_FusionReactor) gui).getTop() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[1]))) { - currenttip.add("Recipes"); - }*/ - - } - return currenttip; - } - - private boolean transferRect(final GuiContainer gui, final boolean usage) { - if (gui instanceof GT_GUIContainer_BasicMachine) { - return (this.canHandle(gui)) && (new Rectangle(65, 13, 36, 18).contains(new Point(GuiDraw.getMousePosition().x - ((GT_GUIContainer_BasicMachine) gui).getLeft() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[0], GuiDraw.getMousePosition().y - ((GT_GUIContainer_BasicMachine) gui).getTop() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[1]))) && (usage ? GuiUsageRecipe.openRecipeGui(((GT_GUIContainer_BasicMachine) gui).mNEI, new Object[0]) : GuiCraftingRecipe.openRecipeGui(((GT_GUIContainer_BasicMachine) gui).mNEI, new Object[0])); - } /*else if (gui instanceof GT_GUIContainer_FusionReactor) { - return (canHandle(gui)) && (new Rectangle(145, 0, 24, 24).contains(new Point(GuiDraw.getMousePosition().x - ((GT_GUIContainer_FusionReactor) gui).getLeft() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[0], GuiDraw.getMousePosition().y - ((GT_GUIContainer_FusionReactor) gui).getTop() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[1]))) && (usage ? GuiUsageRecipe.openRecipeGui(((GT_GUIContainer_FusionReactor) gui).mNEI, new Object[0]) : GuiCraftingRecipe.openRecipeGui(((GT_GUIContainer_FusionReactor) gui).mNEI, new Object[0])); - }*/ - return false; - } - - @Override - public List<String> handleItemDisplayName(final GuiContainer gui, final ItemStack itemstack, final List<String> currenttip) { - return currenttip; - } - - @Override - public List<String> handleItemTooltip(final GuiContainer gui, final ItemStack itemstack, final int mousex, final int mousey, final List<String> currenttip) { - return currenttip; - } - - @Override - public boolean keyTyped(final GuiContainer gui, final char keyChar, final int keyCode) { - return false; - } - - @Override - public void onKeyTyped(final GuiContainer gui, final char keyChar, final int keyID) { - } - - @Override - public void onMouseClicked(final GuiContainer gui, final int mousex, final int mousey, final int button) { - } - - @Override - public void onMouseUp(final GuiContainer gui, final int mousex, final int mousey, final int button) { - } - - @Override - public boolean mouseScrolled(final GuiContainer gui, final int mousex, final int mousey, final int scrolled) { - return false; - } - - @Override - public void onMouseScrolled(final GuiContainer gui, final int mousex, final int mousey, final int scrolled) { - } - - @Override - public void onMouseDragged(final GuiContainer gui, final int mousex, final int mousey, final int button, final long heldTime) { - } - } - - public class FixedPositionedStack - extends PositionedStack { - public final int mChance; - public boolean permutated = false; - - public FixedPositionedStack(final Object object, final int x, final int y) { - this(object, x, y, 0); - } - - public FixedPositionedStack(final Object object, final int x, final int y, final int aChance) { - super(object, x, y, true); - this.mChance = aChance; - } - - @Override - public void generatePermutations() { - if (this.permutated) { - return; - } - final ArrayList<ItemStack> tDisplayStacks = new ArrayList<ItemStack>(); - for (final ItemStack tStack : this.items) { - if (GT_Utility.isStackValid(tStack)) { - if (tStack.getItemDamage() == 32767) { - final List<ItemStack> permutations = codechicken.nei.ItemList.itemMap.get(tStack.getItem()); - if (!permutations.isEmpty()) { - ItemStack stack; - for (final Iterator<ItemStack> i$ = permutations.iterator(); i$.hasNext(); tDisplayStacks.add(GT_Utility.copyAmount(tStack.stackSize, new Object[]{stack}))) { - stack = i$.next(); - } - } else { - final ItemStack base = new ItemStack(tStack.getItem(), tStack.stackSize); - base.stackTagCompound = tStack.stackTagCompound; - tDisplayStacks.add(base); - } - } else { - tDisplayStacks.add(GT_Utility.copy(new Object[]{tStack})); - } - } - } - this.items = (tDisplayStacks.toArray(new ItemStack[0])); - if (this.items.length == 0) { - this.items = new ItemStack[]{new ItemStack(Blocks.fire)}; - } - this.permutated = true; - this.setPermutationToRender(0); - } - } - - public class CachedDefaultRecipe - extends TemplateRecipeHandler.CachedRecipe { - public final GT_Recipe mRecipe; - public final List<PositionedStack> mOutputs = new ArrayList<PositionedStack>(); - public final List<PositionedStack> mInputs = new ArrayList<PositionedStack>(); - - public CachedDefaultRecipe(final GT_Recipe aRecipe) { - super(); - this.mRecipe = aRecipe; - - int tStartIndex = 0; - - - if (aRecipe.getRepresentativeInput(tStartIndex) != null) { - this.mInputs.add(new FixedPositionedStack(aRecipe.getRepresentativeInput(tStartIndex), 12, 5)); - } - tStartIndex++; - if (aRecipe.getRepresentativeInput(tStartIndex) != null) { - this.mInputs.add(new FixedPositionedStack(aRecipe.getRepresentativeInput(tStartIndex), 30, 5)); - } - tStartIndex++; - if (aRecipe.getRepresentativeInput(tStartIndex) != null) { - this.mInputs.add(new FixedPositionedStack(aRecipe.getRepresentativeInput(tStartIndex), 48, 5)); - } - tStartIndex++; - if (aRecipe.getRepresentativeInput(tStartIndex) != null) { - this.mInputs.add(new FixedPositionedStack(aRecipe.getRepresentativeInput(tStartIndex), 12, 23)); - } - tStartIndex++; - if (aRecipe.getRepresentativeInput(tStartIndex) != null) { - this.mInputs.add(new FixedPositionedStack(aRecipe.getRepresentativeInput(tStartIndex), 30, 23)); - } - tStartIndex++; - if (aRecipe.getRepresentativeInput(tStartIndex) != null) { - this.mInputs.add(new FixedPositionedStack(aRecipe.getRepresentativeInput(tStartIndex), 48, 23)); - } - tStartIndex++; - - if (aRecipe.mSpecialItems != null) { - this.mInputs.add(new FixedPositionedStack(aRecipe.mSpecialItems, 120, 52)); - } - tStartIndex = 0; - - //9 Output Slots - if (aRecipe.getOutput(tStartIndex) != null) { - this.mOutputs.add(new FixedPositionedStack(aRecipe.getOutput(tStartIndex), 101, 4, aRecipe.getOutputChance(tStartIndex))); - } - tStartIndex++; - if (aRecipe.getOutput(tStartIndex) != null) { - this.mOutputs.add(new FixedPositionedStack(aRecipe.getOutput(tStartIndex), 119, 4, aRecipe.getOutputChance(tStartIndex))); - } - tStartIndex++; - if (aRecipe.getOutput(tStartIndex) != null) { - this.mOutputs.add(new FixedPositionedStack(aRecipe.getOutput(tStartIndex), 137, 4, aRecipe.getOutputChance(tStartIndex))); - } - tStartIndex++; - if (aRecipe.getOutput(tStartIndex) != null) { - this.mOutputs.add(new FixedPositionedStack(aRecipe.getOutput(tStartIndex), 101, 22, aRecipe.getOutputChance(tStartIndex))); - } - tStartIndex++; - if (aRecipe.getOutput(tStartIndex) != null) { - this.mOutputs.add(new FixedPositionedStack(aRecipe.getOutput(tStartIndex), 119, 22, aRecipe.getOutputChance(tStartIndex))); - } - tStartIndex++; - if (aRecipe.getOutput(tStartIndex) != null) { - this.mOutputs.add(new FixedPositionedStack(aRecipe.getOutput(tStartIndex), 137, 22, aRecipe.getOutputChance(tStartIndex))); - } - tStartIndex++; - if (aRecipe.getOutput(tStartIndex) != null) { - this.mOutputs.add(new FixedPositionedStack(aRecipe.getOutput(tStartIndex), 101, 40, aRecipe.getOutputChance(tStartIndex))); - } - tStartIndex++; - if (aRecipe.getOutput(tStartIndex) != null) { - this.mOutputs.add(new FixedPositionedStack(aRecipe.getOutput(tStartIndex), 119, 40, aRecipe.getOutputChance(tStartIndex))); - } - tStartIndex++; - if (aRecipe.getOutput(tStartIndex) != null) { - this.mOutputs.add(new FixedPositionedStack(aRecipe.getOutput(tStartIndex), 137, 40, aRecipe.getOutputChance(tStartIndex))); - } - tStartIndex++; - - if ((aRecipe.mFluidInputs.length > 0) && (aRecipe.mFluidInputs[0] != null) && (aRecipe.mFluidInputs[0].getFluid() != null)) { - this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(aRecipe.mFluidInputs[0], true), 12, 60)); - if ((aRecipe.mFluidInputs.length > 1) && (aRecipe.mFluidInputs[1] != null) && (aRecipe.mFluidInputs[1].getFluid() != null)) { - this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(aRecipe.mFluidInputs[1], true), 30, 60)); - } - } - - if (aRecipe.mFluidOutputs.length > 0) { - if ((aRecipe.mFluidOutputs[0] != null) && (aRecipe.mFluidOutputs[0].getFluid() != null)) { - this.mOutputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(aRecipe.mFluidOutputs[0], true), 101, 60)); - } - if ((aRecipe.mFluidOutputs.length > 1) && (aRecipe.mFluidOutputs[1] != null) && (aRecipe.mFluidOutputs[1].getFluid() != null)) { - this.mOutputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(aRecipe.mFluidOutputs[1], true), 119, 60)); - } - } - } - - @Override - public List<PositionedStack> getIngredients() { - return this.getCycledIngredients(GT_NEI_VacFurnace.this.cycleticks / 10, this.mInputs); - } - - @Override - public PositionedStack getResult() { - return null; - } - - @Override - public List<PositionedStack> getOtherStacks() { - return this.mOutputs; - } - } -} diff --git a/src/Java/gtPlusPlus/nei/GT_NEI_multiCentriElectroFreezer.java b/src/Java/gtPlusPlus/nei/GT_NEI_multiCentriElectroFreezer.java deleted file mode 100644 index a8c77094cd..0000000000 --- a/src/Java/gtPlusPlus/nei/GT_NEI_multiCentriElectroFreezer.java +++ /dev/null @@ -1,554 +0,0 @@ -package gtPlusPlus.nei; - -import java.awt.Point; -import java.awt.Rectangle; -import java.util.*; - -import org.lwjgl.opengl.GL11; - -import codechicken.lib.gui.GuiDraw; -import codechicken.nei.PositionedStack; -import codechicken.nei.guihook.GuiContainerManager; -import codechicken.nei.guihook.IContainerInputHandler; -import codechicken.nei.guihook.IContainerTooltipHandler; -import codechicken.nei.recipe.*; -import cpw.mods.fml.common.event.FMLInterModComms; -import gregtech.api.enums.GT_Values; -import gregtech.api.enums.OrePrefixes; -import gregtech.api.gui.GT_GUIContainer_BasicMachine; -import gregtech.api.objects.ItemData; -import gregtech.api.util.*; -import gregtech.api.util.GTPP_Recipe.GTPP_Recipe_Map_Internal; -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.api.objects.data.Pair; -import gtPlusPlus.core.util.minecraft.ItemUtils; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidContainerRegistry; -import net.minecraftforge.fluids.FluidStack; - -public class GT_NEI_multiCentriElectroFreezer -extends TemplateRecipeHandler { - public static final int sOffsetX = 5; - public static final int sOffsetY = 11; - - static { - GuiContainerManager.addInputHandler(new GT_RectHandler()); - GuiContainerManager.addTooltipHandler(new GT_RectHandler()); - } - - protected GTPP_Recipe_Map_Internal mRecipeMap; - - public GT_NEI_multiCentriElectroFreezer(GTPP_Recipe_Map_Internal aMap) { - this.mRecipeMap = aMap; - this.transferRects.add(new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(65, 13, 36, 18), this.getRecipeMapName(), new Object[0])); - if (!NEI_GT_Config.sIsAdded) { - FMLInterModComms.sendRuntimeMessage(GT_Values.GT, "NEIPlugins", "register-crafting-handler", "gregtechplusplus@" + this.getRecipeName() + "@" + this.getRecipeMapName()); - GuiCraftingRecipe.craftinghandlers.add(this); - GuiUsageRecipe.usagehandlers.add(this); - } - } - - public static void logRecipeError(GT_Recipe aRecipe) { - if (aRecipe == null) { - Logger.INFO("Tried to handle null recipe. :("); - } - else { - ItemStack[] aInputs = aRecipe.mInputs; - ItemStack[] aOutputs = aRecipe.mOutputs; - FluidStack[] aFluidInputs = aRecipe.mFluidInputs; - FluidStack[] aFluidOutputs = aRecipe.mFluidOutputs; - int aEU = aRecipe.mEUt; - int aTime = aRecipe.mDuration; - int aSpecialValue = aRecipe.mSpecialValue; - String aInputitems = ItemUtils.getArrayStackNames(aInputs); - String aOutputitems = ItemUtils.getArrayStackNames(aOutputs); - String aInputFluids = ItemUtils.getArrayStackNames(aFluidInputs); - String aOutputFluids = ItemUtils.getArrayStackNames(aFluidOutputs); - Logger.INFO("Logging Broken Recipe Details:"); - Logger.INFO("Input Items - "+aInputitems); - Logger.INFO("Output Items - "+aOutputitems); - Logger.INFO("Input Fluids - "+aInputFluids); - Logger.INFO("Output Fluids - "+aOutputFluids); - Logger.INFO("EU/t - "+aEU); - Logger.INFO("Duration - "+aTime); - Logger.INFO("Special Value - "+aSpecialValue); - } - } - - public List<GTPP_Recipe> getSortedRecipes() { - List<GTPP_Recipe> result = new ArrayList(this.mRecipeMap.mRecipeList); - Collections.sort(result); - return result; - } - - public static void drawText(final int aX, final int aY, final String aString, final int aColor) { - Minecraft.getMinecraft().fontRenderer.drawString(aString, aX, aY, aColor); - } - - @Override - public TemplateRecipeHandler newInstance() { - return new GT_NEI_multiCentriElectroFreezer(mRecipeMap); - } - - @Override - public void loadCraftingRecipes(final String outputId, final Object... results) { - if (outputId.equals(getRecipeMapName())) { - for (GTPP_Recipe tRecipe : getSortedRecipes()) { - if (!tRecipe.mHidden) { - CachedDefaultRecipe tNEIRecipe = getCachedRecipe(tRecipe); - if (tNEIRecipe == null) { - continue; - } - this.arecipes.add(tNEIRecipe); - } - } - } else { - super.loadCraftingRecipes(outputId, results); - } - } - - @Override - public void loadCraftingRecipes(final ItemStack aResult) { - ItemData tPrefixMaterial = GT_OreDictUnificator.getAssociation(aResult); - - ArrayList<ItemStack> tResults = new ArrayList<ItemStack>(); - tResults.add(aResult); - tResults.add(GT_OreDictUnificator.get(true, aResult)); - if ((tPrefixMaterial != null) && (!tPrefixMaterial.mBlackListed) && (!tPrefixMaterial.mPrefix.mFamiliarPrefixes.isEmpty())) { - for (OrePrefixes tPrefix : tPrefixMaterial.mPrefix.mFamiliarPrefixes) { - tResults.add(GT_OreDictUnificator.get(tPrefix, tPrefixMaterial.mMaterial.mMaterial, 1L)); - } - } - FluidStack tFluid = GT_Utility.getFluidForFilledItem(aResult, true); - if (tFluid != null) { - tResults.add(GT_Utility.getFluidDisplayStack(tFluid, false)); - for (FluidContainerRegistry.FluidContainerData tData : FluidContainerRegistry.getRegisteredFluidContainerData()) { - if (tData.fluid.isFluidEqual(tFluid)) { - tResults.add(GT_Utility.copy(new Object[]{tData.filledContainer})); - } - } - } - for (GTPP_Recipe tRecipe : getSortedRecipes()) { - if (!tRecipe.mHidden) { - CachedDefaultRecipe tNEIRecipe = getCachedRecipe(tRecipe); - if (tNEIRecipe == null) { - continue; - } - for (ItemStack tStack : tResults) { - if (tNEIRecipe.contains(tNEIRecipe.mOutputs, tStack)) { - this.arecipes.add(tNEIRecipe); - break; - } - } - } - } - //CachedDefaultRecipe tNEIRecipe; - } - - public void loadUsageRecipes(ItemStack aInput) { - ItemData tPrefixMaterial = GT_OreDictUnificator.getAssociation(aInput); - - ArrayList<ItemStack> tInputs = new ArrayList<ItemStack>(); - tInputs.add(aInput); - tInputs.add(GT_OreDictUnificator.get(false, aInput)); - if ((tPrefixMaterial != null) && (!tPrefixMaterial.mPrefix.mFamiliarPrefixes.isEmpty())) { - for (OrePrefixes tPrefix : tPrefixMaterial.mPrefix.mFamiliarPrefixes) { - tInputs.add(GT_OreDictUnificator.get(tPrefix, tPrefixMaterial.mMaterial.mMaterial, 1L)); - } - } - FluidStack tFluid = GT_Utility.getFluidForFilledItem(aInput, true); - if (tFluid != null) { - tInputs.add(GT_Utility.getFluidDisplayStack(tFluid, false)); - for (FluidContainerRegistry.FluidContainerData tData : FluidContainerRegistry.getRegisteredFluidContainerData()) { - if (tData.fluid.isFluidEqual(tFluid)) { - tInputs.add(GT_Utility.copy(new Object[]{tData.filledContainer})); - } - } - } - for (GTPP_Recipe tRecipe : getSortedRecipes()) { - if (!tRecipe.mHidden) { - CachedDefaultRecipe tNEIRecipe = getCachedRecipe(tRecipe); - if (tNEIRecipe == null) { - continue; - } - for (ItemStack tStack : tInputs) { - if (tNEIRecipe.contains(tNEIRecipe.mInputs, tStack)) { - this.arecipes.add(tNEIRecipe); - break; - } - } - } - } - //CachedDefaultRecipe tNEIRecipe; - } - - public String getRecipeMapName() { - return this.mRecipeMap.mNEIName; - } - - @Override - public String getOverlayIdentifier() { - return this.mRecipeMap.mNEIName; - } - - @Override - public void drawBackground(final int recipe) { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - GuiDraw.changeTexture(this.getGuiTexture()); - GuiDraw.drawTexturedModalRect(-4, -8, 1, 3, 174, 78); - } - - @Override - public int recipiesPerPage() { - return 1; - } - - @Override - public String getRecipeName() { - return GT_LanguageManager.getTranslation(this.mRecipeMap.mUnlocalizedName); - } - - @Override - public String getGuiTexture() { - return this.mRecipeMap.mNEIGUIPath; - } - - @Override - public List<String> handleItemTooltip(final GuiRecipe gui, final ItemStack aStack, final List<String> currenttip, final int aRecipeIndex) { - final TemplateRecipeHandler.CachedRecipe tObject = this.arecipes.get(aRecipeIndex); - if ((tObject instanceof CachedDefaultRecipe)) { - final CachedDefaultRecipe tRecipe = (CachedDefaultRecipe) tObject; - for (final PositionedStack tStack : tRecipe.mOutputs) { - if (aStack == tStack.item) { - if ((!(tStack instanceof FixedPositionedStack)) || (((FixedPositionedStack) tStack).mChance <= 0) || (((FixedPositionedStack) tStack).mChance == 10000)) { - break; - } - currenttip.add("Chance: " + (((FixedPositionedStack) tStack).mChance / 100) + "." + ((((FixedPositionedStack) tStack).mChance % 100) < 10 ? "0" + (((FixedPositionedStack) tStack).mChance % 100) : Integer.valueOf(((FixedPositionedStack) tStack).mChance % 100)) + "%"); - break; - } - } - for (final PositionedStack tStack : tRecipe.mInputs) { - if (aStack == tStack.item) { - if ((gregtech.api.enums.ItemList.Display_Fluid.isStackEqual(tStack.item, true, true)) || - (tStack.item.stackSize != 0)) { - break; - } - currenttip.add("Does not get consumed in the process"); - break; - } - } - } - return currenttip; - } - - @Override - public void drawExtras(final int aRecipeIndex) { - final int tEUt = ((CachedDefaultRecipe) this.arecipes.get(aRecipeIndex)).mRecipe.mEUt; - final int tDuration = ((CachedDefaultRecipe) this.arecipes.get(aRecipeIndex)).mRecipe.mDuration; - if (tEUt != 0) { - drawText(10, 83, "Total: " + (tDuration * tEUt) + " EU", -16777216); - drawText(10, 93, "Usage: " + tEUt + " EU/t", -16777216); - if (this.mRecipeMap.mShowVoltageAmperageInNEI) { - drawText(10, 103, "Voltage: " + (tEUt / this.mRecipeMap.mAmperage) + " EU", -16777216); - drawText(10, 113, "Amperage: " + this.mRecipeMap.mAmperage, -16777216); - } else { - drawText(10, 103, "Voltage: unspecified", -16777216); - drawText(10, 113, "Amperage: unspecified", -16777216); - } - } - if (tDuration > 0) { - drawText(10, 123, "Time: " + (tDuration < 20 ? "< 1" : Integer.valueOf(tDuration / 20)) + " secs", -16777216); - } - if ((GT_Utility.isStringValid(this.mRecipeMap.mNEISpecialValuePre)) || (GT_Utility.isStringValid(this.mRecipeMap.mNEISpecialValuePost))) { - drawText(10, 133, this.mRecipeMap.mNEISpecialValuePre + (((CachedDefaultRecipe) this.arecipes.get(aRecipeIndex)).mRecipe.mSpecialValue * this.mRecipeMap.mNEISpecialValueMultiplier) + this.mRecipeMap.mNEISpecialValuePost, -16777216); - } - } - - public static class GT_RectHandler - implements IContainerInputHandler, IContainerTooltipHandler { - @Override - public boolean mouseClicked(final GuiContainer gui, final int mousex, final int mousey, final int button) { - if (this.canHandle(gui)) { - if (button == 0) { - return this.transferRect(gui, false); - } - if (button == 1) { - return this.transferRect(gui, true); - } - } - return false; - } - - @Override - public boolean lastKeyTyped(final GuiContainer gui, final char keyChar, final int keyCode) { - return false; - } - - public boolean canHandle(final GuiContainer gui) { - return (((gui instanceof GT_GUIContainer_BasicMachine)) && (GT_Utility.isStringValid(((GT_GUIContainer_BasicMachine) gui).mNEI)) /*|| ((gui instanceof GT_GUIContainer_FusionReactor)) && (GT_Utility.isStringValid(((GT_GUIContainer_FusionReactor) gui).mNEI))*/); - } - - @Override - public List<String> handleTooltip(final GuiContainer gui, final int mousex, final int mousey, final List<String> currenttip) { - if ((this.canHandle(gui)) && (currenttip.isEmpty())) { - if ((gui instanceof GT_GUIContainer_BasicMachine) && new Rectangle(65, 13, 36, 18).contains(new Point(GuiDraw.getMousePosition().x - ((GT_GUIContainer_BasicMachine) gui).getLeft() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[0], GuiDraw.getMousePosition().y - ((GT_GUIContainer_BasicMachine) gui).getTop() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[1]))) { - currenttip.add("Recipes"); - } /*else if (gui instanceof GT_GUIContainer_FusionReactor && new Rectangle(145, 0, 24, 24).contains(new Point(GuiDraw.getMousePosition().x - ((GT_GUIContainer_FusionReactor) gui).getLeft() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[0], GuiDraw.getMousePosition().y - ((GT_GUIContainer_FusionReactor) gui).getTop() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[1]))) { - currenttip.add("Recipes"); - }*/ - - } - return currenttip; - } - - private boolean transferRect(final GuiContainer gui, final boolean usage) { - if (gui instanceof GT_GUIContainer_BasicMachine) { - return (this.canHandle(gui)) && (new Rectangle(65, 13, 36, 18).contains(new Point(GuiDraw.getMousePosition().x - ((GT_GUIContainer_BasicMachine) gui).getLeft() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[0], GuiDraw.getMousePosition().y - ((GT_GUIContainer_BasicMachine) gui).getTop() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[1]))) && (usage ? GuiUsageRecipe.openRecipeGui(((GT_GUIContainer_BasicMachine) gui).mNEI, new Object[0]) : GuiCraftingRecipe.openRecipeGui(((GT_GUIContainer_BasicMachine) gui).mNEI, new Object[0])); - } /*else if (gui instanceof GT_GUIContainer_FusionReactor) { - return (canHandle(gui)) && (new Rectangle(145, 0, 24, 24).contains(new Point(GuiDraw.getMousePosition().x - ((GT_GUIContainer_FusionReactor) gui).getLeft() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[0], GuiDraw.getMousePosition().y - ((GT_GUIContainer_FusionReactor) gui).getTop() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[1]))) && (usage ? GuiUsageRecipe.openRecipeGui(((GT_GUIContainer_FusionReactor) gui).mNEI, new Object[0]) : GuiCraftingRecipe.openRecipeGui(((GT_GUIContainer_FusionReactor) gui).mNEI, new Object[0])); - }*/ - return false; - } - - @Override - public List<String> handleItemDisplayName(final GuiContainer gui, final ItemStack itemstack, final List<String> currenttip) { - return currenttip; - } - - @Override - public List<String> handleItemTooltip(final GuiContainer gui, final ItemStack itemstack, final int mousex, final int mousey, final List<String> currenttip) { - return currenttip; - } - - @Override - public boolean keyTyped(final GuiContainer gui, final char keyChar, final int keyCode) { - return false; - } - - @Override - public void onKeyTyped(final GuiContainer gui, final char keyChar, final int keyID) { - } - - @Override - public void onMouseClicked(final GuiContainer gui, final int mousex, final int mousey, final int button) { - } - - @Override - public void onMouseUp(final GuiContainer gui, final int mousex, final int mousey, final int button) { - } - - @Override - public boolean mouseScrolled(final GuiContainer gui, final int mousex, final int mousey, final int scrolled) { - return false; - } - - @Override - public void onMouseScrolled(final GuiContainer gui, final int mousex, final int mousey, final int scrolled) { - } - - @Override - public void onMouseDragged(final GuiContainer gui, final int mousex, final int mousey, final int button, final long heldTime) { - } - } - - public class FixedPositionedStack - extends PositionedStack { - public final int mChance; - public boolean permutated = false; - - public FixedPositionedStack(final Object object, final int x, final int y) { - this(object, x, y, 0); - } - - public FixedPositionedStack(final Object object, final int x, final int y, final int aChance) { - super(object, x, y, true); - this.mChance = aChance; - } - - @Override - public void generatePermutations() { - if (this.permutated) { - return; - } - final ArrayList<ItemStack> tDisplayStacks = new ArrayList<ItemStack>(); - for (final ItemStack tStack : this.items) { - if (GT_Utility.isStackValid(tStack)) { - if (tStack.getItemDamage() == 32767) { - final List<ItemStack> permutations = codechicken.nei.ItemList.itemMap.get(tStack.getItem()); - if (!permutations.isEmpty()) { - ItemStack stack; - for (final Iterator<ItemStack> i$ = permutations.iterator(); i$.hasNext(); tDisplayStacks.add(GT_Utility.copyAmount(tStack.stackSize, new Object[]{stack}))) { - stack = i$.next(); - } - } else { - final ItemStack base = new ItemStack(tStack.getItem(), tStack.stackSize); - base.stackTagCompound = tStack.stackTagCompound; - tDisplayStacks.add(base); - } - } else { - tDisplayStacks.add(GT_Utility.copy(new Object[]{tStack})); - } - } - } - this.items = (tDisplayStacks.toArray(new ItemStack[0])); - if (this.items.length == 0) { - this.items = new ItemStack[]{new ItemStack(Blocks.fire)}; - } - this.permutated = true; - this.setPermutationToRender(0); - } - } - private static final HashMap<Integer, Pair<Integer, Integer>> mInputSlotMap = new HashMap<Integer, Pair<Integer, Integer>>(); - private static final HashMap<Integer, Pair<Integer, Integer>> mOutputSlotMap = new HashMap<Integer, Pair<Integer, Integer>>(); - - static { - int aSlotX_1 = 12; - int aSlotX_2 = 30; - int aSlotX_3 = 48; - int aSlotY_1 = 5; - int aSlotY_2 = 23; - int aSlotY_3 = 41; - int aSlotY_10 = 65; // Only if 9 input items and a FLuid - mInputSlotMap.put(0, new Pair<Integer, Integer>(aSlotX_1, aSlotY_1)); - mInputSlotMap.put(1, new Pair<Integer, Integer>(aSlotX_2, aSlotY_1)); - mInputSlotMap.put(2, new Pair<Integer, Integer>(aSlotX_3, aSlotY_1)); - mInputSlotMap.put(3, new Pair<Integer, Integer>(aSlotX_1, aSlotY_2)); - mInputSlotMap.put(4, new Pair<Integer, Integer>(aSlotX_2, aSlotY_2)); - mInputSlotMap.put(5, new Pair<Integer, Integer>(aSlotX_3, aSlotY_2)); - mInputSlotMap.put(6, new Pair<Integer, Integer>(aSlotX_1, aSlotY_3)); - mInputSlotMap.put(7, new Pair<Integer, Integer>(aSlotX_2, aSlotY_3)); - mInputSlotMap.put(8, new Pair<Integer, Integer>(aSlotX_3, aSlotY_3)); - mInputSlotMap.put(9, new Pair<Integer, Integer>(aSlotX_1, aSlotY_10)); - mInputSlotMap.put(10, new Pair<Integer, Integer>(aSlotX_2, aSlotY_10)); - mInputSlotMap.put(11, new Pair<Integer, Integer>(aSlotX_3, aSlotY_10)); - aSlotX_1 = 102; - aSlotX_2 = 120; - aSlotX_3 = 138; - mOutputSlotMap.put(0, new Pair<Integer, Integer>(aSlotX_1, aSlotY_1)); - mOutputSlotMap.put(1, new Pair<Integer, Integer>(aSlotX_2, aSlotY_1)); - mOutputSlotMap.put(2, new Pair<Integer, Integer>(aSlotX_3, aSlotY_1)); - mOutputSlotMap.put(3, new Pair<Integer, Integer>(aSlotX_1, aSlotY_2)); - mOutputSlotMap.put(4, new Pair<Integer, Integer>(aSlotX_2, aSlotY_2)); - mOutputSlotMap.put(5, new Pair<Integer, Integer>(aSlotX_3, aSlotY_2)); - mOutputSlotMap.put(6, new Pair<Integer, Integer>(aSlotX_1, aSlotY_3)); - mOutputSlotMap.put(7, new Pair<Integer, Integer>(aSlotX_2, aSlotY_3)); - mOutputSlotMap.put(8, new Pair<Integer, Integer>(aSlotX_3, aSlotY_3)); - mOutputSlotMap.put(9, new Pair<Integer, Integer>(aSlotX_1, aSlotY_10)); - mOutputSlotMap.put(10, new Pair<Integer, Integer>(aSlotX_2, aSlotY_10)); - mOutputSlotMap.put(11, new Pair<Integer, Integer>(aSlotX_3, aSlotY_10)); - } - - private CachedDefaultRecipe getCachedRecipe(GT_Recipe aRecipe) { - try { - return new CachedDefaultRecipe(aRecipe); - } - catch(Throwable e) { - logRecipeError(aRecipe); - } - return null; - } - - public class CachedDefaultRecipe - extends TemplateRecipeHandler.CachedRecipe { - - - public final GT_Recipe mRecipe; - public final List<PositionedStack> mOutputs = new ArrayList<PositionedStack>(); - public final List<PositionedStack> mInputs = new ArrayList<PositionedStack>(); - - public CachedDefaultRecipe(final GT_Recipe aRecipe) { - super(); - this.mRecipe = aRecipe; - int aInputItemsCount = this.mRecipe.mInputs.length; - int aInputFluidsCount = this.mRecipe.mFluidInputs.length; - int aOutputItemsCount = this.mRecipe.mOutputs.length; - int aOutputFluidsCount = this.mRecipe.mFluidOutputs.length; - int aInputSlotsUsed = 0; - int aOutputSlotsUsed = 0; - int aSlotToCheck = 0; - - // Special Slot - if (aRecipe.mSpecialItems != null) { - this.mInputs.add(new FixedPositionedStack(aRecipe.mSpecialItems, 120, 52)); - } - - /* - * Items - */ - - // Upto 9 Inputs Slots - if (aInputItemsCount > 0) { - if (aInputItemsCount > 9) { - aInputItemsCount = 9; - } - for (int i=0;i<aInputItemsCount;i++) { - int x = mInputSlotMap.get(aSlotToCheck).getKey(); - int y = mInputSlotMap.get(aSlotToCheck).getValue(); - this.mInputs.add(new FixedPositionedStack(aRecipe.getRepresentativeInput(aSlotToCheck), x, y)); - aSlotToCheck++; - aInputSlotsUsed++; - } - } - aSlotToCheck = 0; - // Upto 9 Output Slots - if (aOutputItemsCount > 0) { - if (aOutputItemsCount > 9) { - aOutputItemsCount = 9; - } - for (int i=0;i<aOutputItemsCount;i++) { - int x = mOutputSlotMap.get(aSlotToCheck).getKey(); - int y = mOutputSlotMap.get(aSlotToCheck).getValue(); - this.mOutputs.add(new FixedPositionedStack(aRecipe.getOutput(aSlotToCheck), x, y, aRecipe.getOutputChance(aSlotToCheck))); - aSlotToCheck++; - aOutputSlotsUsed++; - } - } - - /* - * Fluids - */ - - // Upto 9 Fluid Inputs Slots - aSlotToCheck = aInputSlotsUsed; - if (aInputFluidsCount > 0) { - for (int i=0;i<aInputFluidsCount;i++) { - int x = mInputSlotMap.get(aSlotToCheck).getKey(); - int y = mInputSlotMap.get(aSlotToCheck).getValue(); - this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(aRecipe.mFluidInputs[i], true), x, y)); - aSlotToCheck++; - aInputSlotsUsed++; - } - } - // Upto 9 Fluid Outputs Slots - aSlotToCheck = aOutputSlotsUsed; - if (aOutputFluidsCount > 0) { - for (int i=0;i<aOutputFluidsCount;i++) { - int x = mOutputSlotMap.get(aSlotToCheck).getKey(); - int y = mOutputSlotMap.get(aSlotToCheck).getValue(); - this.mOutputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(aRecipe.mFluidOutputs[i], true), x, y)); - aSlotToCheck++; - aOutputSlotsUsed++; - } - } - - } - - @Override - public List<PositionedStack> getIngredients() { - return this.getCycledIngredients(GT_NEI_multiCentriElectroFreezer.this.cycleticks / 10, this.mInputs); - } - - @Override - public PositionedStack getResult() { - return null; - } - - @Override - public List<PositionedStack> getOtherStacks() { - return this.mOutputs; - } - } -} diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_AirIntake.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_AirIntake.java deleted file mode 100644 index a7d395b0a1..0000000000 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_AirIntake.java +++ /dev/null @@ -1,289 +0,0 @@ -package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations; - -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidStack; -import net.minecraft.world.World; -import net.minecraft.item.ItemStack; - -import gtPlusPlus.api.objects.random.XSTR; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.minecraft.FluidUtils; -import gtPlusPlus.core.util.reflect.ReflectionUtils; - -import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; - -import java.lang.reflect.Field; - -import net.minecraft.entity.player.EntityPlayer; -import gregtech.api.interfaces.IIconContainer; -import gregtech.api.objects.GT_RenderedTexture; -import gregtech.api.enums.Textures; -import gregtech.api.interfaces.ITexture; - -public class GT_MetaTileEntity_Hatch_AirIntake extends GT_MetaTileEntity_Hatch_Input { - private static XSTR floatGen; - - public GT_MetaTileEntity_Hatch_AirIntake(final int aID, final String aName, final String aNameRegional, - final int aTier) { - super(aID, aName, aNameRegional, aTier); - } - - public GT_MetaTileEntity_Hatch_AirIntake(final String aName, final int aTier, final String aDescription, - final ITexture[][][] aTextures) { - super(aName, aTier, aDescription, aTextures); - } - - /*public GT_MetaTileEntity_Hatch_AirIntake(final String aName, final int aTier, final String[] aDescription, - final ITexture[][][] aTextures) { - super(aName, aTier, aDescription, aTextures); - }*/ - - private static String[] S; - private static Field F; - - public synchronized String[] getDescription() { - try { - if (F == null || S == null) { - Field t = ReflectionUtils.getField(this.getClass(), "mDescriptionArray"); - if (t != null) { - F = t; - } - else { - F = ReflectionUtils.getField(this.getClass(), "mDescription"); - } - if (S == null && F != null) { - Object o = F.get(this); - if (o instanceof String[]) { - S = (String[]) o; - } - else if (o instanceof String) { - S = new String[] {(String) o}; - } - } - - } - } - catch (Throwable t) { - - } - if (S != null) { - final String[] desc = new String[S.length + 3]; - System.arraycopy(S, 0, desc, 0, S.length); - desc[S.length] = "DO NOT OBSTRUCT THE INPUT!"; - desc[S.length + 1] = "Draws in Air from the surrounding environment"; - desc[S.length + 2] = "Creates 1000L of Air every 4 ticks"; - return desc; - } - else { - return new String[] {"DO NOT OBSTRUCT THE INPUT!", "Draws in Air from the surrounding environment", "Creates 1000L of Air every 4 ticks"}; - } - - - } - - public ITexture[] getTexturesActive(final ITexture aBaseTexture) { - return new ITexture[]{aBaseTexture, - new GT_RenderedTexture((IIconContainer) Textures.BlockIcons.OVERLAY_MUFFLER)}; - } - - public ITexture[] getTexturesInactive(final ITexture aBaseTexture) { - return new ITexture[]{aBaseTexture, - new GT_RenderedTexture((IIconContainer) Textures.BlockIcons.OVERLAY_MUFFLER)}; - } - - public boolean isSimpleMachine() { - return true; - } - - public boolean isFacingValid(final byte aFacing) { - return true; - } - - public boolean isAccessAllowed(final EntityPlayer aPlayer) { - return true; - } - - public boolean isValidSlot(final int aIndex) { - return false; - } - - public MetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_Hatch_AirIntake(this.mName, this.mTier, this.mDescription, this.mTextures); - } - - public boolean allowPullStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide, - final ItemStack aStack) { - return false; - } - - public boolean allowPutStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide, - final ItemStack aStack) { - return false; - } - - public void onPostTick(final IGregTechTileEntity aBaseMetaTileEntity, final long aTick) { - super.onPostTick(aBaseMetaTileEntity, aTick); - if (addAirToHatch(aTick)) { - if (aTick % 8 == 0) { - if (aBaseMetaTileEntity.isClientSide()) { - this.pollutionParticles(this.getBaseMetaTileEntity().getWorld(), "cloud"); - } - } - } - } - - public void pollutionParticles(final World aWorld, final String name) { - - final float ran1 = GT_MetaTileEntity_Hatch_AirIntake.floatGen.nextFloat(); - float ran2 = 0.0f; - float ran3 = 0.0f; - ran2 = GT_MetaTileEntity_Hatch_AirIntake.floatGen.nextFloat(); - ran3 = GT_MetaTileEntity_Hatch_AirIntake.floatGen.nextFloat(); - - final IGregTechTileEntity aMuffler = this.getBaseMetaTileEntity(); - final ForgeDirection aDir = ForgeDirection.getOrientation((int) aMuffler.getFrontFacing()); - final float xPos = aDir.offsetX * 0.76f + aMuffler.getXCoord() + 0.25f; - float yPos = aDir.offsetY * 0.76f + aMuffler.getYCoord() + 0.65f; - final float zPos = aDir.offsetZ * 0.76f + aMuffler.getZCoord() + 0.25f; - float ySpd = aDir.offsetY * 0.1f + 0.2f + 0.1f * GT_MetaTileEntity_Hatch_AirIntake.floatGen.nextFloat(); - float xSpd; - float zSpd; - if (aDir.offsetY == -1) { - //Logger.INFO("Y = -1"); - final float temp = GT_MetaTileEntity_Hatch_AirIntake.floatGen.nextFloat() * 2.0f * CORE.PI; - xSpd = (float) Math.sin(temp) * 0.1f; - zSpd = (float) Math.cos(temp) * 0.1f; - ySpd = -ySpd; - yPos = yPos - 0.8f; - } else { - xSpd = aDir.offsetX * (0.1f + 0.2f * GT_MetaTileEntity_Hatch_AirIntake.floatGen.nextFloat()); - zSpd = aDir.offsetZ * (0.1f + 0.2f * GT_MetaTileEntity_Hatch_AirIntake.floatGen.nextFloat()); - - xSpd = -xSpd; - zSpd = -zSpd; - - - } - - aWorld.spawnParticle(name, (double) (xPos + ran1 * 0.5f), - (double) (yPos + GT_MetaTileEntity_Hatch_AirIntake.floatGen.nextFloat() * 0.5f), - (double) (zPos + GT_MetaTileEntity_Hatch_AirIntake.floatGen.nextFloat() * 0.5f), (double) xSpd, - (double) -ySpd, (double) zSpd); - aWorld.spawnParticle(name, (double) (xPos + ran2 * 0.5f), - (double) (yPos + GT_MetaTileEntity_Hatch_AirIntake.floatGen.nextFloat() * 0.5f), - (double) (zPos + GT_MetaTileEntity_Hatch_AirIntake.floatGen.nextFloat() * 0.5f), (double) xSpd, - (double) -ySpd, (double) zSpd); - aWorld.spawnParticle(name, (double) (xPos + ran3 * 0.5f), - (double) (yPos + GT_MetaTileEntity_Hatch_AirIntake.floatGen.nextFloat() * 0.5f), - (double) (zPos + GT_MetaTileEntity_Hatch_AirIntake.floatGen.nextFloat() * 0.5f), (double) xSpd, - (double) -ySpd, (double) zSpd); - } - - static { - GT_MetaTileEntity_Hatch_AirIntake.floatGen = new XSTR(); - } - - public int getTankPressure() { - return 100; - } - - public int getCapacity() { - return 128000; - } - - @Override - public boolean canTankBeEmptied() { - return true; - } - - private static Fluid AIR; - - public boolean isAirInHatch() { - if (this.mFluid != null) { - if (AIR == null) { - AIR = FluidUtils.getAir(1).getFluid(); - } - if (AIR == this.mFluid.getFluid()) { - return true; - } - else return false; - } - return true; - } - - public boolean addAirToHatch(long aTick) { - if (!this.getBaseMetaTileEntity().getAirAtSide(this.getBaseMetaTileEntity().getFrontFacing())) { - return false; - } - boolean a1 = canTankBeFilled(); - if (aTick % 4 != 0 && a1) { - return true; - } - else if (aTick % 4 != 0 && !a1) { - return false; - } - else { - if (!isAirInHatch()) { - return false; - } - if (this.mFluid != null && a1) { - this.mFluid.amount += 1000; - return true; - } - else if (this.mFluid != null && !a1) { - return false; - } - else { - if (this.mFluid == null) { - this.mFluid = FluidUtils.getFluidStack("air", 1000); - return true; - } - else { - //Not sure how any other fluid got in here - return false; - } - } - } - } - - @Override - public boolean canTankBeFilled() { - if (this.mFluid == null || (this.mFluid != null && ((this.mFluid.amount+1000) <= this.getCapacity()))) { - return true; - } - return false; - } - - @Override - public boolean doesEmptyContainers() { - return false; - } - - @Override - public boolean doesFillContainers() { - return false; - } - - @Override - public int fill(FluidStack aFluid, boolean doFill) { - return 0; - } - - @Override - public boolean canFill(ForgeDirection aSide, Fluid aFluid) { - return false; - } - - @Override - public int fill(ForgeDirection arg0, FluidStack arg1, boolean arg2) { - return 0; - } - - @Override - public int fill_default(ForgeDirection aSide, FluidStack aFluid, boolean doFill) { - return 0; - } -} diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_ElementalDuplicator.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_ElementalDuplicator.java deleted file mode 100644 index 6f8f082065..0000000000 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_ElementalDuplicator.java +++ /dev/null @@ -1,993 +0,0 @@ -/* -package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production; - -import static gtPlusPlus.core.util.data.ArrayUtils.removeNulls; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - -import org.apache.commons.lang3.ArrayUtils; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import gregtech.api.GregTech_API; -import gregtech.api.enums.Textures; -import gregtech.api.interfaces.ITexture; -import gregtech.api.interfaces.metatileentity.IMetaTileEntity; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachineBlock; -import gregtech.api.objects.GT_RenderedTexture; -import gregtech.api.util.GTPP_Recipe; -import gregtech.api.util.GT_Recipe; -import gregtech.api.util.GT_Utility; -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.api.objects.data.AutoMap; -import gtPlusPlus.api.objects.data.Triplet; -import gtPlusPlus.core.block.ModBlocks; -import gtPlusPlus.core.item.chemistry.general.ItemGenericChemBase; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.recipe.common.CI; -import gtPlusPlus.core.util.math.MathUtils; -import gtPlusPlus.core.util.minecraft.ItemUtils; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_ElementalDataOrbHolder; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.nbthandlers.GT_MetaTileEntity_Hatch_Catalysts; -import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy; -import gtPlusPlus.xmod.gregtech.common.StaticFields59; -import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; -import net.minecraft.block.Block; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.FluidStack; - -public class GregtechMTE_ElementalDuplicator extends GregtechMeta_MultiBlockBase { - - private int mSolidCasingTier = 0; - private int mMachineCasingTier = 0; - private int mPipeCasingTier = 0; - private int mCoilTier = 0; - - private ArrayList<GT_MetaTileEntity_Hatch_ElementalDataOrbHolder> mDataHolders = new ArrayList<GT_MetaTileEntity_Hatch_ElementalDataOrbHolder>(); - - private static final HashMap<Integer, Triplet<Block, Integer, Integer>> mTieredBlockRegistry = new HashMap<Integer, Triplet<Block, Integer, Integer>>(); - - public GregtechMTE_ElementalDuplicator(final int aID, final String aName, final String aNameRegional) { - super(aID, aName, aNameRegional); - } - - public GregtechMTE_ElementalDuplicator(final String aName) { - super(aName); - } - - public static boolean registerMachineCasingForTier(int aTier, Block aBlock, int aMeta, int aCasingTextureID) { - int aSize = mTieredBlockRegistry.size(); - int aSize2 = aSize; - Triplet<Block, Integer, Integer> aCasingData = new Triplet<Block, Integer, Integer>(aBlock, aMeta, aCasingTextureID); - if (mTieredBlockRegistry.containsKey(aTier)) { - CORE.crash("Tried to register a Machine casing for tier "+aTier+" to the Chemical Plant, however this tier already contains one."); - } - mTieredBlockRegistry.put(aTier, aCasingData); - aSize = mTieredBlockRegistry.size(); - return aSize > aSize2; - } - - private static Block getBlockForTier(int aTier) { - if (!mTieredBlockRegistry.containsKey(aTier)) { - return Blocks.bedrock; - } - return mTieredBlockRegistry.get(aTier).getValue_1(); - } - private static int getMetaForTier(int aTier) { - if (!mTieredBlockRegistry.containsKey(aTier)) { - return 32; - } - return mTieredBlockRegistry.get(aTier).getValue_2(); - } - private static int getCasingTextureIdForTier(int aTier) { - return 67; - } - - @Override - public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return new GregtechMTE_ElementalDuplicator(this.mName); - } - - @Override - public String getMachineType() { - return "Chemical Plant"; - } - - @Override - public String[] getTooltip() { - return new String[] { - "Controller Block for the Industrial Replication Machine", - "Now replication is less painful", - "Please read to user manual for more information on construction & usage", - TAG_HIDE_MAINT - }; - } - - @Override - public String getSound() { - return GregTech_API.sSoundList.get(Integer.valueOf(207)); - } - - @Override - public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte aFacing, final byte aColorIndex, final boolean aActive, final boolean aRedstone) { - - ITexture aOriginalTexture; - - // Check things exist client side (The worst code ever) - if (aBaseMetaTileEntity.getWorld() != null) { - - } - int aCasingID = getCasingTextureID(); - aOriginalTexture = Textures.BlockIcons.getCasingTextureForId(aCasingID); - - if (aSide == aFacing) { - return new ITexture[]{aOriginalTexture, new GT_RenderedTexture(aActive ? TexturesGtBlock.Overlay_Machine_Controller_Advanced_Active : TexturesGtBlock.Overlay_Machine_Controller_Advanced)}; - } - return new ITexture[]{aOriginalTexture}; - } - - @Override - public boolean hasSlotInGUI() { - return true; - } - - @Override - public GT_Recipe.GT_Recipe_Map getRecipeMap() { - return GTPP_Recipe.GTPP_Recipe_Map.sChemicalPlant_GT; - } - - public static void generateRecipes() { - for (GTPP_Recipe i : GTPP_Recipe.GTPP_Recipe_Map.sChemicalPlantRecipes.mRecipeList) { - GTPP_Recipe.GTPP_Recipe_Map.sChemicalPlant_GT.add(i); - } - } - - @Override - public boolean isFacingValid(final byte aFacing) { - return aFacing > 1; - } - - @Override - public int getMaxParallelRecipes() { - return 2 * getPipeCasingTier(); - } - - @Override - public int getEuDiscountForParallelism() { - return 100; - } - - private int getSolidCasingTier() { - return this.mSolidCasingTier; - } - - private int getMachineCasingTier() { - return mMachineCasingTier; - } - private int getPipeCasingTier() { - return mPipeCasingTier; - } - private int getCoilTier() { - return mCoilTier; - } - - private int getCasingTextureID() { - // Check the Tier Client Side - int aTier = mSolidCasingTier; - int aCasingID = getCasingTextureIdForTier(aTier); - return aCasingID; - } - - public boolean addToMachineList(IGregTechTileEntity aTileEntity) { - int aMaxTier = getMachineCasingTier(); - final IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); - if (aMetaTileEntity instanceof GT_MetaTileEntity_TieredMachineBlock) { - GT_MetaTileEntity_TieredMachineBlock aMachineBlock = (GT_MetaTileEntity_TieredMachineBlock) aMetaTileEntity; - int aTileTier = aMachineBlock.mTier; - if (aTileTier > aMaxTier) { - Logger.INFO("Hatch tier too high."); - return false; - } - else { - return addToMachineList(aTileEntity, getCasingTextureID()); - } - } - else { - Logger.INFO("Bad Tile Entity being added to hatch map."); // Shouldn't ever happen, but.. ya know.. - return false; - } - } - - @Override - public void saveNBTData(NBTTagCompound aNBT) { - super.saveNBTData(aNBT); - aNBT.setInteger("mSolidCasingTier", this.mSolidCasingTier); - aNBT.setInteger("mMachineCasingTier", this.mMachineCasingTier); - aNBT.setInteger("mPipeCasingTier", this.mPipeCasingTier); - aNBT.setInteger("mCoilTier", this.mCoilTier); - } - - @Override - public void loadNBTData(NBTTagCompound aNBT) { - super.loadNBTData(aNBT); - mSolidCasingTier = aNBT.getInteger("mSolidCasingTier"); - mMachineCasingTier = aNBT.getInteger("mMachineCasingTier"); - mPipeCasingTier = aNBT.getInteger("mPipeCasingTier"); - mCoilTier = aNBT.getInteger("mCoilTier"); - } - - private static boolean isBlockSolidCasing(int aCurrentTier, Block aBlock, int aMeta) { - if (aBlock == null || (aMeta < 0 || aMeta > 16)) { - return false; - } - Block aTieredCasing = ModBlocks.blockCasings5Misc; - int aTieredMeta = 3; - if (aBlock == aTieredCasing && aMeta == aTieredMeta) { - return true; - } - return false; - } - private static boolean isBlockMachineCasing(Block aBlock, int aMeta) { - Block aCasingBlock1 = GregTech_API.sBlockCasings1; - if (aBlock == aCasingBlock1) { - if (aMeta > 9 || aMeta < 0) { - return false; - } - else { - return true; - } - } - else { - return false; - } - } - private static boolean isBlockPipeCasing(Block aBlock, int aMeta) { - Block aCasingBlock2 = GregTech_API.sBlockCasings2; - if (aBlock == aCasingBlock2) { - int aMetaBronzePipeCasing = 12; - //int aMetaSteelPipeCasing = 13; - //int aMetaTitaniumPipeCasing = 14; - int aMetaTungstenPipeCasing = 15; - if (aMeta > aMetaTungstenPipeCasing || aMeta < aMetaBronzePipeCasing) { - return false; - } - else { - return true; - } - } - else { - return false; - } - } - - private static AutoMap<Integer> mValidCoilMetaCache; - - private static boolean isBlockCoil(Block aBlock, int aMeta) { - Block aCasingBlock; - if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) { - aCasingBlock = StaticFields59.getBlockCasings5(); - } - else { - aCasingBlock = GregTech_API.sBlockCasings1; - } - // Cache the meta values for later - if (mValidCoilMetaCache == null || mValidCoilMetaCache.isEmpty()) { - AutoMap<Integer> aValidCoilMeta = new AutoMap<Integer>(); - // Only use the right meta values available. - if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) { - aValidCoilMeta = Meta_GT_Proxy.GT_ValidHeatingCoilMetas; - } - else { - aValidCoilMeta.put(12); - aValidCoilMeta.put(13); - aValidCoilMeta.put(14); - } - mValidCoilMetaCache = aValidCoilMeta; - } - if (aBlock == aCasingBlock) { - for (int i: mValidCoilMetaCache.values()) { - if (i == aMeta) { - return true; - } - } - } - return false; - } - - - @Override - public boolean checkMultiblock(final IGregTechTileEntity aBaseMetaTileEntity, final ItemStack aStack) { - - int xDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetX * 3; - int zDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetZ * 3; - - Logger.INFO("Checking ChemPlant Structure"); - - // Require Air above controller - boolean aAirCheck = aBaseMetaTileEntity.getAirOffset(0, 1, 0); - - if (!aAirCheck) { - Logger.INFO("No Air Above Controller"); - return false; - } else { - - //String aName = aInitStructureCheck != null ? ItemUtils.getLocalizedNameOfBlock(aInitStructureCheck, aInitStructureCheckMeta) : "Air"; - - mSolidCasingTier = getSolidCasingTierCheck(aBaseMetaTileEntity, xDir, zDir); - mMachineCasingTier = getMachineCasingTierCheck(aBaseMetaTileEntity, xDir, zDir); - - Logger.INFO("Initial Casing Check Complete, Solid Casing Tier: "+mSolidCasingTier+", Machine Casing Tier: "+mMachineCasingTier); - - int aSolidCasingCount = 0; - int aMachineCasingCount = 0; - int aPipeCount = 0; - int aCoilCount = 0; - - aSolidCasingCount = checkSolidCasings(aBaseMetaTileEntity, aStack, xDir, zDir); - aMachineCasingCount = checkMachineCasings(aBaseMetaTileEntity, aStack, xDir, zDir); - aPipeCount = checkPipes(aBaseMetaTileEntity, aStack, xDir, zDir); - aCoilCount = checkCoils(aBaseMetaTileEntity, aStack, xDir, zDir); - - Logger.INFO("Casing Counts: "); - Logger.INFO("Solid: "+aSolidCasingCount+", Machine: "+aMachineCasingCount); - Logger.INFO("Pipe: "+aPipeCount+", Coil: "+aCoilCount); - - - Logger.INFO("Casing Tiers: "); - Logger.INFO("Solid: "+getSolidCasingTier()+", Machine: "+getMachineCasingTier()); - Logger.INFO("Pipe: "+getPipeCasingTier()+", Coil: "+getCoilTier()); - - // Attempt to sync fields here, so that it updates client side values. - aBaseMetaTileEntity.getWorld().markBlockForUpdate(aBaseMetaTileEntity.getXCoord(), aBaseMetaTileEntity.getYCoord(), aBaseMetaTileEntity.getZCoord()); - - - - // Minimum 80/93 Solid Casings - if (aSolidCasingCount < 80) { - Logger.INFO("Not enough solid casings. Found "+aSolidCasingCount+", require: 80."); - return false; - } - if (aMachineCasingCount != 57) { - Logger.INFO("Not enough machine casings. Found "+aMachineCasingCount+", require: 57."); - return false; - } - if (aPipeCount != 18) { - Logger.INFO("Not enough pipe casings. Found "+aPipeCount+", require: 18."); - return false; - } - if (aCoilCount != 27) { - Logger.INFO("Not enough coils. Found "+aCoilCount+", require: 27."); - return false; - } - - Logger.INFO("Structure Check Complete!"); - - return true; - } - } - - - public int checkCoils(final IGregTechTileEntity aBaseMetaTileEntity, final ItemStack aStack, int aOffsetX, int aOffsetZ) { - int tAmount = 0; - int aCurrentCoilMeta = -1; - for (int i = -1; i < 2; i++) { - for (int j = -1; j < 2; j++) { - for (int h = 0; h < 8; h++) { - if (h == 1 || h == 3 || h == 5) { - Block aBlock = aBaseMetaTileEntity.getBlockOffset(aOffsetX + i, h, aOffsetZ + j); - int aMeta = aBaseMetaTileEntity.getMetaIDOffset(aOffsetX + i, h, aOffsetZ + j); - if (isBlockCoil(aBlock, aMeta)) { - if (aCurrentCoilMeta < 0) { - aCurrentCoilMeta = aMeta; - } - if (aCurrentCoilMeta != aMeta) { - return tAmount; - } - else { - tAmount++; - } - } - } - } - } - } - - if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) { - this.mCoilTier = (aCurrentCoilMeta+1); - } - else { - if (aCurrentCoilMeta == 12) { - this.mCoilTier = 1; - } - else if (aCurrentCoilMeta == 13) { - this.mCoilTier = 2; - } - else if (aCurrentCoilMeta == 14) { - this.mCoilTier = 3; - } - else { - this.mCoilTier = 0; - } - } - - return tAmount; - } - - - public int checkPipes(final IGregTechTileEntity aBaseMetaTileEntity, final ItemStack aStack, int aOffsetX, int aOffsetZ) { - int tAmount = 0; - int aCurrentPipeMeta = -1; - for (int i = -1; i < 2; i++) { - for (int j = -1; j < 2; j++) { - for (int h = 0; h < 8; h++) { - if (h == 2 || h == 4) { - Block aBlock = aBaseMetaTileEntity.getBlockOffset(aOffsetX + i, h, aOffsetZ + j); - int aMeta = aBaseMetaTileEntity.getMetaIDOffset(aOffsetX + i, h, aOffsetZ + j); - if (isBlockPipeCasing(aBlock, aMeta)) { - if (aCurrentPipeMeta < 0) { - aCurrentPipeMeta = aMeta; - } - if (aCurrentPipeMeta != aMeta) { - return tAmount; - } - else { - tAmount++; - } - } - } - } - } - } - - if (aCurrentPipeMeta == 12) { - this.mPipeCasingTier = 1; - } - else if (aCurrentPipeMeta == 13) { - this.mPipeCasingTier = 2; - } - else if (aCurrentPipeMeta == 14) { - this.mPipeCasingTier = 3; - } - else if (aCurrentPipeMeta == 15) { - this.mPipeCasingTier = 4; - } - else { - this.mPipeCasingTier = 0; - } - - return tAmount; - } - - - public int checkSolidCasings(final IGregTechTileEntity aBaseMetaTileEntity, final ItemStack aStack, int aOffsetX, int aOffsetZ) { - - int tAmount = 0; - - // Only check a 7x7 - for (int i = -3; i < 4; i++) { - for (int j = -3; j < 4; j++) { - // If we are on the 7x7 ring, proceed - IGregTechTileEntity aTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(aOffsetX + i, 0, aOffsetZ + j); - Block aBlock = aBaseMetaTileEntity.getBlockOffset(aOffsetX + i, 0, aOffsetZ + j); - int aMeta = aBaseMetaTileEntity.getMetaIDOffset(aOffsetX + i, 0, aOffsetZ + j); - - if (aTileEntity != null) { - - if (this.addToMachineList(aTileEntity)) { - tAmount++; - } - else { - if (aTileEntity != null) { - Logger.INFO("Adding "+aTileEntity.getInventoryName()); - } - final IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); - if (aMetaTileEntity == null) { - Logger.INFO("Error counting Bottom Layer Casing Ring. Bad Tile Entity. Found "+aTileEntity.getInventoryName()); - return tAmount; - } - //Handle controller - if (aMetaTileEntity instanceof GregtechMTE_ElementalDuplicator) { - continue; - } - else { - Logger.INFO("Error counting Bottom Layer Casing Ring. Bad Tile Entity. Found "+aMetaTileEntity.getInventoryName()); - return tAmount; - } - } - } - else { - if (isBlockSolidCasing(mSolidCasingTier, aBlock, aMeta)) { - tAmount++; - } - else { - Logger.INFO("Error counting Bottom Layer Casing Ring. Found "+aBlock.getLocalizedName()+":"+aMeta); - return tAmount; - } - } - - } - } - - return tAmount; - } - - - public int checkMachineCasings(final IGregTechTileEntity aBaseMetaTileEntity, final ItemStack aStack, int aOffsetX, int aOffsetZ) { - int tAmount = 0; - int aHeight = 0; - // Iterate once for each layer - for (int aIteration=0;aIteration<3;aIteration++) { - // Dynamically set height - aHeight = (aIteration == 0 ? 0 : aIteration == 1 ? 1 : 5); - // Only check a 5x5 area - for (int i = -2; i < 3; i++) { - for (int j = -2; j < 3; j++) { - // If we are on the 5x5 ring, proceed - if (i == -2 || i == 2 || j == -2 || j == 2) { - // If the second axis is on the outer ring, continue - if (i < -2 || i > 2 || j < -2 || j > 2) { - continue; - } - Block aBlock = aBaseMetaTileEntity.getBlockOffset(aOffsetX + i, aHeight, aOffsetZ + j); - int aMeta = aBaseMetaTileEntity.getMetaIDOffset(aOffsetX + i, aHeight, aOffsetZ + j); - if (isBlockMachineCasing(aBlock, aMeta)) { - tAmount++; - } - else { - return tAmount; - } - } - } - } - } - - // Check bottom layer inner 3x3 - for (int i = -1; i < 2; i++) { - for (int j = -1; j < 2; j++) { - Block aBlock = aBaseMetaTileEntity.getBlockOffset(aOffsetX + i, 0, aOffsetZ + j); - int aMeta = aBaseMetaTileEntity.getMetaIDOffset(aOffsetX + i, 0, aOffsetZ + j); - if (isBlockMachineCasing(aBlock, aMeta)) { - tAmount++; - } - else { - return tAmount; - } - } - } - - return tAmount; - } - - public int getSolidCasingTierCheck(IGregTechTileEntity aBaseMetaTileEntity, int xDir, int zDir) { - Block aInitStructureCheck; - int aInitStructureCheckMeta; - if (xDir == 0) { - aInitStructureCheck = aBaseMetaTileEntity.getBlockOffset(zDir, 1, 0); - aInitStructureCheckMeta = aBaseMetaTileEntity.getMetaIDOffset(zDir, 1, 0); - } - else { - aInitStructureCheck = aBaseMetaTileEntity.getBlockOffset(0, 1, xDir); - aInitStructureCheckMeta = aBaseMetaTileEntity.getMetaIDOffset(0, 1, xDir); - } - for (int aTier : mTieredBlockRegistry.keySet()) { - Triplet<Block, Integer, Integer> aData = mTieredBlockRegistry.get(aTier); - if (aData.getValue_1() == aInitStructureCheck && aData.getValue_2() == aInitStructureCheckMeta) { - return aTier; - } - } - return 0; - } - - @Override - public boolean addToMachineList(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) { - final IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); - if (aMetaTileEntity == null) { - return false; - } - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_ElementalDataOrbHolder) { - log("Found GT_MetaTileEntity_Hatch_ElementalDataOrbHolder"); - return addToMachineListInternal(mDataHolders, aMetaTileEntity, aBaseCasingIndex); - } - return super.addToMachineList(aTileEntity, aBaseCasingIndex); - } - - public int getMachineCasingTierCheck(IGregTechTileEntity aBaseMetaTileEntity, int xDir, int zDir) { - return 10; - } - - - @Override - public int getMaxEfficiency(final ItemStack aStack) { - return 10000; - } - - @Override - public int getPollutionPerTick(final ItemStack aStack) { - return 0; - } - - @Override - public int getAmountOfOutputs() { - return 1; - } - - @Override - public boolean explodesOnComponentBreak(final ItemStack aStack) { - return false; - } - - @Override - public String getCustomGUIResourceName() { - return null; - } - - // Same speed bonus as pyro oven - public int getSpeedBonus() { - return 50 * (this.mCoilTier - 2); - } - - public int getMaxCatalystDurability() { - return 50; - } - - @Override - public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { - if (aBaseMetaTileEntity.isServerSide()) { - if (this.mUpdate == 1 || this.mStartUpCheck == 1) { - this.mDataHolders.clear(); - } - } - // Silly Client Syncing - if (aBaseMetaTileEntity.isClientSide()) { - if (this != null && this.getBaseMetaTileEntity() != null && this.getBaseMetaTileEntity().getWorld() != null) { - this.mSolidCasingTier = getCasingTierOnClientSide(); - markDirty(); - } - } - super.onPostTick(aBaseMetaTileEntity, aTick); - } - - @Override - public void onPreTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { - super.onPreTick(aBaseMetaTileEntity, aTick); - } - - @Override - public boolean checkRecipe(final ItemStack aStack) { - return checkRecipeGeneric(getMaxParallelRecipes(), getEuDiscountForParallelism(), getSpeedBonus()); - } - - - @Override - public boolean checkRecipeGeneric( - ItemStack[] aItemInputs, FluidStack[] aFluidInputs, - int aMaxParallelRecipes, int aEUPercent, - int aSpeedBonusPercent, int aOutputChanceRoll, GT_Recipe aRecipe) { - - // Based on the Processing Array. A bit overkill, but very flexible. - - // Reset outputs and progress stats - this.mEUt = 0; - this.mMaxProgresstime = 0; - this.mOutputItems = new ItemStack[]{}; - this.mOutputFluids = new FluidStack[]{}; - - long tVoltage = getMaxInputVoltage(); - byte tTier = (byte) Math.max(1, GT_Utility.getTier(tVoltage)); - long tEnergy = getMaxInputEnergy(); - log("Running checkRecipeGeneric(0)"); - - // checks if it has a catalyst with enough durability - ItemStack tCatalystRecipe = findCatalyst(aItemInputs); - if (tCatalystRecipe == null) { - log("does not have catalyst"); - return false; - } - - GT_Recipe tRecipe = findRecipe( - getBaseMetaTileEntity(), mLastRecipe, false, - gregtech.api.enums.GT_Values.V[tTier], aFluidInputs, aItemInputs); - - - log("Running checkRecipeGeneric(1)"); - // Remember last recipe - an optimization for findRecipe() - this.mLastRecipe = tRecipe; - - - if (tRecipe == null) { - log("BAD RETURN - 1"); - return false; - } - - if (tRecipe.mSpecialValue > this.mSolidCasingTier) { - log("solid tier is too low"); - return false; - } - - - aMaxParallelRecipes = this.canBufferOutputs(tRecipe, aMaxParallelRecipes); - if (aMaxParallelRecipes == 0) { - log("BAD RETURN - 2"); - return false; - } - - // checks if it has enough catalyst durabilety - ArrayList<ItemStack>tCatalysts = null; - int tMaxParrallelCatalyst = aMaxParallelRecipes; - if (tCatalystRecipe != null) { - tCatalysts = new ArrayList<ItemStack>(); - tMaxParrallelCatalyst = getCatalysts(aItemInputs, tCatalystRecipe, aMaxParallelRecipes, tCatalysts); - log("Can process "+tMaxParrallelCatalyst+" recipes. If less than "+aMaxParallelRecipes+", catalyst does not have enough durability."); - } - - if (tMaxParrallelCatalyst == 0) { - log("found not enough catalysts"); - return false; - } - - // EU discount - float tRecipeEUt = (tRecipe.mEUt * aEUPercent) / 100.0f; - float tTotalEUt = 0.0f; - log("aEUPercent "+aEUPercent); - log("mEUt "+tRecipe.mEUt); - - int parallelRecipes = 0; - - log("parallelRecipes: "+parallelRecipes); - log("aMaxParallelRecipes: "+tMaxParrallelCatalyst); - log("tTotalEUt: "+tTotalEUt); - log("tVoltage: "+tVoltage); - log("tEnergy: "+tEnergy); - log("tRecipeEUt: "+tRecipeEUt); - // Count recipes to do in parallel, consuming input items and fluids and considering input voltage limits - for (; parallelRecipes < tMaxParrallelCatalyst && tTotalEUt < (tEnergy - tRecipeEUt); parallelRecipes++) { - if (!tRecipe.isRecipeInputEqual(true, aFluidInputs, aItemInputs)) { - log("Broke at "+parallelRecipes+"."); - break; - } - log("Bumped EU from "+tTotalEUt+" to "+(tTotalEUt+tRecipeEUt)+"."); - tTotalEUt += tRecipeEUt; - } - - if (parallelRecipes == 0) { - log("BAD RETURN - 3"); - return false; - } - - // -- Try not to fail after this point - inputs have already been consumed! -- - - - // Convert speed bonus to duration multiplier - // e.g. 100% speed bonus = 200% speed = 100%/200% = 50% recipe duration. - aSpeedBonusPercent = Math.max(-99, aSpeedBonusPercent); - float tTimeFactor = 100.0f / (100.0f + aSpeedBonusPercent); - this.mMaxProgresstime = (int)(tRecipe.mDuration * tTimeFactor); - - this.mEUt = (int)Math.ceil(tTotalEUt); - - this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000); - this.mEfficiencyIncrease = 10000; - - // Overclock - if (this.mEUt <= 16) { - this.mEUt = (this.mEUt * (1 << tTier - 1) * (1 << tTier - 1)); - this.mMaxProgresstime = (this.mMaxProgresstime / (1 << tTier - 1)); - } else { - while (this.mEUt <= gregtech.api.enums.GT_Values.V[(tTier - 1)]) { - this.mEUt *= 4; - this.mMaxProgresstime /= 2; - } - } - - if (this.mEUt > 0) { - this.mEUt = (-this.mEUt); - } - - - this.mMaxProgresstime = Math.max(1, this.mMaxProgresstime); - - // Collect fluid outputs - FluidStack[] tOutputFluids = new FluidStack[tRecipe.mFluidOutputs.length]; - for (int h = 0; h < tRecipe.mFluidOutputs.length; h++) { - if (tRecipe.getFluidOutput(h) != null) { - tOutputFluids[h] = tRecipe.getFluidOutput(h).copy(); - tOutputFluids[h].amount *= parallelRecipes; - } - } - - // Collect output item types - ItemStack[] tOutputItems = new ItemStack[tRecipe.mOutputs.length]; - for (int h = 0; h < tRecipe.mOutputs.length; h++) { - if (tRecipe.getOutput(h) != null) { - tOutputItems[h] = tRecipe.getOutput(h).copy(); - tOutputItems[h].stackSize = 0; - } - } - - // Set output item stack sizes (taking output chance into account) - for (int f = 0; f < tOutputItems.length; f++) { - if (tRecipe.mOutputs[f] != null && tOutputItems[f] != null) { - for (int g = 0; g < parallelRecipes; g++) { - if (getBaseMetaTileEntity().getRandomNumber(aOutputChanceRoll) < tRecipe.getOutputChance(f)) - tOutputItems[f].stackSize += tRecipe.mOutputs[f].stackSize; - } - } - } - - tOutputItems = removeNulls(tOutputItems); - - // Sanitize item stack size, splitting any stacks greater than max stack size - List<ItemStack> splitStacks = new ArrayList<ItemStack>(); - for (ItemStack tItem : tOutputItems) { - while (tItem.getMaxStackSize() < tItem.stackSize) { - ItemStack tmp = tItem.copy(); - tmp.stackSize = tmp.getMaxStackSize(); - tItem.stackSize = tItem.stackSize - tItem.getMaxStackSize(); - splitStacks.add(tmp); - } - } - - if (splitStacks.size() > 0) { - ItemStack[] tmp = new ItemStack[splitStacks.size()]; - tmp = splitStacks.toArray(tmp); - tOutputItems = ArrayUtils.addAll(tOutputItems, tmp); - } - - // Strip empty stacks - List<ItemStack> tSList = new ArrayList<ItemStack>(); - for (ItemStack tS : tOutputItems) { - if (tS.stackSize > 0) tSList.add(tS); - } - tOutputItems = tSList.toArray(new ItemStack[tSList.size()]); - - // Damage catalyst once all is said and done. - if (tCatalystRecipe != null) { - log("damaging catalyst"); - damageCatalyst(tCatalystRecipe, parallelRecipes); - } - - // Commit outputs - this.mOutputItems = tOutputItems; - this.mOutputFluids = tOutputFluids; - updateSlots(); - - // Play sounds (GT++ addition - GT multiblocks play no sounds) - startProcess(); - - log("GOOD RETURN - 1"); - return true; - } - - private int getCatalysts(ItemStack[] aItemInputs, ItemStack aRecipeCatalyst, int aMaxParrallel, ArrayList<ItemStack> aOutPut) { - int allowedParrallel = 0; - for (final ItemStack aInput : aItemInputs) { - if (aRecipeCatalyst.isItemEqual(aInput)) { - int aDurabilityRemaining = getMaxCatalystDurability() - getDamage(aInput); - return Math.min(aMaxParrallel, aDurabilityRemaining); - } - } - return allowedParrallel; - } - - private ItemStack findCatalyst(ItemStack[] aItemInputs) { - if (aItemInputs != null) { - for (final ItemStack aInput : aItemInputs) { - if (aInput != null) { - if (ItemUtils.isCatalyst(aInput)) { - return aInput; - } - } - } - } - return null; - } - - - private void damageCatalyst(ItemStack aStack, int parallelRecipes) { - for (int i=0; i<parallelRecipes; i++){ - if (MathUtils.randFloat(0, 10000000)/10000000f < (1.2f - (0.2 * this.mPipeCasingTier))) { - int damage = getDamage(aStack) + 1; - log("damage catalyst "+damage); - if (damage >= getMaxCatalystDurability()) { - log("consume catalyst"); - addOutput(CI.getEmptyCatalyst(1)); - aStack = null; - } - else { - log("damaging catalyst"); - setDamage(aStack, damage); - } - } - else { - log("not consuming catalyst"); - } - } - - - - } - - private int getDamage(ItemStack aStack) { - return ItemGenericChemBase.getCatalystDamage(aStack); - } - - private void setDamage(ItemStack aStack,int aAmount) { - ItemGenericChemBase.setCatalystDamage(aStack, aAmount); - } - - - - @SideOnly(Side.CLIENT) - private final int getCasingTierOnClientSide() { - - if (this == null || this.getBaseMetaTileEntity().getWorld() == null) { - return 0; - } - try { - Block aInitStructureCheck; - int aInitStructureCheckMeta; - IGregTechTileEntity aBaseMetaTileEntity = this.getBaseMetaTileEntity(); - int xDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetX * 3; - int zDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetZ * 3; - if (xDir == 0) { - aInitStructureCheck = aBaseMetaTileEntity.getBlockOffset(zDir, 1, 0); - aInitStructureCheckMeta = aBaseMetaTileEntity.getMetaIDOffset(zDir, 1, 0); - } - else { - aInitStructureCheck = aBaseMetaTileEntity.getBlockOffset(0, 1, xDir); - aInitStructureCheckMeta = aBaseMetaTileEntity.getMetaIDOffset(0, 1, xDir); - } - for (int aTier : mTieredBlockRegistry.keySet()) { - Triplet<Block, Integer, Integer> aData = mTieredBlockRegistry.get(aTier); - if (aData.getValue_1() == aInitStructureCheck && aData.getValue_2() == aInitStructureCheckMeta) { - return aTier; - } - } - return 0; - } - catch (Throwable t) { - t.printStackTrace(); - return 0; - } - - } - - - - */ -/* - * Catalyst Handling - *//* - - - - - @Override - public ArrayList<ItemStack> getStoredInputs() { - ArrayList<ItemStack> tItems = super.getStoredInputs(); - for (GT_MetaTileEntity_Hatch_ElementalDataOrbHolder tHatch : mDataHolders) { - tHatch.mRecipeMap = getRecipeMap(); - if (isValidMetaTileEntity(tHatch)) { - ArrayList<ItemStack> aTempList = new ArrayList(); - for (ItemStack s : tHatch.mInventory) { - aTempList.add(s); - } - tItems.addAll(aTempList); - } - } - return tItems; - } - - - - - -} -*/ diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java deleted file mode 100644 index acfa1e7c5a..0000000000 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java +++ /dev/null @@ -1,632 +0,0 @@ -package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production; - -import java.util.ArrayList; -import java.util.Collection; - -import com.gtnewhorizon.structurelib.structure.IStructureDefinition; -import com.gtnewhorizon.structurelib.structure.StructureDefinition; -import gregtech.api.enums.Materials; -import gregtech.api.enums.TAE; -import gregtech.api.enums.Textures; -import gregtech.api.interfaces.ITexture; -import gregtech.api.interfaces.metatileentity.IMetaTileEntity; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.metatileentity.implementations.*; -import gregtech.api.objects.GT_ItemStack; -import gregtech.api.objects.GT_RenderedTexture; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_Recipe; -import gregtech.api.util.GTPP_Recipe; -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.block.ModBlocks; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.material.ELEMENT; -import gtPlusPlus.core.material.nuclear.FLUORIDES; -import gtPlusPlus.core.material.nuclear.NUCLIDE; -import gtPlusPlus.core.util.math.MathUtils; -import gtPlusPlus.core.util.minecraft.FluidUtils; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; - -import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; -import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; -import static gregtech.api.util.GT_StructureUtility.ofHatchAdder; - -public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase { - - protected int fuelConsumption = 0; - protected int fuelValue = 0; - protected int fuelRemaining = 0; - protected boolean boostEu = false; - protected boolean heliumSparging = false; - private int mCasing; - private IStructureDefinition<GregtechMTE_NuclearReactor> STRUCTURE_DEFINITION = null; - - - public GregtechMTE_NuclearReactor(final int aID, final String aName, final String aNameRegional) { - super(aID, aName, aNameRegional); - } - - public GregtechMTE_NuclearReactor(final String aName) { - super(aName); - } - - @Override - public long maxEUStore() { - return (640000000L * (Math.min(16, this.mEnergyHatches.size()))) / 16L; - } - - @Override - public String getMachineType() { - return "Reactor"; - } - - @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); - tt.addMachineType(getMachineType()) - .addInfo("Controller Block for the Liquid Fluoride Thorium Reactor.") - .addInfo("Produces Heat & Energy from Radioactive Beta Decay.") - .addInfo("Outputs U233 every 10 seconds, on average") - .addInfo("Input Fluorine and Helium for bonus byproducts") - .addInfo("Input Li2BeF4 and a molten salt as fuel.") - .addInfo("LiFBeF2ThF4UF4, LiFBeF2ZrF4UF4 or LiFBeF2ZrF4U235") - .addPollutionAmount(getPollutionPerSecond(null)) - .addSeparator() - .beginStructureBlock(7, 4, 7, true) - .addController("Bottom Center") - .addCasingInfo("Hastelloy-N Reactor Casing", 27) - .addCasingInfo("Zeron-100 Reactor Shielding", 26) - .addInputHatch("Top or bottom layer edges", 1) - .addOutputHatch("Top or bottom layer edges", 1) - .addDynamoHatch("Top or bottom layer edges", 1) - .addMaintenanceHatch("Top or bottom layer edges", 1) - .addMufflerHatch("Top 3x3", 2) - .addStructureInfo("All hatches must have IV+ tier.") - .addStructureInfo("10+ Output Hatches, 4+ Input Hatches, 4x Dynamo Hatches") - .addStructureInfo("2x Maintenance Hatches, 4x Mufflers") - .toolTipFinisher("GT++"); - return tt; - } - - @Override - public String[] getExtraInfoData() { - final String tRunning = (this.mMaxProgresstime>0 ? "Reactor running":"Reactor stopped"); - final String tMaintainance = (this.getIdealStatus() == this.getRepairStatus() ? "No Maintainance issues" : "Needs Maintainance"); - - return new String[]{ - "Liquid Fluoride Thorium Reactor", - tRunning, - tMaintainance, - "Current Output: "+this.mEUt+" EU/t", - "Fuel Consumption: "+this.fuelConsumption+"L/t", - "Fuel Value: "+this.fuelValue+" EU/L", - "Fuel Remaining: "+this.fuelRemaining+" Litres", - "Current Efficiency: "+(this.mEfficiency/5)+"%", - "Current Efficiency (Raw): "+(this.mEfficiency), - "Boosted Output: "+this.boostEu+".", - "Boosted Output gives 4x EU/t for double fuel usage.", - "It requires you to have 100% Efficiency."}; - } - - @Override - public boolean allowCoverOnSide(final byte aSide, final GT_ItemStack aStack) { - return aSide != this.getBaseMetaTileEntity().getFrontFacing(); - } - - @Override - public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte aFacing, final byte aColorIndex, final boolean aActive, final boolean aRedstone) { - if (!aBaseMetaTileEntity.isActive() || this.mEfficiency < 500){ - if (aSide == aFacing) { - return new ITexture[]{Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(12)), - new GT_RenderedTexture(aActive ? Textures.BlockIcons.OVERLAY_FRONT_REPLICATOR_ACTIVE : Textures.BlockIcons.OVERLAY_FRONT_REPLICATOR)}; - } - return new ITexture[]{Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(12))}; - } - else if(aBaseMetaTileEntity.isActive() && this.mEfficiency >= 500){ - if (aSide == aFacing) { - return new ITexture[]{Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(13)), - new GT_RenderedTexture(aActive ? Textures.BlockIcons.OVERLAY_FRONT_REPLICATOR_ACTIVE : Textures.BlockIcons.OVERLAY_FRONT_REPLICATOR)}; - } - return new ITexture[]{Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(13))}; - } - return new ITexture[]{Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(12))}; - - } - - @Override - public boolean hasSlotInGUI() { - return false; - } - - @Override - public String getCustomGUIResourceName() { - return "MatterFabricator"; - } - - public final boolean addNuclearReactorEdgeList(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) { - if (aTileEntity == null) { - return false; - } else { - IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mMaintenanceHatches.add((GT_MetaTileEntity_Hatch_Maintenance)aMetaTileEntity); - } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Dynamo && ((GT_MetaTileEntity_Hatch_Dynamo) aMetaTileEntity).mTier >= 5){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mDynamoHatches.add((GT_MetaTileEntity_Hatch_Dynamo)aMetaTileEntity); - } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input && ((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity).mTier >= 5) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mInputHatches.add((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity); - } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Output && ((GT_MetaTileEntity_Hatch_Output) aMetaTileEntity).mTier >= 5) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mOutputHatches.add((GT_MetaTileEntity_Hatch_Output) aMetaTileEntity); - } - } - return false; - } - - public final boolean addNuclearReactorTopList(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) { - if (aTileEntity == null) { - return false; - } else { - IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Muffler && ((GT_MetaTileEntity_Hatch_Muffler) aMetaTileEntity).mTier >= 5) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mMufflerHatches.add((GT_MetaTileEntity_Hatch_Muffler) aMetaTileEntity); - } - } - return false; - } - - @Override - public IStructureDefinition<GregtechMTE_NuclearReactor> getStructureDefinition() { - if (STRUCTURE_DEFINITION == null) { - STRUCTURE_DEFINITION = StructureDefinition.<GregtechMTE_NuclearReactor>builder() - .addShape(mName, transpose(new String[][]{ - {"CCCCCCC", "COOOOOC", "COXXXOC", "COXXXOC", "COXXXOC", "COOOOOC", "CCCCCCC"}, - {"GGGGGGG", "G-----G", "G-----G", "G-----G", "G-----G", "G-----G", "GGGGGGG"}, - {"GGGGGGG", "G-----G", "G-----G", "G-----G", "G-----G", "G-----G", "GGGGGGG"}, - {"CCC~CCC", "COOOOOC", "COOOOOC", "COOOOOC", "COOOOOC", "COOOOOC", "CCCCCCC"}, - })) - .addElement( - 'C', - ofChain( - ofHatchAdder( - GregtechMTE_NuclearReactor::addNuclearReactorEdgeList, TAE.GTPP_INDEX(12), 1 - ), - onElementPass( - x -> ++x.mCasing, - ofBlock( - ModBlocks.blockCasingsMisc, 12 - ) - ) - ) - ) - .addElement( - 'X', - ofChain( - ofHatchAdder( - GregtechMTE_NuclearReactor::addNuclearReactorTopList, TAE.GTPP_INDEX(12), 2 - ), - onElementPass( - x -> ++x.mCasing, - ofBlock( - ModBlocks.blockCasingsMisc, 12 - ) - ) - ) - - ) - .addElement( - 'O', - ofBlock( - ModBlocks.blockCasingsMisc, 12 - ) - ) - .addElement( - 'G', - ofBlock( - ModBlocks.blockCasingsMisc, 13 - ) - ) - .build(); - } - return STRUCTURE_DEFINITION; - } - - @Override - public void construct(ItemStack stackSize, boolean hintsOnly) { - buildPiece(mName , stackSize, hintsOnly, 3, 3, 0); - } - - @Override - public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) { - mCasing = 0; - if (checkPiece(mName, 3, 3, 0) && mCasing >= 27) { - if (mOutputHatches.size() >= 10 && mInputHatches.size() >= 4 && mDynamoHatches.size() == 4 && - mMufflerHatches.size() == 4 && mMaintenanceHatches.size() == 2) { - this.mWrench = true; - this.mScrewdriver = true; - this.mSoftHammer = true; - this.mHardHammer = true; - this.mSolderingTool = true; - this.mCrowbar = true; - this.turnCasingActive(false); - return true; - } - } - return false; - } - - // Alk's Life Lessons from Greg. - /* - [23:41:15] <GregoriusTechneticies> xdir and zdir are x2 and not x3 - [23:41:26] <GregoriusTechneticies> thats you issue - [23:44:33] <Alkalus> mmm? - [23:44:49] <Alkalus> Should they be x3? - [23:44:50] <GregoriusTechneticies> you just do a x2, what is for a 5x5 multiblock - [23:45:01] <GregoriusTechneticies> x3 is for a 7x7 one - [23:45:06] <Alkalus> I have no idea what that value does, tbh.. - [23:45:15] <GregoriusTechneticies> its the offset - [23:45:23] <Alkalus> Debugging checkMachine has been a pain and I usually trash designs that don't work straight up.. - [23:45:28] <GregoriusTechneticies> it determines the horizontal middle of the multiblock - [23:45:47] <GregoriusTechneticies> which is in your case THREE blocks away from the controller - [23:45:51] <Alkalus> Ahh - [23:45:57] <GregoriusTechneticies> and not 2 - [23:46:06] <Alkalus> Noted, thanks :D - */ - - @Override - public boolean isCorrectMachinePart(final ItemStack aStack) { - return true; - } - - @Override - public int getMaxEfficiency(final ItemStack aStack) { - return this.boostEu ? 30000 : 10000; - } - - @Override - public int getPollutionPerSecond(final ItemStack aStack) { - if (this.boostEu) return CORE.ConfigSwitches.pollutionPerSecondMultiNuclearReactor_ModeBoosted; - return CORE.ConfigSwitches.pollutionPerSecondMultiNuclearReactor_ModeNormal; - } - - @Override - public int getDamageToComponent(final ItemStack aStack) { - return 0; - } - - @Override - public boolean explodesOnComponentBreak(final ItemStack aStack) { - return true; - } - - @Override - public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return new GregtechMTE_NuclearReactor(this.mName); - } - - public static int overclock(final int mStartEnergy) { - return mStartEnergy < 160000000 ? 4 : mStartEnergy < 320000000 ? 2 : 1; - } - - public boolean turnCasingActive(final boolean status) { - //TODO - if (this.mDynamoHatches != null) { - for (final GT_MetaTileEntity_Hatch_Dynamo hatch : this.mDynamoHatches) { - hatch.mMachineBlock = status ? (byte) TAE.GTPP_INDEX(13) : (byte) TAE.GTPP_INDEX(12); - } - } - if (this.mMufflerHatches != null) { - for (final GT_MetaTileEntity_Hatch_Muffler hatch : this.mMufflerHatches) { - hatch.mMachineBlock = status ? (byte) TAE.GTPP_INDEX(13) : (byte) TAE.GTPP_INDEX(12); - } - } - if (this.mOutputHatches != null) { - for (final GT_MetaTileEntity_Hatch_Output hatch : this.mOutputHatches) { - hatch.mMachineBlock = status ? (byte) TAE.GTPP_INDEX(13) : (byte) TAE.GTPP_INDEX(12); - } - } - if (this.mInputHatches != null) { - for (final GT_MetaTileEntity_Hatch_Input hatch : this.mInputHatches) { - hatch.mMachineBlock = status ? (byte) TAE.GTPP_INDEX(13) : (byte) TAE.GTPP_INDEX(12); - } - } - if (this.mMaintenanceHatches != null) { - for (final GT_MetaTileEntity_Hatch_Maintenance hatch : this.mMaintenanceHatches) { - hatch.mMachineBlock = status ? (byte) TAE.GTPP_INDEX(13) : (byte) TAE.GTPP_INDEX(12); - } - } - return true; - } - - @Override - public boolean checkRecipe(final ItemStack aStack) { - final ArrayList<FluidStack> tFluids = this.getStoredFluids(); - final Collection<GT_Recipe> tRecipeList = GTPP_Recipe.GTPP_Recipe_Map.sLiquidFluorineThoriumReactorRecipes.mRecipeList; - if((tFluids.size() > 0) && (tRecipeList != null)) { //Does input hatch have a LFTR fuel? - Logger.WARNING("Found more than one input fluid and a list of valid recipes."); - for (final FluidStack hatchFluid1 : tFluids) { //Loops through hatches - Logger.WARNING("Looping through Input hatches - Found "+hatchFluid1.getLocalizedName()); - for(final GT_Recipe aFuel : tRecipeList) { //Loops through LFTR fuel recipes - Logger.WARNING("Looping through Recipes. "+aFuel.mSpecialValue); - FluidStack tLiquid; - final FluidStack testStack = aFuel.mFluidInputs[1]; - if ((tLiquid = testStack) != null) { //Create fluidstack from current recipe - Logger.WARNING("Creating a fluidstack from the current recipe. "+testStack.getLocalizedName()); - if (hatchFluid1.isFluidEqual(tLiquid)) { //Has a LFTR fluid - this.fuelConsumption = this.boostEu ? (aFuel.mSpecialValue/4096) : (aFuel.mSpecialValue/2048); //Calc fuel consumption - - this.mMaxProgresstime = 500; - - if(tFluids.contains(NUCLIDE.LiFBeF2ThF4UF4.getFluid(1)) || - tFluids.contains(NUCLIDE.LiFBeF2ZrF4UF4.getFluid(2)) || - tFluids.contains(NUCLIDE.LiFBeF2ZrF4U235.getFluid(10))) { //Has a Primary fuel salt? - //Deplete Primary Salt. 1000L should = 1 hour of runtime (if baseEU = 2048) && using 1l each time - if(((this.mRuntime % 72) == 0) || (this.mRuntime == 0)){ - //U235 fuel is 10x less efficient than UF4 with Thorium, UF4 with Zirconium is only 2x less efficient than UF4 with Thorium. - //Most Efficient - if(tFluids.contains(NUCLIDE.LiFBeF2ThF4UF4.getFluid(2))){ - - FluidStack depletionStack = FluidUtils.getFluidStack(tLiquid, (this.boostEu ? (aFuel.mSpecialValue/4096) : (aFuel.mSpecialValue/2048))); - Logger.WARNING("Input hatch contains some FLiBe Fuel, using "+this.fuelConsumption+" | "+aFuel.mSpecialValue+" | "+depletionStack.amount); - if(this.depleteInput(depletionStack)) { //Deplete that amount - Logger.WARNING("Depleted some FLiBe fluid"); - } - - this.depleteInput(NUCLIDE.LiFBeF2ThF4UF4.getFluid(this.boostEu ? 2 : 1)); - Logger.WARNING("Depleted "+(this.boostEu ? 2 : 1)+"L of LiFBeF2ThF4UF4 fluid"); - } - //1/2 as Efficient - if (tFluids.contains(NUCLIDE.LiFBeF2ZrF4UF4.getFluid(4))){ - - FluidStack depletionStack = FluidUtils.getFluidStack(tLiquid, (this.boostEu ? (aFuel.mSpecialValue/4096) : (aFuel.mSpecialValue/2048))); - Logger.WARNING("Input hatch contains some FLiBe Fuel, using "+this.fuelConsumption+" | "+aFuel.mSpecialValue+" | "+depletionStack.amount); - if(this.depleteInput(depletionStack)) { //Deplete that amount - Logger.WARNING("Depleted some FLiBe fluid"); - } - - this.depleteInput(NUCLIDE.LiFBeF2ZrF4UF4.getFluid(this.boostEu ? 4 : 2)); - Logger.WARNING("Depleted "+(this.boostEu ? 4 : 2)+"L of LiFBeF2ZrF4UF4 fluid"); - } - //10x less Efficient. - if (tFluids.contains(NUCLIDE.LiFBeF2ZrF4U235.getFluid(20))) { - - FluidStack depletionStack = FluidUtils.getFluidStack(tLiquid, (this.boostEu ? (aFuel.mSpecialValue/4096) : (aFuel.mSpecialValue/2048))); - Logger.WARNING("Input hatch contains some FLiBe Fuel, using "+this.fuelConsumption+" | "+aFuel.mSpecialValue+" | "+depletionStack.amount); - if(this.depleteInput(depletionStack)) { //Deplete that amount - Logger.WARNING("Depleted some FLiBe fluid"); - } - - this.depleteInput(NUCLIDE.LiFBeF2ZrF4U235.getFluid(this.boostEu ? 20 : 10)); - Logger.WARNING("Depleted "+(this.boostEu ? 20 : 10)+"L of LiFBeF2ZrF4U235 fluid"); - } - } - } else { - return false; - } - - - if (this.getBaseMetaTileEntity().getWorld().getTotalWorldTime() % 100 == 0) { - //Try Sparge Noble Gases - if (this.heliumSparging){ - if (this.depleteInput(Materials.Helium.getGas(1000L))){ - //Make an empty fluid stack for possible sparging output - FluidStack[] spargeOutput = new FluidStack[]{}; - Logger.WARNING("Doing a Sparge with Helium - "+this.heliumSparging); - this.heliumSparging = false; - spargeOutput = this.getByproductsOfSparge(Materials.Helium.getGas(1000L)); - - //If Sparging occurred, try add the outputs to the output hatches. - try { - if (spargeOutput.length >= 1){ - for (final FluidStack F : spargeOutput){ - Logger.WARNING("Adding Sparge Output - "+F.getLocalizedName()); - this.addOutput(F); - } - } - } catch (final Throwable T){} - } - } - //Try Sparge Fluorides - else { - if (this.depleteInput(Materials.Fluorine.getGas(100L))){ - //Make an empty fluid stack for possible sparging output - FluidStack[] spargeOutput = new FluidStack[]{}; - Logger.WARNING("Doing a Sparge with Fluorine"); - spargeOutput = this.getByproductsOfSparge(Materials.Fluorine.getGas(100L)); - this.heliumSparging = true; - //If Sparging occurred, try add the outputs to the output hatches. - if (spargeOutput.length > 0){ - for (final FluidStack F : spargeOutput){ - Logger.WARNING("Adding Sparge Output - "+F.getLocalizedName()); - this.addOutput(F); - } - } - } - } - } - - - if (aFuel != null){ - //Utils.LOG_WARNING("Saving previous Recipe."); - //this.mLastRecipe = aFuel; - } - - this.fuelValue = aFuel.mSpecialValue; - this.fuelRemaining = hatchFluid1.amount; //Record available fuel - - if (this.mEfficiency < 500){ - this.mEfficiency++; - this.mMaxProgresstime = 500; - } - else if (this.mEfficiency == 500) { - this.mMaxProgresstime = 300; - } - else if (this.mEfficiency > 500){ - this.mEfficiency = 500; - } - Logger.WARNING("Efficiency == "+this.mEfficiency); - - this.mEUt = (this.mEfficiency < 500 ? 2048 : (8196)); //Output 0 if startup is less than 20% - Logger.WARNING("Generating "+this.mEUt+"EU/t @ an efficiency level of "+this.mEfficiency); - - this.mProgresstime = 1; - this.mMaxProgresstime = 1; - this.mEfficiencyIncrease = 15; - - //Best output some Fluids - //this.mOutputFluids = this.mLastRecipe.mFluidOutputs; - - return true; - } - } - } - } - } - this.mEUt = 0; - this.mEfficiency = 0; - return false; - } - - @Override - public int getMaxParallelRecipes() { - return 1; - } - - @Override - public int getEuDiscountForParallelism() { - return 0; - } - - public int getAmountOfOutputs() { - return 10; - } - - @Override - public void explodeMultiblock() { - this.mInventory[1] = null; - long explodevalue = MathUtils.randLong(Integer.MAX_VALUE, 8589934588L); - for (final MetaTileEntity tTileEntity : this.mInputBusses) { - explodevalue = MathUtils.randLong(Integer.MAX_VALUE, 8589934588L); - tTileEntity.getBaseMetaTileEntity().doExplosion(explodevalue); - } - for (final MetaTileEntity tTileEntity : this.mOutputBusses) { - explodevalue = MathUtils.randLong(Integer.MAX_VALUE, 8589934588L); - tTileEntity.getBaseMetaTileEntity().doExplosion(explodevalue); - } - for (final MetaTileEntity tTileEntity : this.mInputHatches) { - explodevalue = MathUtils.randLong(Integer.MAX_VALUE, 8589934588L); - tTileEntity.getBaseMetaTileEntity().doExplosion(explodevalue); - } - for (final MetaTileEntity tTileEntity : this.mOutputHatches) { - explodevalue = MathUtils.randLong(Integer.MAX_VALUE, 8589934588L); - tTileEntity.getBaseMetaTileEntity().doExplosion(explodevalue); - } - for (final MetaTileEntity tTileEntity : this.mDynamoHatches) { - explodevalue = MathUtils.randLong(Integer.MAX_VALUE, 8589934588L); - tTileEntity.getBaseMetaTileEntity().doExplosion(explodevalue); - } - for (final MetaTileEntity tTileEntity : this.mMufflerHatches) { - explodevalue = MathUtils.randLong(Integer.MAX_VALUE, 8589934588L); - tTileEntity.getBaseMetaTileEntity().doExplosion(explodevalue); - } - for (final MetaTileEntity tTileEntity : this.mEnergyHatches) { - explodevalue = MathUtils.randLong(Integer.MAX_VALUE, 8589934588L); - tTileEntity.getBaseMetaTileEntity().doExplosion(explodevalue); - } - for (final MetaTileEntity tTileEntity : this.mMaintenanceHatches) { - explodevalue = MathUtils.randLong(Integer.MAX_VALUE, 8589934588L); - tTileEntity.getBaseMetaTileEntity().doExplosion(explodevalue); - } - explodevalue = MathUtils.randLong(Integer.MAX_VALUE, 8589934588L); - this.getBaseMetaTileEntity().doExplosion(explodevalue); - } - - - protected FluidStack[] getByproductsOfSparge(final FluidStack spargeGas){ - FluidStack[] outputArrayOfGases = new FluidStack[]{}; - if (spargeGas != null){ - if (spargeGas.isFluidEqual(Materials.Helium.getGas(1000))){ - final int outputChances[] = { - MathUtils.roundToClosestInt(MathUtils.randInt(10, 1000)/10), - MathUtils.roundToClosestInt(MathUtils.randInt(10, 600)/10), - MathUtils.roundToClosestInt(MathUtils.randInt(10, 400)/10), - MathUtils.roundToClosestInt(MathUtils.randInt(10, 1000)/10), - MathUtils.roundToClosestInt(MathUtils.randInt(10, 100)/10) - }; - final int heliumContent = (1000-outputChances[0]-outputChances[1]-outputChances[2]-outputChances[3]-outputChances[4]); - Logger.WARNING("Helium remaining: "+heliumContent); - outputArrayOfGases = new FluidStack[]{ - ELEMENT.getInstance().XENON.getFluid(outputChances[0]), - ELEMENT.getInstance().NEON.getFluid(outputChances[1]), - ELEMENT.getInstance().ARGON.getFluid(outputChances[2]), - ELEMENT.getInstance().KRYPTON.getFluid(outputChances[3]), - ELEMENT.getInstance().RADON.getFluid(outputChances[4]), - Materials.Helium.getGas(heliumContent) - }; - } - else if (spargeGas.isFluidEqual(Materials.Fluorine.getGas(100))){ - final int outputChances[] = { - MathUtils.roundToClosestInt(MathUtils.randDouble(10, 100)), - MathUtils.roundToClosestInt(MathUtils.randDouble(1, 50)/10), - MathUtils.roundToClosestInt(MathUtils.randDouble(1, 50)/10), - MathUtils.roundToClosestInt(MathUtils.randDouble(1, 50)/10) - }; - final int fluorineContent = (100-outputChances[0]-outputChances[1]-outputChances[2]-outputChances[3]); - Logger.WARNING("Fluorine remaining: "+fluorineContent); - outputArrayOfGases = new FluidStack[]{ - FLUORIDES.LITHIUM_FLUORIDE.getFluid(outputChances[0]), - FLUORIDES.NEPTUNIUM_HEXAFLUORIDE.getFluid(outputChances[1]), - FLUORIDES.TECHNETIUM_HEXAFLUORIDE.getFluid(outputChances[2]), - FLUORIDES.SELENIUM_HEXAFLUORIDE.getFluid(outputChances[3]), - Materials.Fluorine.getGas(fluorineContent) - }; - } - } - return outputArrayOfGases; - } - - @Override - public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { - //Add Power if active - if (aBaseMetaTileEntity.isActive()){ - //this.getBaseMetaTileEntity().increaseStoredEnergyUnits(this.mEUt, false); - - if (this.mEfficiency >= 500){ - this.boostEu = true; - this.turnCasingActive(true); - } - else { - this.boostEu = false; - this.turnCasingActive(false); - } - - if (MathUtils.randInt(1, 200) == 1){ - //Utils.LOG_INFO("Adding U233"); - this.addOutput(ELEMENT.getInstance().URANIUM233.getFluid(MathUtils.randInt(1, 10))); - } - - if (this.mDynamoHatches != null) { - for (GT_MetaTileEntity_Hatch_Dynamo tHatch : this.mDynamoHatches) { - if (tHatch.mTier >= 5){ - if (isValidMetaTileEntity(tHatch)){ - tHatch.getBaseMetaTileEntity().increaseStoredEnergyUnits(this.mEUt, false); - //Utils.LOG_WARNING("Adding "+this.mEUt+"eu to internal storage of dynamo "+hatchNo+"."); - } - } - } - } - - } - else { - this.turnCasingActive(false); - } - super.onPostTick(aBaseMetaTileEntity, aTick); - } - -} diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/misc/AddCustomMachineToPA.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/misc/AddCustomMachineToPA.java deleted file mode 100644 index e84ce73a47..0000000000 --- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/misc/AddCustomMachineToPA.java +++ /dev/null @@ -1,51 +0,0 @@ -package gtPlusPlus.xmod.gregtech.loaders.misc; - -import java.lang.reflect.Method; - -import gregtech.api.util.GTPP_Recipe; -import gregtech.api.util.GT_Recipe.GT_Recipe_Map; -import gtPlusPlus.core.util.reflect.ReflectionUtils; - -public class AddCustomMachineToPA { - - private static final boolean sDoesPatchExist; - private static final Class sManagerPA; - private static final Method sRegisterRecipeMapForMeta; - - static { - sDoesPatchExist = ReflectionUtils.doesClassExist("gregtech.api.util.GT_ProcessingArray_Manager"); - if (sDoesPatchExist) { - sManagerPA = ReflectionUtils.getClass("gregtech.api.util.GT_ProcessingArray_Manager"); - sRegisterRecipeMapForMeta = ReflectionUtils.getMethod(sManagerPA, "registerRecipeMapForMeta", int.class, GT_Recipe_Map.class); - } - else { - sManagerPA = null; - sRegisterRecipeMapForMeta = null; - } - } - - public static final void registerRecipeMapForID(int aID, GT_Recipe_Map aMap) { - if (sDoesPatchExist) { - ReflectionUtils.invokeNonBool(null, sRegisterRecipeMapForMeta, new Object[] {aID, aMap}); - } - - } - - public static final void registerRecipeMapBetweenRangeOfIDs(int aMin, int aMax, GT_Recipe_Map aMap) { - if (sDoesPatchExist) { - for (int i=aMin; i<=aMax;i++) { - ReflectionUtils.invokeNonBool(null, sRegisterRecipeMapForMeta, new Object[] {i, aMap}); - //GT_ProcessingArray_Manager.registerRecipeMapForMeta(i, aMap); - } - } - } - - public static void register() { - - // Simple Washers - registerRecipeMapForID(767, GTPP_Recipe.GTPP_Recipe_Map.sSimpleWasherRecipes); - registerRecipeMapBetweenRangeOfIDs(31017, 31020, GTPP_Recipe.GTPP_Recipe_Map.sSimpleWasherRecipes); - - } - -} diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_LFTR.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_LFTR.java deleted file mode 100644 index 424c2ecce5..0000000000 --- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_LFTR.java +++ /dev/null @@ -1,98 +0,0 @@ -package gtPlusPlus.xmod.gregtech.loaders.recipe; - -import java.util.Collection; - -import net.minecraft.item.ItemStack; - -import gregtech.api.util.GT_Recipe; -import gregtech.api.util.GTPP_Recipe; - -import gtPlusPlus.api.objects.minecraft.NoConflictGTRecipeMap; -import gtPlusPlus.core.recipe.common.CI; -import gtPlusPlus.core.util.minecraft.FluidUtils; -import net.minecraftforge.fluids.FluidStack; - -public class RecipeLoader_LFTR { - - - protected final static NoConflictGTRecipeMap mRecipesLFTR = new NoConflictGTRecipeMap(); - - public static Collection<GT_Recipe> getRecipes(){ - return mRecipesLFTR.getRecipeMap(); - } - - public static void generate() { - // Fli2BeF4 + Thorium TetraFluoride = Uranium233 - //72k Ticks/hr - //1l/4t = 1000l/hr - //1l/40t = 1000l/10hr (Probably better) LiFBeF2ThF4UF4 - //1l/20t= 1000l/2.5hr LiFBeF2ZrF4UF4 - //1l/10t= 1000l/2.5hr LiFBeF2ZrF4U235 - - //LiFBeF2ThF4UF4 - GT_Recipe LFTR1 = new GTPP_Recipe( - true, - new ItemStack[] {CI.getNumberedCircuit(1)}, - new ItemStack[] {}, - null, new int[] {5000, 2500}, - new FluidStack[] { - FluidUtils.getFluidStack("molten.li2bef4", 34), - FluidUtils.getFluidStack("molten.LiFBeF2ThF4UF4".toLowerCase(), 17) - }, - new FluidStack[] { - FluidUtils.getFluidStack("molten.uraniumhexafluoride", 10), - FluidUtils.getFluidStack("molten.uraniumhexafluoride", 5) - }, - 12000,//time - 0,//cost - 4096//fuel value - ); - - //LiFBeF2ZrF4UF4 - GT_Recipe LFTR2 = new GTPP_Recipe( - true, - new ItemStack[] {CI.getNumberedCircuit(2)}, - new ItemStack[] {}, - null, new int[] {2500, 1250}, - new FluidStack[] { - FluidUtils.getFluidStack("molten.li2bef4", 34), - FluidUtils.getFluidStack("molten.LiFBeF2ZrF4UF4".toLowerCase(), 17) - }, - new FluidStack[] { - FluidUtils.getFluidStack("molten.uraniumhexafluoride", 4), - FluidUtils.getFluidStack("molten.uraniumhexafluoride", 2) - }, - 6000,//time - 0,//cost - 4096//fuel value - ); - - //LiFBeF2ZrF4U235 - GT_Recipe LFTR3 = new GTPP_Recipe( - true, - new ItemStack[] {CI.getNumberedCircuit(3)}, - new ItemStack[] {}, - null, new int[] {1000, 500}, - new FluidStack[] { - FluidUtils.getFluidStack("molten.li2bef4", 34), - FluidUtils.getFluidStack("molten.LiFBeF2ZrF4U235".toLowerCase(), 17) - }, - new FluidStack[] { - FluidUtils.getFluidStack("molten.uraniumhexafluoride", 2), - FluidUtils.getFluidStack("molten.uraniumhexafluoride", 1) - }, - 3000,//time - 0,//cost - 4096//fuel value - ); - - /*mRecipesLFTR.add(LFTR1); - mRecipesLFTR.add(LFTR2); - mRecipesLFTR.add(LFTR3);*/ - GTPP_Recipe.GTPP_Recipe_Map.sLiquidFluorineThoriumReactorRecipesEx.add(LFTR1); - GTPP_Recipe.GTPP_Recipe_Map.sLiquidFluorineThoriumReactorRecipesEx.add(LFTR2); - GTPP_Recipe.GTPP_Recipe_Map.sLiquidFluorineThoriumReactorRecipesEx.add(LFTR3); - - - } -} diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLFTR.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLFTR.java deleted file mode 100644 index a9eee53a7c..0000000000 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLFTR.java +++ /dev/null @@ -1,27 +0,0 @@ -package gtPlusPlus.xmod.gregtech.registration.gregtech; - -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GregtechMTE_NuclearReactor; - -public class GregtechLFTR { - - public static void run() { - if (gtPlusPlus.core.lib.LoadedMods.Gregtech) { - Logger.INFO("Gregtech5u Content | Registering Liquid Fluorine Thorium Reactor [LFTR]."); - if (CORE.ConfigSwitches.enableMultiblock_LiquidFluorideThoriumReactor) { - run1(); - } - } - - } - - private static void run1() { - // LFTR - GregtechItemList.ThoriumReactor - .set(new GregtechMTE_NuclearReactor(751, "lftr.controller.single", "Thorium Reactor [LFTR]") - .getStackForm(1L)); - - } -} diff --git a/src/Java/gregtech/api/enums/TAE.java b/src/main/java/gregtech/api/enums/TAE.java index e8fd31d89e..e8fd31d89e 100644 --- a/src/Java/gregtech/api/enums/TAE.java +++ b/src/main/java/gregtech/api/enums/TAE.java diff --git a/src/Java/gregtech/api/util/EmptyRecipeMap.java b/src/main/java/gregtech/api/util/EmptyRecipeMap.java index 31e1e3db17..31e1e3db17 100644 --- a/src/Java/gregtech/api/util/EmptyRecipeMap.java +++ b/src/main/java/gregtech/api/util/EmptyRecipeMap.java diff --git a/src/Java/gregtech/api/util/FishPondFakeRecipe.java b/src/main/java/gregtech/api/util/FishPondFakeRecipe.java index bc7cdb4701..bc7cdb4701 100644 --- a/src/Java/gregtech/api/util/FishPondFakeRecipe.java +++ b/src/main/java/gregtech/api/util/FishPondFakeRecipe.java diff --git a/src/Java/gregtech/api/util/GTPP_Recipe.java b/src/main/java/gregtech/api/util/GTPP_Recipe.java index bcbbb93007..1d04e8af6e 100644 --- a/src/Java/gregtech/api/util/GTPP_Recipe.java +++ b/src/main/java/gregtech/api/util/GTPP_Recipe.java @@ -328,7 +328,7 @@ public class GTPP_Recipe extends GT_Recipe implements IComparableRecipe { */ public static final Collection<GTPP_Recipe_Map> sMappings = new ArrayList<>(); //public static final GT_Recipe_Map sChemicalBathRecipes = new GT_Recipe_Map(new HashSet<GT_Recipe>(200), "gtpp.recipe.chemicalbath", "Chemical Bath", null, RES_PATH_GUI + "basicmachines/ChemicalBath", 1, 3, 1, 1, 1, E, 1, E, true, true); - public static final GTPP_Recipe_Map_Internal sCokeOvenRecipes = new GTPP_Recipe_Map_Internal(new HashSet<GT_Recipe>(200), "gtpp.recipe.cokeoven", "Coke Oven", null, RES_PATH_GUI + "basicmachines/Dehydrator", 2, 2, 1, 0, 1, E, 1, E, true, true); + public static final GTPP_Recipe_Map_Internal sCokeOvenRecipes = new GTPP_Recipe_Map_Internal(new HashSet<GT_Recipe>(200), "gtpp.recipe.cokeoven", "Coke Oven", null, RES_PATH_GUI + "basicmachines/Dehydrator", 2, 9, 1, 0, 1, E, 1, E, true, true); public static final GTPP_Recipe_Map_Internal sMatterFab2Recipes = new GTPP_Recipe_Map_Internal(new HashSet<GT_Recipe>(200), "gtpp.recipe.matterfab2", "Matter Fabricator", null, RES_PATH_GUI + "basicmachines/Default", 9, 9, 0, 0, 1, E, 1, E, true, true); //public static final Gregtech_Recipe_Map sMatterFabRecipes = new Gregtech_Recipe_Map(new HashSet<GregtechRecipe>(200), "gtpp.recipe.matterfab", "Matter Fabricator", null, RES_PATH_GUI + "basicmachines/Massfabricator", 1, 3, 1, 1, 1, E, 1, E, true, true); @@ -341,22 +341,27 @@ public class GTPP_Recipe extends GT_Recipe implements IComparableRecipe { public static final GTPP_Recipe_Map_Internal sSteamTurbineFuels = new GTPP_Recipe_Map_Internal(new HashSet<GT_Recipe>(10), "gtpp.recipe.steamturbinefuel", "GeoThermal Fuel", null, RES_PATH_GUI + "basicmachines/Default", 1, 1, 0, 0, 1, "Fuel Value: ", 1000, " EU", true, true); //LFTR recipes - public static final GTPP_Recipe_Map_Internal sLiquidFluorineThoriumReactorRecipes = new GTPP_Recipe_Map_Internal(new HashSet<GT_Recipe>(50), "gtpp.recipe.lftr", "Liquid Fluoride Thorium Reactor", null, RES_PATH_GUI + "basicmachines/LFTR", 0, 0, 0, 2, 1, "Start: ", 1, " EU", true, true); - public static final GTPP_Recipe_Map_Internal sLiquidFluorineThoriumReactorRecipesEx = new GTPP_Recipe_Map_Internal(new NoConflictGTRecipeMap(), "gtpp.recipe.lftr.2", "Liquid Fluoride Thorium Reactor", null, RES_PATH_GUI + "basicmachines/LFTR", 0, 0, 0, 2, 1, "Start: ", 1, " EU", true, true); + public static final GTPP_Recipe_Map_Internal sLiquidFluorineThoriumReactorRecipes = new GTPP_Recipe_Map_Internal(new HashSet<GT_Recipe>(50), "gtpp.recipe.lftr", "Liquid Fluoride Thorium Reactor", null, RES_PATH_GUI + "basicmachines/FissionFuel", 0, 0, 0, 2, 0, "Power: ", 1, " EU/t per Dynamo", true, true); // Ore Milling Map public static final GTPP_Recipe_Map_Internal sOreMillRecipes = new GTPP_Recipe_Map_Internal(new HashSet<GT_Recipe>(10000), "gtpp.recipe.oremill", "Milling", null, RES_PATH_GUI + "basicmachines/LFTR", 3, 4, 1, 0, 1, E, 1, E, true, false); //Fission Fuel Plant Recipes public static final GTPP_Recipe_Map_Internal sFissionFuelProcessing = new GTPP_Recipe_Map_Internal(new HashSet<GT_Recipe>(50), "gtpp.recipe.fissionfuel", "Nuclear Fuel Processing", null, RES_PATH_GUI + "basicmachines/FissionFuel", 0, 0, 0, 0, 1, E, 1, E, true, false); - + + //Cold Trap + public static final GTPP_Recipe_Map_Internal sColdTrapRecipes = new GTPP_Recipe_Map_Internal(new HashSet<GT_Recipe>(10000), "gtpp.recipe.coldtrap", "Cold Trap", null, RES_PATH_GUI + "basicmachines/Dehydrator", 2, 9, 0, 0, 1, E, 1, E, true, true); + + //Reactor Processing Unit + public static final GTPP_Recipe_Map_Internal sReactorProcessingUnitRecipes = new GTPP_Recipe_Map_Internal(new HashSet<GT_Recipe>(10000), "gtpp.recipe.reactorprocessingunit", "Reactor Processing Unit", null, RES_PATH_GUI + "basicmachines/Dehydrator", 2, 9, 0, 0, 1, E, 1, E, true, true); + //Basic Washer Map public static final GTPP_Recipe_Map_Internal sSimpleWasherRecipes = new GTPP_Recipe_Map_Internal(new HashSet<GT_Recipe>(3), "gtpp.recipe.simplewasher", "Simple Dust Washer", null, RES_PATH_GUI + "basicmachines/PotionBrewer", 1, 1, 0, 0, 1, E, 1, E, true, true); //public static final GT_Recipe_Map sSimpleWasherRecipes_FakeFuckBW = new GT_Recipe_Map(new HashSet<GT_Recipe>(3), "gtpp.recipe.simplewasher", "Fuck you Bart", null, RES_PATH_GUI + "basicmachines/PotionBrewer", 1, 1, 0, 0, 1, E, 1, E, true, false); - public static final GTPP_Recipe_Map sChemicalPlantRecipes = new GTPP_Recipe_Map( - new HashSet<GTPP_Recipe>(100), + public static final GTPP_Recipe_Map_Internal sChemicalPlantRecipes = new GTPP_Recipe_Map_Internal( + new HashSet<GT_Recipe>(100), "gtpp.recipe.fluidchemicaleactor", "Chemical Plant", null, @@ -402,6 +407,7 @@ public class GTPP_Recipe extends GT_Recipe implements IComparableRecipe { //Special Maps for Multis public static final GTPP_Recipe_Map_Internal sFishPondRecipes = new GTPP_Recipe_Map_Internal(new HashSet<GT_Recipe>(3), "gtpp.recipe.fishpond", "Zhuhai - Fishing Port", null, RES_PATH_GUI + "basicmachines/PotionBrewer", 0, 1, 0, 0, 1, "Requires Circuit: ", 1, ".", true, true); + public static final GTPP_Recipe_Map_Internal sSpargeTowerRecipes = new GTPP_Recipe_Map_Internal(new HashSet<GT_Recipe>(10000), "gtpp.recipe.spargetower", "Sparging", null, RES_PATH_GUI + "basicmachines/FissionFuel", 9, 9, 0, 0, 1, E, 1, E, true, false); //public static final GTPP_Recipe_Map sMultiblockCentrifugeRecipes = new GT_Recipe_Map_LargeCentrifuge(); //public static final GTPP_Recipe_Map sMultiblockElectrolyzerRecipes = new GT_Recipe_Map_LargeElectrolyzer(); diff --git a/src/main/java/gregtech/api/util/GasSpargingRecipe.java b/src/main/java/gregtech/api/util/GasSpargingRecipe.java new file mode 100644 index 0000000000..493c31dc65 --- /dev/null +++ b/src/main/java/gregtech/api/util/GasSpargingRecipe.java @@ -0,0 +1,99 @@ +package gregtech.api.util; + +import gtPlusPlus.api.objects.data.AutoMap; +import gtPlusPlus.core.util.data.ArrayUtils; +import gtPlusPlus.core.util.minecraft.ItemUtils; +import gtPlusPlus.core.util.minecraft.MaterialUtils; +import net.minecraftforge.fluids.FluidStack; + +public class GasSpargingRecipe implements Comparable<GasSpargingRecipe> { + + public final FluidStack mInputGas; + public final FluidStack mInputSpentFuel; + public final FluidStack mOutputSpargedFuel; + public final int[] mMaxOutputQuantity; + public final FluidStack[] mFluidInputs; + public final FluidStack[] mFluidOutputs; + public final int mDuration; + public final int mEUt; + + public GasSpargingRecipe(FluidStack aSpargeGas, FluidStack aSpentFuel, FluidStack aSpargedFuel, FluidStack[] aOutputs, int[] aMaxOutputQuantity) { + mInputGas = aSpargeGas; + mInputSpentFuel = aSpentFuel; + mOutputSpargedFuel = aSpargedFuel; + mFluidInputs = new FluidStack[] {mInputGas, mInputSpentFuel}; + aOutputs = ArrayUtils.insertElementAtIndex(aOutputs, 0, aSpargeGas); + aOutputs = ArrayUtils.insertElementAtIndex(aOutputs, 1, aSpargedFuel); + mFluidOutputs = aOutputs; + mMaxOutputQuantity = aMaxOutputQuantity; + mDuration = 20 * 60 * 5; + mEUt = MaterialUtils.getVoltageForTier(3); + } + + @Override + public boolean equals(Object o) { + if (o instanceof GasSpargingRecipe) { + GasSpargingRecipe i = (GasSpargingRecipe) o; + if (this.mInputGas.equals(i.mInputGas) && this.mInputSpentFuel.equals(i.mInputSpentFuel)) { + return true; + } + } + return false; + } + + public int getMaxOutput(int aIndex) { + if (aIndex == 0) { + return mInputGas.amount * 100; + } + else if (aIndex == 1) { + return mOutputSpargedFuel.amount * 100; + } + aIndex -= 2; + if ((aIndex < 0) || (aIndex >= this.mMaxOutputQuantity.length)) { + return 10000; + } + return this.mMaxOutputQuantity[aIndex]; + } + + public boolean isValid() { + if (mInputGas == null || mInputGas.amount <= 0 || + mInputSpentFuel == null || mInputSpentFuel.amount <= 0 || + mFluidOutputs == null || mFluidOutputs.length < 1 || + mMaxOutputQuantity == null || mMaxOutputQuantity.length < 1 || + mFluidOutputs.length != mMaxOutputQuantity.length) { + return false; + } + return true; + } + + public boolean containsInputs(FluidStack aSpargeGas, FluidStack aSpentFuel) { + if (aSpargeGas != null && aSpargeGas.getFluid().equals(this.mInputGas.getFluid())) { + if (aSpentFuel != null && aSpentFuel.getFluid().equals(this.mInputSpentFuel.getFluid())) { + return true; + } + } + return false; + } + + @Override + public int compareTo(GasSpargingRecipe o) { + if (o.mFluidOutputs.length > this.mFluidOutputs.length) { + return 1; + } else if (o.mFluidOutputs.length == this.mFluidOutputs.length) { + return 0; + } else { + return -1; + } + } + + public String[] getRecipeInfo() { + AutoMap<String> result = new AutoMap<String>(); + result.put("Input "+ItemUtils.getArrayStackNames(mFluidInputs)); + result.put("Output "+ItemUtils.getArrayStackNames(mFluidOutputs)); + result.put("Duration: "+mDuration); + result.put("EU/t: "+mEUt); + String s[] = result.toArray(); + return s; + } + +} diff --git a/src/main/java/gregtech/api/util/GasSpargingRecipeMap.java b/src/main/java/gregtech/api/util/GasSpargingRecipeMap.java new file mode 100644 index 0000000000..6e60cc7ac3 --- /dev/null +++ b/src/main/java/gregtech/api/util/GasSpargingRecipeMap.java @@ -0,0 +1,48 @@ +package gregtech.api.util; + +import static gregtech.api.enums.GT_Values.RES_PATH_GUI; + +import gtPlusPlus.api.objects.data.AutoMap; +import net.minecraftforge.fluids.FluidStack; + +public class GasSpargingRecipeMap extends AutoMap<GasSpargingRecipe>{ + + public static final AutoMap<GasSpargingRecipe> mRecipes = new AutoMap<GasSpargingRecipe>(); + public static final String mUnlocalizedName = "gtpp.recipe.lftr.sparging"; + public static final String mNEIName = mUnlocalizedName; + public static final String mNEIDisplayName = "LFTR Gas Sparging"; + public static final String mNEIGUIPath = RES_PATH_GUI + "basicmachines/FissionFuel.png"; + + + public static boolean addRecipe(FluidStack aSpargeGas, FluidStack aSpentFuel, FluidStack aSpargedFuel, FluidStack[] aOutputs, int[] aMaxOutputs) { + if (aSpargeGas == null || aSpargeGas.amount <= 0 || + aSpentFuel == null || aSpentFuel.amount <= 0 || + aSpargedFuel == null || aSpargedFuel.amount <= 0 || + aOutputs == null || aOutputs.length < 1 || + aMaxOutputs == null || aMaxOutputs.length < 1 || + aOutputs.length != aMaxOutputs.length) { + return false; + } + int aMapSize = mRecipes.size(); + GasSpargingRecipe aRecipe = new GasSpargingRecipe( + aSpargeGas, + aSpentFuel, + aSpargedFuel, + aOutputs, + aMaxOutputs + ); + mRecipes.put(aRecipe); + return mRecipes.size() > aMapSize; + } + + public static GasSpargingRecipe findRecipe(FluidStack aSpargeGas, FluidStack aSpentFuel) { + for (GasSpargingRecipe aRecipe : mRecipes) { + if (aRecipe.containsInputs(aSpargeGas, aSpentFuel)) { + return aRecipe; + } + } + return null; + } +} + + diff --git a/src/Java/gregtech/api/util/HotFuel.java b/src/main/java/gregtech/api/util/HotFuel.java index c9a6dcf7c5..c9a6dcf7c5 100644 --- a/src/Java/gregtech/api/util/HotFuel.java +++ b/src/main/java/gregtech/api/util/HotFuel.java diff --git a/src/Java/gregtech/api/util/SemiFluidFuelHandler.java b/src/main/java/gregtech/api/util/SemiFluidFuelHandler.java index fa01ea9b5d..fa01ea9b5d 100644 --- a/src/Java/gregtech/api/util/SemiFluidFuelHandler.java +++ b/src/main/java/gregtech/api/util/SemiFluidFuelHandler.java diff --git a/src/Java/gregtech/api/util/ThermalFuel.java b/src/main/java/gregtech/api/util/ThermalFuel.java index d7b732ce5d..d7b732ce5d 100644 --- a/src/Java/gregtech/api/util/ThermalFuel.java +++ b/src/main/java/gregtech/api/util/ThermalFuel.java diff --git a/src/Java/gtPlusPlus/GTplusplus.java b/src/main/java/gtPlusPlus/GTplusplus.java index 7432c1905d..1513a0999c 100644 --- a/src/Java/gtPlusPlus/GTplusplus.java +++ b/src/main/java/gtPlusPlus/GTplusplus.java @@ -6,11 +6,13 @@ import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableCustomCapes; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.util.Collection; +import java.util.HashMap; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod.EventHandler; import cpw.mods.fml.common.SidedProxy; import cpw.mods.fml.common.event.*; +import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.IFMLLoadingPlugin.MCVersion; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -52,6 +54,8 @@ import gtPlusPlus.xmod.gregtech.loaders.GT_Material_Loader; import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_BlastSmelterGT_GTNH; import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_MultisUsingFluidInsteadOfCells; import gtPlusPlus.xmod.thaumcraft.commands.CommandDumpAspects; +import net.minecraft.block.Block; +import net.minecraft.item.Item; import net.minecraft.launchwrapper.Launch; import net.minecraft.util.IIcon; @@ -224,6 +228,22 @@ public class GTplusplus implements ActionListener { Logger.INFO( "Finally, we are finished. Have some cripsy bacon as a reward." ); + + // Log free GT++ Meta IDs + if (CORE.DEVENV) { + // 750 - 999 are reserved for Alkalus. + for (int i=750; i<1000;i++) { + if (gregtech.api.GregTech_API.METATILEENTITIES[i] == null) { + Logger.INFO("MetaID "+i+" is free."); + } + } + // 30000 - 31999 are reserved for Alkalus. + for (int i=30000; i<32000;i++) { + if (gregtech.api.GregTech_API.METATILEENTITIES[i] == null) { + Logger.INFO("MetaID "+i+" is free."); + } + } + } } @EventHandler @@ -497,4 +517,76 @@ public class GTplusplus implements ActionListener { mGregMatLoader.enableMaterial(Materials.Force); } + private static final HashMap<String, Item> sMissingItemMappings = new HashMap<String, Item>(); + private static final HashMap<String, Block> sMissingBlockMappings = new HashMap<String, Block>(); + + private static void processMissingMappings() { + sMissingItemMappings.put("miscutils:Ammonium", GameRegistry.findItem(CORE.MODID, "itemCellAmmonium")); + sMissingItemMappings.put("miscutils:Hydroxide", GameRegistry.findItem(CORE.MODID, "itemCellHydroxide")); + sMissingItemMappings.put("miscutils:BerylliumHydroxide", GameRegistry.findItem(CORE.MODID, "itemCellmiscutils:BerylliumHydroxide")); + sMissingItemMappings.put("miscutils:Bromine", GameRegistry.findItem(CORE.MODID, "itemCellBromine")); + sMissingItemMappings.put("miscutils:Krypton", GameRegistry.findItem(CORE.MODID, "itemCellKrypton")); + sMissingItemMappings.put("miscutils:itemCellZirconiumTetrafluoride", GameRegistry.findItem(CORE.MODID, "ZirconiumTetrafluoride")); + sMissingItemMappings.put("miscutils:Li2BeF4", GameRegistry.findItem(CORE.MODID, "itemCellLithiumTetrafluoroberyllate")); + + // Cryolite + sMissingBlockMappings.put("miscutils:oreCryolite", GameRegistry.findBlock(CORE.MODID, "oreCryoliteF")); + sMissingItemMappings.put("miscutils:itemDustTinyCryolite", GameRegistry.findItem(CORE.MODID, "itemDustTinyCryoliteF")); + sMissingItemMappings.put("miscutils:itemDustSmallCryolite", GameRegistry.findItem(CORE.MODID, "itemDustSmallCryoliteF")); + sMissingItemMappings.put("miscutils:itemDustCryolite", GameRegistry.findItem(CORE.MODID, "itemDustCryoliteF")); + sMissingItemMappings.put("miscutils:dustPureCryolite", GameRegistry.findItem(CORE.MODID, "dustPureCryoliteF")); + sMissingItemMappings.put("miscutils:dustImpureCryolite", GameRegistry.findItem(CORE.MODID, "dustImpureCryoliteF")); + sMissingItemMappings.put("miscutils:crushedCryolite", GameRegistry.findItem(CORE.MODID, "crushedCryoliteF")); + sMissingItemMappings.put("miscutils:crushedPurifiedCryolite", GameRegistry.findItem(CORE.MODID, "crushedPurifiedCryoliteF")); + sMissingItemMappings.put("miscutils:crushedCentrifugedCryolite", GameRegistry.findItem(CORE.MODID, "crushedCentrifugedCryoliteF")); + sMissingItemMappings.put("miscutils:oreCryolite", GameRegistry.findItem(CORE.MODID, "oreCryoliteF")); + + // Fluorite + sMissingBlockMappings.put("miscutils:oreFluorite", GameRegistry.findBlock(CORE.MODID, "oreFluoriteF")); + sMissingItemMappings.put("miscutils:itemDustTinyFluorite", GameRegistry.findItem(CORE.MODID, "itemDustTinyFluoriteF")); + sMissingItemMappings.put("miscutils:itemDustSmallFluorite", GameRegistry.findItem(CORE.MODID, "itemDustSmallFluoriteF")); + sMissingItemMappings.put("miscutils:itemDustFluorite", GameRegistry.findItem(CORE.MODID, "itemDustFluoriteF")); + sMissingItemMappings.put("miscutils:dustPureFluorite", GameRegistry.findItem(CORE.MODID, "dustPureFluoriteF")); + sMissingItemMappings.put("miscutils:dustImpureFluorite", GameRegistry.findItem(CORE.MODID, "dustImpureFluoriteF")); + sMissingItemMappings.put("miscutils:crushedFluorite", GameRegistry.findItem(CORE.MODID, "crushedFluoriteF")); + sMissingItemMappings.put("miscutils:crushedPurifiedFluorite", GameRegistry.findItem(CORE.MODID, "crushedPurifiedFluoriteF")); + sMissingItemMappings.put("miscutils:crushedCentrifugedFluorite", GameRegistry.findItem(CORE.MODID, "crushedCentrifugedFluoriteF")); + sMissingItemMappings.put("miscutils:oreFluorite", GameRegistry.findItem(CORE.MODID, "oreFluoriteF")); + } + + @Mod.EventHandler + public void missingMapping(FMLMissingMappingsEvent event) { + processMissingMappings(); + for (FMLMissingMappingsEvent.MissingMapping mapping : event.get()) { + if (mapping.type == GameRegistry.Type.ITEM) { + Item aReplacement = sMissingItemMappings.get(mapping.name); + if (aReplacement != null) { + remap(aReplacement, mapping); + } + else { + //Logger.INFO("Unable to remap: "+mapping.name+", item has no replacement mapping."); + } + } + else if (mapping.type == GameRegistry.Type.BLOCK) { + Block aReplacement = sMissingBlockMappings.get(mapping.name); + if (aReplacement != null) { + remap(aReplacement, mapping); + } + else { + //Logger.INFO("Unable to remap: "+mapping.name+", block has no replacement mapping."); + } + } + } + } + + private static void remap(Item item, FMLMissingMappingsEvent.MissingMapping mapping) { + mapping.remap(item); + Logger.INFO("Remapping item " + mapping.name + " to " + CORE.MODID + ":" + item.getUnlocalizedName()); + } + + private static void remap(Block block, FMLMissingMappingsEvent.MissingMapping mapping) { + mapping.remap(block); + Logger.INFO("Remapping block " + mapping.name + " to " + CORE.MODID + ":" + block.getUnlocalizedName()); + } + } diff --git a/src/Java/gtPlusPlus/GenerateDictionaries.java b/src/main/java/gtPlusPlus/GenerateDictionaries.java index abdf4f4027..abdf4f4027 100644 --- a/src/Java/gtPlusPlus/GenerateDictionaries.java +++ b/src/main/java/gtPlusPlus/GenerateDictionaries.java diff --git a/src/Java/gtPlusPlus/RoadMap.java b/src/main/java/gtPlusPlus/RoadMap.java index c7bb4d5a22..c7bb4d5a22 100644 --- a/src/Java/gtPlusPlus/RoadMap.java +++ b/src/main/java/gtPlusPlus/RoadMap.java diff --git a/src/Java/gtPlusPlus/api/damage/DamageTeslaTower.java b/src/main/java/gtPlusPlus/api/damage/DamageTeslaTower.java index f35c9cbc6b..f35c9cbc6b 100644 --- a/src/Java/gtPlusPlus/api/damage/DamageTeslaTower.java +++ b/src/main/java/gtPlusPlus/api/damage/DamageTeslaTower.java diff --git a/src/Java/gtPlusPlus/api/enums/ParticleNames.java b/src/main/java/gtPlusPlus/api/enums/ParticleNames.java index d082cd6779..d082cd6779 100644 --- a/src/Java/gtPlusPlus/api/enums/ParticleNames.java +++ b/src/main/java/gtPlusPlus/api/enums/ParticleNames.java diff --git a/src/Java/gtPlusPlus/api/enums/Quality.java b/src/main/java/gtPlusPlus/api/enums/Quality.java index 050f335b5e..050f335b5e 100644 --- a/src/Java/gtPlusPlus/api/enums/Quality.java +++ b/src/main/java/gtPlusPlus/api/enums/Quality.java diff --git a/src/Java/gtPlusPlus/api/helpers/GregtechPlusPlus_API.java b/src/main/java/gtPlusPlus/api/helpers/GregtechPlusPlus_API.java index 6fe4209efe..6fe4209efe 100644 --- a/src/Java/gtPlusPlus/api/helpers/GregtechPlusPlus_API.java +++ b/src/main/java/gtPlusPlus/api/helpers/GregtechPlusPlus_API.java diff --git a/src/Java/gtPlusPlus/api/helpers/MaterialHelper.java b/src/main/java/gtPlusPlus/api/helpers/MaterialHelper.java index 9d2e894d99..9d2e894d99 100644 --- a/src/Java/gtPlusPlus/api/helpers/MaterialHelper.java +++ b/src/main/java/gtPlusPlus/api/helpers/MaterialHelper.java diff --git a/src/Java/gtPlusPlus/api/interfaces/IChunkLoader.java b/src/main/java/gtPlusPlus/api/interfaces/IChunkLoader.java index c04e25f570..c04e25f570 100644 --- a/src/Java/gtPlusPlus/api/interfaces/IChunkLoader.java +++ b/src/main/java/gtPlusPlus/api/interfaces/IChunkLoader.java diff --git a/src/Java/gtPlusPlus/api/interfaces/IComparableRecipe.java b/src/main/java/gtPlusPlus/api/interfaces/IComparableRecipe.java index ddbf9f38bb..ddbf9f38bb 100644 --- a/src/Java/gtPlusPlus/api/interfaces/IComparableRecipe.java +++ b/src/main/java/gtPlusPlus/api/interfaces/IComparableRecipe.java diff --git a/src/Java/gtPlusPlus/api/interfaces/IEntityCatcher.java b/src/main/java/gtPlusPlus/api/interfaces/IEntityCatcher.java index 5ab90d47ce..5ab90d47ce 100644 --- a/src/Java/gtPlusPlus/api/interfaces/IEntityCatcher.java +++ b/src/main/java/gtPlusPlus/api/interfaces/IEntityCatcher.java diff --git a/src/Java/gtPlusPlus/api/interfaces/IGeneratorWorld.java b/src/main/java/gtPlusPlus/api/interfaces/IGeneratorWorld.java index 63f2adbba7..63f2adbba7 100644 --- a/src/Java/gtPlusPlus/api/interfaces/IGeneratorWorld.java +++ b/src/main/java/gtPlusPlus/api/interfaces/IGeneratorWorld.java diff --git a/src/Java/gtPlusPlus/api/interfaces/IGregtechPacketEntity.java b/src/main/java/gtPlusPlus/api/interfaces/IGregtechPacketEntity.java index fa59c58d9f..fa59c58d9f 100644 --- a/src/Java/gtPlusPlus/api/interfaces/IGregtechPacketEntity.java +++ b/src/main/java/gtPlusPlus/api/interfaces/IGregtechPacketEntity.java diff --git a/src/Java/gtPlusPlus/api/interfaces/IGregtechPower.java b/src/main/java/gtPlusPlus/api/interfaces/IGregtechPower.java index 4bb29b3354..4bb29b3354 100644 --- a/src/Java/gtPlusPlus/api/interfaces/IGregtechPower.java +++ b/src/main/java/gtPlusPlus/api/interfaces/IGregtechPower.java diff --git a/src/Java/gtPlusPlus/api/interfaces/ILazyCoverable.java b/src/main/java/gtPlusPlus/api/interfaces/ILazyCoverable.java index 9e1a7431db..9e1a7431db 100644 --- a/src/Java/gtPlusPlus/api/interfaces/ILazyCoverable.java +++ b/src/main/java/gtPlusPlus/api/interfaces/ILazyCoverable.java diff --git a/src/Java/gtPlusPlus/api/interfaces/IPlugin.java b/src/main/java/gtPlusPlus/api/interfaces/IPlugin.java index 67be182402..67be182402 100644 --- a/src/Java/gtPlusPlus/api/interfaces/IPlugin.java +++ b/src/main/java/gtPlusPlus/api/interfaces/IPlugin.java diff --git a/src/Java/gtPlusPlus/api/interfaces/IRandomGenerator.java b/src/main/java/gtPlusPlus/api/interfaces/IRandomGenerator.java index 233fb93d4d..233fb93d4d 100644 --- a/src/Java/gtPlusPlus/api/interfaces/IRandomGenerator.java +++ b/src/main/java/gtPlusPlus/api/interfaces/IRandomGenerator.java diff --git a/src/Java/gtPlusPlus/api/interfaces/ITexturedBlock.java b/src/main/java/gtPlusPlus/api/interfaces/ITexturedBlock.java index 47e692bffb..47e692bffb 100644 --- a/src/Java/gtPlusPlus/api/interfaces/ITexturedBlock.java +++ b/src/main/java/gtPlusPlus/api/interfaces/ITexturedBlock.java diff --git a/src/Java/gtPlusPlus/api/interfaces/ITileTooltip.java b/src/main/java/gtPlusPlus/api/interfaces/ITileTooltip.java index 08866c2712..08866c2712 100644 --- a/src/Java/gtPlusPlus/api/interfaces/ITileTooltip.java +++ b/src/main/java/gtPlusPlus/api/interfaces/ITileTooltip.java diff --git a/src/Java/gtPlusPlus/api/interfaces/IToolable.java b/src/main/java/gtPlusPlus/api/interfaces/IToolable.java index 24797825a9..24797825a9 100644 --- a/src/Java/gtPlusPlus/api/interfaces/IToolable.java +++ b/src/main/java/gtPlusPlus/api/interfaces/IToolable.java diff --git a/src/Java/gtPlusPlus/api/interfaces/RunnableWithInfo.java b/src/main/java/gtPlusPlus/api/interfaces/RunnableWithInfo.java index 4f4b9d7acd..4f4b9d7acd 100644 --- a/src/Java/gtPlusPlus/api/interfaces/RunnableWithInfo.java +++ b/src/main/java/gtPlusPlus/api/interfaces/RunnableWithInfo.java diff --git a/src/Java/gtPlusPlus/api/objects/GregtechException.java b/src/main/java/gtPlusPlus/api/objects/GregtechException.java index 916dbc4aaf..916dbc4aaf 100644 --- a/src/Java/gtPlusPlus/api/objects/GregtechException.java +++ b/src/main/java/gtPlusPlus/api/objects/GregtechException.java diff --git a/src/Java/gtPlusPlus/api/objects/Logger.java b/src/main/java/gtPlusPlus/api/objects/Logger.java index ecc28d4a59..1a1da6868b 100644 --- a/src/Java/gtPlusPlus/api/objects/Logger.java +++ b/src/main/java/gtPlusPlus/api/objects/Logger.java @@ -121,7 +121,7 @@ public class Logger { */ public static void MATERIALS(final String s) { if (enabled) { - if (/* CORE_Preloader.DEV_ENVIRONMENT || */CORE_Preloader.DEBUG_MODE) { + if (CORE_Preloader.DEV_ENVIRONMENT || CORE_Preloader.DEBUG_MODE) { modLogger.info("[Materials] "+s); } } diff --git a/src/Java/gtPlusPlus/api/objects/data/AutoMap.java b/src/main/java/gtPlusPlus/api/objects/data/AutoMap.java index 02517097cf..e04f1af03a 100644 --- a/src/Java/gtPlusPlus/api/objects/data/AutoMap.java +++ b/src/main/java/gtPlusPlus/api/objects/data/AutoMap.java @@ -153,14 +153,12 @@ public class AutoMap<V> implements Iterable<V>, Cloneable, Serializable, Collect } @SuppressWarnings("unchecked") - public synchronized V[] toArray() { - Collection<V> col = this.mInternalMap.values(); - List<V> abcList = new ArrayList<V>(); - for (V g : col) { - abcList.add(g); + public V[] toArray() { + V[] toR = (V[]) java.lang.reflect.Array.newInstance(mInternalMap.get(0).getClass(), mInternalMap.size()); + for (int i = 0; i < mInternalMap.size(); i++) { + toR[i] = mInternalMap.get(i); } - return (V[]) abcList.toArray(); - //return (V[]) new AutoArray(this).getGenericArray(); + return toR; } public synchronized final int getInternalID() { diff --git a/src/Java/gtPlusPlus/api/objects/data/ConcurrentHashSet.java b/src/main/java/gtPlusPlus/api/objects/data/ConcurrentHashSet.java index 991908e402..991908e402 100644 --- a/src/Java/gtPlusPlus/api/objects/data/ConcurrentHashSet.java +++ b/src/main/java/gtPlusPlus/api/objects/data/ConcurrentHashSet.java diff --git a/src/Java/gtPlusPlus/api/objects/data/ConcurrentSet.java b/src/main/java/gtPlusPlus/api/objects/data/ConcurrentSet.java index 1d3ffc1c01..1d3ffc1c01 100644 --- a/src/Java/gtPlusPlus/api/objects/data/ConcurrentSet.java +++ b/src/main/java/gtPlusPlus/api/objects/data/ConcurrentSet.java diff --git a/src/Java/gtPlusPlus/api/objects/data/FlexiblePair.java b/src/main/java/gtPlusPlus/api/objects/data/FlexiblePair.java index 64f57b4e5a..64f57b4e5a 100644 --- a/src/Java/gtPlusPlus/api/objects/data/FlexiblePair.java +++ b/src/main/java/gtPlusPlus/api/objects/data/FlexiblePair.java diff --git a/src/Java/gtPlusPlus/api/objects/data/ObjMap.java b/src/main/java/gtPlusPlus/api/objects/data/ObjMap.java index 49dd70d2b8..49dd70d2b8 100644 --- a/src/Java/gtPlusPlus/api/objects/data/ObjMap.java +++ b/src/main/java/gtPlusPlus/api/objects/data/ObjMap.java diff --git a/src/Java/gtPlusPlus/api/objects/data/Pair.java b/src/main/java/gtPlusPlus/api/objects/data/Pair.java index e1d23e6b43..e1d23e6b43 100644 --- a/src/Java/gtPlusPlus/api/objects/data/Pair.java +++ b/src/main/java/gtPlusPlus/api/objects/data/Pair.java diff --git a/src/Java/gtPlusPlus/api/objects/data/Quad.java b/src/main/java/gtPlusPlus/api/objects/data/Quad.java index fa2e52951e..fa2e52951e 100644 --- a/src/Java/gtPlusPlus/api/objects/data/Quad.java +++ b/src/main/java/gtPlusPlus/api/objects/data/Quad.java diff --git a/src/Java/gtPlusPlus/api/objects/data/ReverseAutoMap.java b/src/main/java/gtPlusPlus/api/objects/data/ReverseAutoMap.java index 72ec0bc293..72ec0bc293 100644 --- a/src/Java/gtPlusPlus/api/objects/data/ReverseAutoMap.java +++ b/src/main/java/gtPlusPlus/api/objects/data/ReverseAutoMap.java diff --git a/src/Java/gtPlusPlus/api/objects/data/Triplet.java b/src/main/java/gtPlusPlus/api/objects/data/Triplet.java index affb03d868..affb03d868 100644 --- a/src/Java/gtPlusPlus/api/objects/data/Triplet.java +++ b/src/main/java/gtPlusPlus/api/objects/data/Triplet.java diff --git a/src/Java/gtPlusPlus/api/objects/data/TypeCounter.java b/src/main/java/gtPlusPlus/api/objects/data/TypeCounter.java index 601a51392f..601a51392f 100644 --- a/src/Java/gtPlusPlus/api/objects/data/TypeCounter.java +++ b/src/main/java/gtPlusPlus/api/objects/data/TypeCounter.java diff --git a/src/Java/gtPlusPlus/api/objects/data/WeightedCollection.java b/src/main/java/gtPlusPlus/api/objects/data/WeightedCollection.java index f9966474b0..f9966474b0 100644 --- a/src/Java/gtPlusPlus/api/objects/data/WeightedCollection.java +++ b/src/main/java/gtPlusPlus/api/objects/data/WeightedCollection.java diff --git a/src/Java/gtPlusPlus/api/objects/data/weakref/WeakAutoMap.java b/src/main/java/gtPlusPlus/api/objects/data/weakref/WeakAutoMap.java index 6c55822ca9..6c55822ca9 100644 --- a/src/Java/gtPlusPlus/api/objects/data/weakref/WeakAutoMap.java +++ b/src/main/java/gtPlusPlus/api/objects/data/weakref/WeakAutoMap.java diff --git a/src/Java/gtPlusPlus/api/objects/minecraft/AABB.java b/src/main/java/gtPlusPlus/api/objects/minecraft/AABB.java index 722ac00b64..722ac00b64 100644 --- a/src/Java/gtPlusPlus/api/objects/minecraft/AABB.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/AABB.java diff --git a/src/Java/gtPlusPlus/api/objects/minecraft/BTF_FluidTank.java b/src/main/java/gtPlusPlus/api/objects/minecraft/BTF_FluidTank.java index 0b8f97b378..0b8f97b378 100644 --- a/src/Java/gtPlusPlus/api/objects/minecraft/BTF_FluidTank.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/BTF_FluidTank.java diff --git a/src/Java/gtPlusPlus/api/objects/minecraft/BTF_Inventory.java b/src/main/java/gtPlusPlus/api/objects/minecraft/BTF_Inventory.java index 04ce0dff19..04ce0dff19 100644 --- a/src/Java/gtPlusPlus/api/objects/minecraft/BTF_Inventory.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/BTF_Inventory.java diff --git a/src/Java/gtPlusPlus/api/objects/minecraft/BlockPos.java b/src/main/java/gtPlusPlus/api/objects/minecraft/BlockPos.java index ab359c3853..ab359c3853 100644 --- a/src/Java/gtPlusPlus/api/objects/minecraft/BlockPos.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/BlockPos.java diff --git a/src/Java/gtPlusPlus/api/objects/minecraft/CubicObject.java b/src/main/java/gtPlusPlus/api/objects/minecraft/CubicObject.java index 8c76513d09..8c76513d09 100644 --- a/src/Java/gtPlusPlus/api/objects/minecraft/CubicObject.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/CubicObject.java diff --git a/src/Java/gtPlusPlus/api/objects/minecraft/DimChunkPos.java b/src/main/java/gtPlusPlus/api/objects/minecraft/DimChunkPos.java index 010e522a14..010e522a14 100644 --- a/src/Java/gtPlusPlus/api/objects/minecraft/DimChunkPos.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/DimChunkPos.java diff --git a/src/Java/gtPlusPlus/api/objects/minecraft/FakeBlockPos.java b/src/main/java/gtPlusPlus/api/objects/minecraft/FakeBlockPos.java index d5db8081dc..d5db8081dc 100644 --- a/src/Java/gtPlusPlus/api/objects/minecraft/FakeBlockPos.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/FakeBlockPos.java diff --git a/src/Java/gtPlusPlus/api/objects/minecraft/FakeWorld.java b/src/main/java/gtPlusPlus/api/objects/minecraft/FakeWorld.java index 8ee033a341..8ee033a341 100644 --- a/src/Java/gtPlusPlus/api/objects/minecraft/FakeWorld.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/FakeWorld.java diff --git a/src/Java/gtPlusPlus/api/objects/minecraft/FluidGT6.java b/src/main/java/gtPlusPlus/api/objects/minecraft/FluidGT6.java index 2535046792..2535046792 100644 --- a/src/Java/gtPlusPlus/api/objects/minecraft/FluidGT6.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/FluidGT6.java diff --git a/src/Java/gtPlusPlus/api/objects/minecraft/FormattedTooltipString.java b/src/main/java/gtPlusPlus/api/objects/minecraft/FormattedTooltipString.java index ec13c82ea0..ec13c82ea0 100644 --- a/src/Java/gtPlusPlus/api/objects/minecraft/FormattedTooltipString.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/FormattedTooltipString.java diff --git a/src/Java/gtPlusPlus/api/objects/minecraft/GenericStack.java b/src/main/java/gtPlusPlus/api/objects/minecraft/GenericStack.java index 9c1b231961..9c1b231961 100644 --- a/src/Java/gtPlusPlus/api/objects/minecraft/GenericStack.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/GenericStack.java diff --git a/src/Java/gtPlusPlus/api/objects/minecraft/ItemPackage.java b/src/main/java/gtPlusPlus/api/objects/minecraft/ItemPackage.java index fa85f23cf3..fa85f23cf3 100644 --- a/src/Java/gtPlusPlus/api/objects/minecraft/ItemPackage.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/ItemPackage.java diff --git a/src/Java/gtPlusPlus/api/objects/minecraft/ItemStackData.java b/src/main/java/gtPlusPlus/api/objects/minecraft/ItemStackData.java index 476926826b..476926826b 100644 --- a/src/Java/gtPlusPlus/api/objects/minecraft/ItemStackData.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/ItemStackData.java diff --git a/src/Java/gtPlusPlus/api/objects/minecraft/NoConflictGTRecipeMap.java b/src/main/java/gtPlusPlus/api/objects/minecraft/NoConflictGTRecipeMap.java index 78e925fe04..78e925fe04 100644 --- a/src/Java/gtPlusPlus/api/objects/minecraft/NoConflictGTRecipeMap.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/NoConflictGTRecipeMap.java diff --git a/src/Java/gtPlusPlus/api/objects/minecraft/SafeTexture.java b/src/main/java/gtPlusPlus/api/objects/minecraft/SafeTexture.java index 7c418b5a77..7c418b5a77 100644 --- a/src/Java/gtPlusPlus/api/objects/minecraft/SafeTexture.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/SafeTexture.java diff --git a/src/Java/gtPlusPlus/api/objects/minecraft/ShapedRecipe.java b/src/main/java/gtPlusPlus/api/objects/minecraft/ShapedRecipe.java index c0e9b20c54..c0e9b20c54 100644 --- a/src/Java/gtPlusPlus/api/objects/minecraft/ShapedRecipe.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/ShapedRecipe.java diff --git a/src/Java/gtPlusPlus/api/objects/minecraft/TexturePackage.java b/src/main/java/gtPlusPlus/api/objects/minecraft/TexturePackage.java index e610f8fdf0..e610f8fdf0 100644 --- a/src/Java/gtPlusPlus/api/objects/minecraft/TexturePackage.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/TexturePackage.java diff --git a/src/Java/gtPlusPlus/api/objects/minecraft/ThreadPooCollector.java b/src/main/java/gtPlusPlus/api/objects/minecraft/ThreadPooCollector.java index 0ff6e112ac..0ff6e112ac 100644 --- a/src/Java/gtPlusPlus/api/objects/minecraft/ThreadPooCollector.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/ThreadPooCollector.java diff --git a/src/Java/gtPlusPlus/api/objects/minecraft/multi/NoEUBonusMultiBehaviour.java b/src/main/java/gtPlusPlus/api/objects/minecraft/multi/NoEUBonusMultiBehaviour.java index 78341db7a1..78341db7a1 100644 --- a/src/Java/gtPlusPlus/api/objects/minecraft/multi/NoEUBonusMultiBehaviour.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/multi/NoEUBonusMultiBehaviour.java diff --git a/src/Java/gtPlusPlus/api/objects/minecraft/multi/NoOutputBonusMultiBehaviour.java b/src/main/java/gtPlusPlus/api/objects/minecraft/multi/NoOutputBonusMultiBehaviour.java index 8137f2573d..8137f2573d 100644 --- a/src/Java/gtPlusPlus/api/objects/minecraft/multi/NoOutputBonusMultiBehaviour.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/multi/NoOutputBonusMultiBehaviour.java diff --git a/src/Java/gtPlusPlus/api/objects/minecraft/multi/NoSpeedBonusMultiBehaviour.java b/src/main/java/gtPlusPlus/api/objects/minecraft/multi/NoSpeedBonusMultiBehaviour.java index fe7a90960d..fe7a90960d 100644 --- a/src/Java/gtPlusPlus/api/objects/minecraft/multi/NoSpeedBonusMultiBehaviour.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/multi/NoSpeedBonusMultiBehaviour.java diff --git a/src/Java/gtPlusPlus/api/objects/minecraft/multi/SpecialMultiBehaviour.java b/src/main/java/gtPlusPlus/api/objects/minecraft/multi/SpecialMultiBehaviour.java index e562ccc40b..e562ccc40b 100644 --- a/src/Java/gtPlusPlus/api/objects/minecraft/multi/SpecialMultiBehaviour.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/multi/SpecialMultiBehaviour.java diff --git a/src/Java/gtPlusPlus/api/objects/random/CSPRNG_DO_NOT_USE.java b/src/main/java/gtPlusPlus/api/objects/random/CSPRNG_DO_NOT_USE.java index b2dc984456..b2dc984456 100644 --- a/src/Java/gtPlusPlus/api/objects/random/CSPRNG_DO_NOT_USE.java +++ b/src/main/java/gtPlusPlus/api/objects/random/CSPRNG_DO_NOT_USE.java diff --git a/src/Java/gtPlusPlus/api/objects/random/UUIDGenerator.java b/src/main/java/gtPlusPlus/api/objects/random/UUIDGenerator.java index fec92368f8..fec92368f8 100644 --- a/src/Java/gtPlusPlus/api/objects/random/UUIDGenerator.java +++ b/src/main/java/gtPlusPlus/api/objects/random/UUIDGenerator.java diff --git a/src/Java/gtPlusPlus/api/objects/random/XSTR.java b/src/main/java/gtPlusPlus/api/objects/random/XSTR.java index 6ce1cbeb6c..6ce1cbeb6c 100644 --- a/src/Java/gtPlusPlus/api/objects/random/XSTR.java +++ b/src/main/java/gtPlusPlus/api/objects/random/XSTR.java diff --git a/src/Java/gtPlusPlus/api/plugin/Sample_Plugin.java b/src/main/java/gtPlusPlus/api/plugin/Sample_Plugin.java index 543ec8e1fa..543ec8e1fa 100644 --- a/src/Java/gtPlusPlus/api/plugin/Sample_Plugin.java +++ b/src/main/java/gtPlusPlus/api/plugin/Sample_Plugin.java diff --git a/src/Java/gtPlusPlus/api/thermal/energy/IThermalConnection.java b/src/main/java/gtPlusPlus/api/thermal/energy/IThermalConnection.java index d8573000fc..d8573000fc 100644 --- a/src/Java/gtPlusPlus/api/thermal/energy/IThermalConnection.java +++ b/src/main/java/gtPlusPlus/api/thermal/energy/IThermalConnection.java diff --git a/src/Java/gtPlusPlus/api/thermal/energy/IThermalContainerItem.java b/src/main/java/gtPlusPlus/api/thermal/energy/IThermalContainerItem.java index 072695bd76..072695bd76 100644 --- a/src/Java/gtPlusPlus/api/thermal/energy/IThermalContainerItem.java +++ b/src/main/java/gtPlusPlus/api/thermal/energy/IThermalContainerItem.java diff --git a/src/Java/gtPlusPlus/api/thermal/energy/IThermalHandler.java b/src/main/java/gtPlusPlus/api/thermal/energy/IThermalHandler.java index 3ab7127757..3ab7127757 100644 --- a/src/Java/gtPlusPlus/api/thermal/energy/IThermalHandler.java +++ b/src/main/java/gtPlusPlus/api/thermal/energy/IThermalHandler.java diff --git a/src/Java/gtPlusPlus/api/thermal/energy/IThermalProvider.java b/src/main/java/gtPlusPlus/api/thermal/energy/IThermalProvider.java index 0e4a060b23..0e4a060b23 100644 --- a/src/Java/gtPlusPlus/api/thermal/energy/IThermalProvider.java +++ b/src/main/java/gtPlusPlus/api/thermal/energy/IThermalProvider.java diff --git a/src/Java/gtPlusPlus/api/thermal/energy/IThermalReceiver.java b/src/main/java/gtPlusPlus/api/thermal/energy/IThermalReceiver.java index e08ce48a06..e08ce48a06 100644 --- a/src/Java/gtPlusPlus/api/thermal/energy/IThermalReceiver.java +++ b/src/main/java/gtPlusPlus/api/thermal/energy/IThermalReceiver.java diff --git a/src/Java/gtPlusPlus/api/thermal/energy/IThermalStorage.java b/src/main/java/gtPlusPlus/api/thermal/energy/IThermalStorage.java index db3e6c8966..db3e6c8966 100644 --- a/src/Java/gtPlusPlus/api/thermal/energy/IThermalStorage.java +++ b/src/main/java/gtPlusPlus/api/thermal/energy/IThermalStorage.java diff --git a/src/Java/gtPlusPlus/api/thermal/energy/ThermalStorage.java b/src/main/java/gtPlusPlus/api/thermal/energy/ThermalStorage.java index 9c7bb0066c..9c7bb0066c 100644 --- a/src/Java/gtPlusPlus/api/thermal/energy/ThermalStorage.java +++ b/src/main/java/gtPlusPlus/api/thermal/energy/ThermalStorage.java diff --git a/src/Java/gtPlusPlus/api/thermal/energy/ThermalStorageAdv.java b/src/main/java/gtPlusPlus/api/thermal/energy/ThermalStorageAdv.java index 47af7e79a6..47af7e79a6 100644 --- a/src/Java/gtPlusPlus/api/thermal/energy/ThermalStorageAdv.java +++ b/src/main/java/gtPlusPlus/api/thermal/energy/ThermalStorageAdv.java diff --git a/src/Java/gtPlusPlus/api/thermal/sample/ItemThermalContainer.java b/src/main/java/gtPlusPlus/api/thermal/sample/ItemThermalContainer.java index 015e5fd5f3..015e5fd5f3 100644 --- a/src/Java/gtPlusPlus/api/thermal/sample/ItemThermalContainer.java +++ b/src/main/java/gtPlusPlus/api/thermal/sample/ItemThermalContainer.java diff --git a/src/Java/gtPlusPlus/api/thermal/sample/TileThermalHandler.java b/src/main/java/gtPlusPlus/api/thermal/sample/TileThermalHandler.java index e2e3c50ab7..e2e3c50ab7 100644 --- a/src/Java/gtPlusPlus/api/thermal/sample/TileThermalHandler.java +++ b/src/main/java/gtPlusPlus/api/thermal/sample/TileThermalHandler.java diff --git a/src/Java/gtPlusPlus/api/thermal/tileentity/IThermalInfo.java b/src/main/java/gtPlusPlus/api/thermal/tileentity/IThermalInfo.java index a40535887c..a40535887c 100644 --- a/src/Java/gtPlusPlus/api/thermal/tileentity/IThermalInfo.java +++ b/src/main/java/gtPlusPlus/api/thermal/tileentity/IThermalInfo.java diff --git a/src/Java/gtPlusPlus/australia/GTplusplus_Australia.java b/src/main/java/gtPlusPlus/australia/GTplusplus_Australia.java index 9a16ad1785..9a16ad1785 100644 --- a/src/Java/gtPlusPlus/australia/GTplusplus_Australia.java +++ b/src/main/java/gtPlusPlus/australia/GTplusplus_Australia.java diff --git a/src/Java/gtPlusPlus/australia/biome/CustomDecorator.java b/src/main/java/gtPlusPlus/australia/biome/CustomDecorator.java index 2d9b335d52..2d9b335d52 100644 --- a/src/Java/gtPlusPlus/australia/biome/CustomDecorator.java +++ b/src/main/java/gtPlusPlus/australia/biome/CustomDecorator.java diff --git a/src/Java/gtPlusPlus/australia/biome/GenLayerAustralia.java b/src/main/java/gtPlusPlus/australia/biome/GenLayerAustralia.java index d9c328d756..d9c328d756 100644 --- a/src/Java/gtPlusPlus/australia/biome/GenLayerAustralia.java +++ b/src/main/java/gtPlusPlus/australia/biome/GenLayerAustralia.java diff --git a/src/Java/gtPlusPlus/australia/biome/GenLayerBiomesAustraliaDimension.java b/src/main/java/gtPlusPlus/australia/biome/GenLayerBiomesAustraliaDimension.java index 571ae636e0..571ae636e0 100644 --- a/src/Java/gtPlusPlus/australia/biome/GenLayerBiomesAustraliaDimension.java +++ b/src/main/java/gtPlusPlus/australia/biome/GenLayerBiomesAustraliaDimension.java diff --git a/src/Java/gtPlusPlus/australia/biome/type/Biome_AustralianDesert.java b/src/main/java/gtPlusPlus/australia/biome/type/Biome_AustralianDesert.java index 6986c9931d..666360f058 100644 --- a/src/Java/gtPlusPlus/australia/biome/type/Biome_AustralianDesert.java +++ b/src/main/java/gtPlusPlus/australia/biome/type/Biome_AustralianDesert.java @@ -80,7 +80,7 @@ public class Biome_AustralianDesert { public BiomeGenAustralianDesert() { super(CORE.AUSTRALIA_BIOME_DESERT_1_ID); this.setBiomeName("Australian Desert"); - this.setBiomeID(); + //this.setBiomeID(); this.enableRain = true; this.enableSnow = false; this.topBlock = blockTopLayer; @@ -123,16 +123,19 @@ public class Biome_AustralianDesert { } private synchronized boolean setBiomeID() { - BiomeGenBase[] mTempList; try { Field mInternalBiomeList = ReflectionUtils.getField(BiomeGenBase.class, "biomeList"); Field mClone = mInternalBiomeList; - mTempList = (BiomeGenBase[]) mInternalBiomeList.get(null); + BiomeGenBase[] mOriginalList = (BiomeGenBase[]) mInternalBiomeList.get(null); + BiomeGenBase[] mTempList = new BiomeGenBase[mOriginalList.length]; + for (int index=0;index<mTempList.length;index++) { + mTempList[index] = mOriginalList[index]; + } if (mTempList != null){ mTempList[CORE.AUSTRALIA_BIOME_DESERT_1_ID] = this; mInternalBiomeList.set(null, mTempList); if (mTempList != mInternalBiomeList.get(null)){ - ReflectionUtils.setFinalStatic(mInternalBiomeList, mTempList); + ReflectionUtils.setFinalFieldValue(BiomeGenBase.class, mInternalBiomeList, mTempList); Logger.REFLECTION("Set Biome ID for "+this.biomeName+" Biome internally in 'biomeList' field from "+BiomeGenBase.class.getCanonicalName()+"."); return true; } @@ -144,6 +147,7 @@ public class Biome_AustralianDesert { } catch (Exception e) { Logger.REFLECTION("Could not access 'biomeList' field in "+BiomeGenBase.class.getCanonicalName()+"."); + e.printStackTrace(); return false; } } diff --git a/src/Java/gtPlusPlus/australia/biome/type/Biome_AustralianDesert2.java b/src/main/java/gtPlusPlus/australia/biome/type/Biome_AustralianDesert2.java index 003c6cbd93..2ac11bb412 100644 --- a/src/Java/gtPlusPlus/australia/biome/type/Biome_AustralianDesert2.java +++ b/src/main/java/gtPlusPlus/australia/biome/type/Biome_AustralianDesert2.java @@ -80,7 +80,7 @@ public class Biome_AustralianDesert2 { public BiomeGenAustralianDesert2() { super(CORE.AUSTRALIA_BIOME_DESERT_2_ID); this.setBiomeName("Australian Desert II"); - this.setBiomeID(); + //this.setBiomeID(); this.enableRain = true; this.enableSnow = false; this.topBlock = blockTopLayer; @@ -123,16 +123,19 @@ public class Biome_AustralianDesert2 { } private synchronized boolean setBiomeID() { - BiomeGenBase[] mTempList; try { Field mInternalBiomeList = ReflectionUtils.getField(BiomeGenBase.class, "biomeList"); Field mClone = mInternalBiomeList; - mTempList = (BiomeGenBase[]) mInternalBiomeList.get(null); + BiomeGenBase[] mOriginalList = (BiomeGenBase[]) mInternalBiomeList.get(null); + BiomeGenBase[] mTempList = new BiomeGenBase[mOriginalList.length]; + for (int index=0;index<mTempList.length;index++) { + mTempList[index] = mOriginalList[index]; + } if (mTempList != null){ - mTempList[CORE.AUSTRALIA_BIOME_DESERT_2_ID] = this; + mTempList[CORE.AUSTRALIA_BIOME_DESERT_1_ID] = this; mInternalBiomeList.set(null, mTempList); if (mTempList != mInternalBiomeList.get(null)){ - ReflectionUtils.setFinalStatic(mInternalBiomeList, mTempList); + ReflectionUtils.setFinalFieldValue(BiomeGenBase.class, mInternalBiomeList, mTempList); Logger.REFLECTION("Set Biome ID for "+this.biomeName+" Biome internally in 'biomeList' field from "+BiomeGenBase.class.getCanonicalName()+"."); return true; } @@ -144,6 +147,7 @@ public class Biome_AustralianDesert2 { } catch (Exception e) { Logger.REFLECTION("Could not access 'biomeList' field in "+BiomeGenBase.class.getCanonicalName()+"."); + e.printStackTrace(); return false; } } diff --git a/src/Java/gtPlusPlus/australia/biome/type/Biome_AustralianDesert_Ex.java b/src/main/java/gtPlusPlus/australia/biome/type/Biome_AustralianDesert_Ex.java index bfb0fb8631..bfb0fb8631 100644 --- a/src/Java/gtPlusPlus/australia/biome/type/Biome_AustralianDesert_Ex.java +++ b/src/main/java/gtPlusPlus/australia/biome/type/Biome_AustralianDesert_Ex.java diff --git a/src/Java/gtPlusPlus/australia/biome/type/Biome_AustralianForest.java b/src/main/java/gtPlusPlus/australia/biome/type/Biome_AustralianForest.java index c00fd5edef..c00fd5edef 100644 --- a/src/Java/gtPlusPlus/australia/biome/type/Biome_AustralianForest.java +++ b/src/main/java/gtPlusPlus/australia/biome/type/Biome_AustralianForest.java diff --git a/src/Java/gtPlusPlus/australia/biome/type/Biome_AustralianOcean.java b/src/main/java/gtPlusPlus/australia/biome/type/Biome_AustralianOcean.java index ebfb455882..ebfb455882 100644 --- a/src/Java/gtPlusPlus/australia/biome/type/Biome_AustralianOcean.java +++ b/src/main/java/gtPlusPlus/australia/biome/type/Biome_AustralianOcean.java diff --git a/src/Java/gtPlusPlus/australia/biome/type/Biome_AustralianOutback.java b/src/main/java/gtPlusPlus/australia/biome/type/Biome_AustralianOutback.java index 439c213ac7..439c213ac7 100644 --- a/src/Java/gtPlusPlus/australia/biome/type/Biome_AustralianOutback.java +++ b/src/main/java/gtPlusPlus/australia/biome/type/Biome_AustralianOutback.java diff --git a/src/Java/gtPlusPlus/australia/biome/type/Biome_AustralianPlains.java b/src/main/java/gtPlusPlus/australia/biome/type/Biome_AustralianPlains.java index c04f211fd3..c04f211fd3 100644 --- a/src/Java/gtPlusPlus/australia/biome/type/Biome_AustralianPlains.java +++ b/src/main/java/gtPlusPlus/australia/biome/type/Biome_AustralianPlains.java diff --git a/src/Java/gtPlusPlus/australia/block/AustraliaContentLoader.java b/src/main/java/gtPlusPlus/australia/block/AustraliaContentLoader.java index 0df84500e1..0df84500e1 100644 --- a/src/Java/gtPlusPlus/australia/block/AustraliaContentLoader.java +++ b/src/main/java/gtPlusPlus/australia/block/AustraliaContentLoader.java diff --git a/src/Java/gtPlusPlus/australia/block/BlockAustraliaPortal.java b/src/main/java/gtPlusPlus/australia/block/BlockAustraliaPortal.java index 44ece25e43..44ece25e43 100644 --- a/src/Java/gtPlusPlus/australia/block/BlockAustraliaPortal.java +++ b/src/main/java/gtPlusPlus/australia/block/BlockAustraliaPortal.java diff --git a/src/Java/gtPlusPlus/australia/block/BlockAustraliaSand.java b/src/main/java/gtPlusPlus/australia/block/BlockAustraliaSand.java index 62d443bc13..62d443bc13 100644 --- a/src/Java/gtPlusPlus/australia/block/BlockAustraliaSand.java +++ b/src/main/java/gtPlusPlus/australia/block/BlockAustraliaSand.java diff --git a/src/Java/gtPlusPlus/australia/block/BlockAustraliaTopSoil.java b/src/main/java/gtPlusPlus/australia/block/BlockAustraliaTopSoil.java index 09c7dbf22d..09c7dbf22d 100644 --- a/src/Java/gtPlusPlus/australia/block/BlockAustraliaTopSoil.java +++ b/src/main/java/gtPlusPlus/australia/block/BlockAustraliaTopSoil.java diff --git a/src/Java/gtPlusPlus/australia/block/BlockDarkWorldPortalFrame.java b/src/main/java/gtPlusPlus/australia/block/BlockDarkWorldPortalFrame.java index 1de7425f6a..1de7425f6a 100644 --- a/src/Java/gtPlusPlus/australia/block/BlockDarkWorldPortalFrame.java +++ b/src/main/java/gtPlusPlus/australia/block/BlockDarkWorldPortalFrame.java diff --git a/src/Java/gtPlusPlus/australia/chunk/ChunkProviderAustralia.java b/src/main/java/gtPlusPlus/australia/chunk/ChunkProviderAustralia.java index 07f5f969e2..07f5f969e2 100644 --- a/src/Java/gtPlusPlus/australia/chunk/ChunkProviderAustralia.java +++ b/src/main/java/gtPlusPlus/australia/chunk/ChunkProviderAustralia.java diff --git a/src/Java/gtPlusPlus/australia/dimension/Dimension_Australia.java b/src/main/java/gtPlusPlus/australia/dimension/Dimension_Australia.java index ff9e81085d..ff9e81085d 100644 --- a/src/Java/gtPlusPlus/australia/dimension/Dimension_Australia.java +++ b/src/main/java/gtPlusPlus/australia/dimension/Dimension_Australia.java diff --git a/src/Java/gtPlusPlus/australia/entity/model/ModelAustralianSpider.java b/src/main/java/gtPlusPlus/australia/entity/model/ModelAustralianSpider.java index 05b43b7558..05b43b7558 100644 --- a/src/Java/gtPlusPlus/australia/entity/model/ModelAustralianSpider.java +++ b/src/main/java/gtPlusPlus/australia/entity/model/ModelAustralianSpider.java diff --git a/src/Java/gtPlusPlus/australia/entity/model/ModelBoar.java b/src/main/java/gtPlusPlus/australia/entity/model/ModelBoar.java index 7d858e39f0..7d858e39f0 100644 --- a/src/Java/gtPlusPlus/australia/entity/model/ModelBoar.java +++ b/src/main/java/gtPlusPlus/australia/entity/model/ModelBoar.java diff --git a/src/Java/gtPlusPlus/australia/entity/model/ModelDingo.java b/src/main/java/gtPlusPlus/australia/entity/model/ModelDingo.java index 2999cdf2dd..2999cdf2dd 100644 --- a/src/Java/gtPlusPlus/australia/entity/model/ModelDingo.java +++ b/src/main/java/gtPlusPlus/australia/entity/model/ModelDingo.java diff --git a/src/Java/gtPlusPlus/australia/entity/model/ModelOctopus.java b/src/main/java/gtPlusPlus/australia/entity/model/ModelOctopus.java index f820d0ad85..f820d0ad85 100644 --- a/src/Java/gtPlusPlus/australia/entity/model/ModelOctopus.java +++ b/src/main/java/gtPlusPlus/australia/entity/model/ModelOctopus.java diff --git a/src/Java/gtPlusPlus/australia/entity/render/RenderAustralianSpider.java b/src/main/java/gtPlusPlus/australia/entity/render/RenderAustralianSpider.java index af432e04b9..af432e04b9 100644 --- a/src/Java/gtPlusPlus/australia/entity/render/RenderAustralianSpider.java +++ b/src/main/java/gtPlusPlus/australia/entity/render/RenderAustralianSpider.java diff --git a/src/Java/gtPlusPlus/australia/entity/render/RenderBoar.java b/src/main/java/gtPlusPlus/australia/entity/render/RenderBoar.java index cc4bfa8906..cc4bfa8906 100644 --- a/src/Java/gtPlusPlus/australia/entity/render/RenderBoar.java +++ b/src/main/java/gtPlusPlus/australia/entity/render/RenderBoar.java diff --git a/src/Java/gtPlusPlus/australia/entity/render/RenderDingo.java b/src/main/java/gtPlusPlus/australia/entity/render/RenderDingo.java index 8bbf0392cd..8bbf0392cd 100644 --- a/src/Java/gtPlusPlus/australia/entity/render/RenderDingo.java +++ b/src/main/java/gtPlusPlus/australia/entity/render/RenderDingo.java diff --git a/src/Java/gtPlusPlus/australia/entity/render/RenderOctopus.java b/src/main/java/gtPlusPlus/australia/entity/render/RenderOctopus.java index 592ef9391a..592ef9391a 100644 --- a/src/Java/gtPlusPlus/australia/entity/render/RenderOctopus.java +++ b/src/main/java/gtPlusPlus/australia/entity/render/RenderOctopus.java diff --git a/src/Java/gtPlusPlus/australia/entity/type/EntityAustralianSpiderBase.java b/src/main/java/gtPlusPlus/australia/entity/type/EntityAustralianSpiderBase.java index 5aa78203a3..5aa78203a3 100644 --- a/src/Java/gtPlusPlus/australia/entity/type/EntityAustralianSpiderBase.java +++ b/src/main/java/gtPlusPlus/australia/entity/type/EntityAustralianSpiderBase.java diff --git a/src/Java/gtPlusPlus/australia/entity/type/EntityBoar.java b/src/main/java/gtPlusPlus/australia/entity/type/EntityBoar.java index 871b1a5356..871b1a5356 100644 --- a/src/Java/gtPlusPlus/australia/entity/type/EntityBoar.java +++ b/src/main/java/gtPlusPlus/australia/entity/type/EntityBoar.java diff --git a/src/Java/gtPlusPlus/australia/entity/type/EntityDingo.java b/src/main/java/gtPlusPlus/australia/entity/type/EntityDingo.java index 11b9737c4f..11b9737c4f 100644 --- a/src/Java/gtPlusPlus/australia/entity/type/EntityDingo.java +++ b/src/main/java/gtPlusPlus/australia/entity/type/EntityDingo.java diff --git a/src/Java/gtPlusPlus/australia/entity/type/EntityOctopus.java b/src/main/java/gtPlusPlus/australia/entity/type/EntityOctopus.java index f88d931b52..f88d931b52 100644 --- a/src/Java/gtPlusPlus/australia/entity/type/EntityOctopus.java +++ b/src/main/java/gtPlusPlus/australia/entity/type/EntityOctopus.java diff --git a/src/Java/gtPlusPlus/australia/gen/gt/WorldGen_Australia_Ores.java b/src/main/java/gtPlusPlus/australia/gen/gt/WorldGen_Australia_Ores.java index 18f9e6684f..18f9e6684f 100644 --- a/src/Java/gtPlusPlus/australia/gen/gt/WorldGen_Australia_Ores.java +++ b/src/main/java/gtPlusPlus/australia/gen/gt/WorldGen_Australia_Ores.java diff --git a/src/Java/gtPlusPlus/australia/gen/gt/WorldGen_GT_Australia.java b/src/main/java/gtPlusPlus/australia/gen/gt/WorldGen_GT_Australia.java index 93d5524a66..93d5524a66 100644 --- a/src/Java/gtPlusPlus/australia/gen/gt/WorldGen_GT_Australia.java +++ b/src/main/java/gtPlusPlus/australia/gen/gt/WorldGen_GT_Australia.java diff --git a/src/Java/gtPlusPlus/australia/gen/gt/WorldGen_GT_Australia_Base.java b/src/main/java/gtPlusPlus/australia/gen/gt/WorldGen_GT_Australia_Base.java index 917c1eb746..917c1eb746 100644 --- a/src/Java/gtPlusPlus/australia/gen/gt/WorldGen_GT_Australia_Base.java +++ b/src/main/java/gtPlusPlus/australia/gen/gt/WorldGen_GT_Australia_Base.java diff --git a/src/Java/gtPlusPlus/australia/gen/gt/WorldGen_GT_Australia_Ore_Layer.java b/src/main/java/gtPlusPlus/australia/gen/gt/WorldGen_GT_Australia_Ore_Layer.java index a5e5f8b245..a5e5f8b245 100644 --- a/src/Java/gtPlusPlus/australia/gen/gt/WorldGen_GT_Australia_Ore_Layer.java +++ b/src/main/java/gtPlusPlus/australia/gen/gt/WorldGen_GT_Australia_Ore_Layer.java diff --git a/src/Java/gtPlusPlus/australia/gen/map/MapGenExtendedVillage.java b/src/main/java/gtPlusPlus/australia/gen/map/MapGenExtendedVillage.java index 8fc6940242..8fc6940242 100644 --- a/src/Java/gtPlusPlus/australia/gen/map/MapGenExtendedVillage.java +++ b/src/main/java/gtPlusPlus/australia/gen/map/MapGenExtendedVillage.java diff --git a/src/Java/gtPlusPlus/australia/gen/map/MapGenLargeRavine.java b/src/main/java/gtPlusPlus/australia/gen/map/MapGenLargeRavine.java index 0eab94c5d1..0eab94c5d1 100644 --- a/src/Java/gtPlusPlus/australia/gen/map/MapGenLargeRavine.java +++ b/src/main/java/gtPlusPlus/australia/gen/map/MapGenLargeRavine.java diff --git a/src/Java/gtPlusPlus/australia/gen/map/component/AustraliaComponent.java b/src/main/java/gtPlusPlus/australia/gen/map/component/AustraliaComponent.java index b6b83d997b..b6b83d997b 100644 --- a/src/Java/gtPlusPlus/australia/gen/map/component/AustraliaComponent.java +++ b/src/main/java/gtPlusPlus/australia/gen/map/component/AustraliaComponent.java diff --git a/src/Java/gtPlusPlus/australia/gen/map/component/ComponentHut.java b/src/main/java/gtPlusPlus/australia/gen/map/component/ComponentHut.java index 1f5dd59667..1f5dd59667 100644 --- a/src/Java/gtPlusPlus/australia/gen/map/component/ComponentHut.java +++ b/src/main/java/gtPlusPlus/australia/gen/map/component/ComponentHut.java diff --git a/src/Java/gtPlusPlus/australia/gen/map/component/ComponentShack.java b/src/main/java/gtPlusPlus/australia/gen/map/component/ComponentShack.java index e3f501468b..e3f501468b 100644 --- a/src/Java/gtPlusPlus/australia/gen/map/component/ComponentShack.java +++ b/src/main/java/gtPlusPlus/australia/gen/map/component/ComponentShack.java diff --git a/src/Java/gtPlusPlus/australia/gen/map/structure/StructureManager.java b/src/main/java/gtPlusPlus/australia/gen/map/structure/StructureManager.java index b3238a5903..b3238a5903 100644 --- a/src/Java/gtPlusPlus/australia/gen/map/structure/StructureManager.java +++ b/src/main/java/gtPlusPlus/australia/gen/map/structure/StructureManager.java diff --git a/src/Java/gtPlusPlus/australia/gen/map/structure/type/ComponentVillageBank.java b/src/main/java/gtPlusPlus/australia/gen/map/structure/type/ComponentVillageBank.java index 5b7017aaf0..5b7017aaf0 100644 --- a/src/Java/gtPlusPlus/australia/gen/map/structure/type/ComponentVillageBank.java +++ b/src/main/java/gtPlusPlus/australia/gen/map/structure/type/ComponentVillageBank.java diff --git a/src/Java/gtPlusPlus/australia/gen/world/WorldGenAustralianOre.java b/src/main/java/gtPlusPlus/australia/gen/world/WorldGenAustralianOre.java index 9adb84eef2..9adb84eef2 100644 --- a/src/Java/gtPlusPlus/australia/gen/world/WorldGenAustralianOre.java +++ b/src/main/java/gtPlusPlus/australia/gen/world/WorldGenAustralianOre.java diff --git a/src/Java/gtPlusPlus/australia/gen/world/WorldGenAustralianTrees.java b/src/main/java/gtPlusPlus/australia/gen/world/WorldGenAustralianTrees.java index f3529aff0b..f3529aff0b 100644 --- a/src/Java/gtPlusPlus/australia/gen/world/WorldGenAustralianTrees.java +++ b/src/main/java/gtPlusPlus/australia/gen/world/WorldGenAustralianTrees.java diff --git a/src/Java/gtPlusPlus/australia/item/ItemAustraliaPortalTrigger.java b/src/main/java/gtPlusPlus/australia/item/ItemAustraliaPortalTrigger.java index 5100ed31c5..5100ed31c5 100644 --- a/src/Java/gtPlusPlus/australia/item/ItemAustraliaPortalTrigger.java +++ b/src/main/java/gtPlusPlus/australia/item/ItemAustraliaPortalTrigger.java diff --git a/src/Java/gtPlusPlus/australia/item/ItemBlockAustralia.java b/src/main/java/gtPlusPlus/australia/item/ItemBlockAustralia.java index 9854f9fa6a..9854f9fa6a 100644 --- a/src/Java/gtPlusPlus/australia/item/ItemBlockAustralia.java +++ b/src/main/java/gtPlusPlus/australia/item/ItemBlockAustralia.java diff --git a/src/Java/gtPlusPlus/australia/world/AustraliaPortalPosition.java b/src/main/java/gtPlusPlus/australia/world/AustraliaPortalPosition.java index 865c0c3bb2..865c0c3bb2 100644 --- a/src/Java/gtPlusPlus/australia/world/AustraliaPortalPosition.java +++ b/src/main/java/gtPlusPlus/australia/world/AustraliaPortalPosition.java diff --git a/src/Java/gtPlusPlus/australia/world/AustraliaTeleporterDimensionMod.java b/src/main/java/gtPlusPlus/australia/world/AustraliaTeleporterDimensionMod.java index 4ad693263e..4ad693263e 100644 --- a/src/Java/gtPlusPlus/australia/world/AustraliaTeleporterDimensionMod.java +++ b/src/main/java/gtPlusPlus/australia/world/AustraliaTeleporterDimensionMod.java diff --git a/src/Java/gtPlusPlus/australia/world/AustraliaWorldChunkManager.java b/src/main/java/gtPlusPlus/australia/world/AustraliaWorldChunkManager.java index f0bd35a8b9..f0bd35a8b9 100644 --- a/src/Java/gtPlusPlus/australia/world/AustraliaWorldChunkManager.java +++ b/src/main/java/gtPlusPlus/australia/world/AustraliaWorldChunkManager.java diff --git a/src/Java/gtPlusPlus/australia/world/AustraliaWorldGenerator.java b/src/main/java/gtPlusPlus/australia/world/AustraliaWorldGenerator.java index 93112bb30f..93112bb30f 100644 --- a/src/Java/gtPlusPlus/australia/world/AustraliaWorldGenerator.java +++ b/src/main/java/gtPlusPlus/australia/world/AustraliaWorldGenerator.java diff --git a/src/Java/gtPlusPlus/australia/world/AustraliaWorldProvider.java b/src/main/java/gtPlusPlus/australia/world/AustraliaWorldProvider.java index af1ca90cc9..af1ca90cc9 100644 --- a/src/Java/gtPlusPlus/australia/world/AustraliaWorldProvider.java +++ b/src/main/java/gtPlusPlus/australia/world/AustraliaWorldProvider.java diff --git a/src/Java/gtPlusPlus/australia/world/AustraliaWorldType.java b/src/main/java/gtPlusPlus/australia/world/AustraliaWorldType.java index e8c8af4f76..e8c8af4f76 100644 --- a/src/Java/gtPlusPlus/australia/world/AustraliaWorldType.java +++ b/src/main/java/gtPlusPlus/australia/world/AustraliaWorldType.java diff --git a/src/Java/gtPlusPlus/core/block/ModBlocks.java b/src/main/java/gtPlusPlus/core/block/ModBlocks.java index b51915bb7b..b51915bb7b 100644 --- a/src/Java/gtPlusPlus/core/block/ModBlocks.java +++ b/src/main/java/gtPlusPlus/core/block/ModBlocks.java diff --git a/src/Java/gtPlusPlus/core/block/base/AdvancedBlock.java b/src/main/java/gtPlusPlus/core/block/base/AdvancedBlock.java index f63762a2d7..f63762a2d7 100644 --- a/src/Java/gtPlusPlus/core/block/base/AdvancedBlock.java +++ b/src/main/java/gtPlusPlus/core/block/base/AdvancedBlock.java diff --git a/src/Java/gtPlusPlus/core/block/base/BasicBlock.java b/src/main/java/gtPlusPlus/core/block/base/BasicBlock.java index 6014388cda..6014388cda 100644 --- a/src/Java/gtPlusPlus/core/block/base/BasicBlock.java +++ b/src/main/java/gtPlusPlus/core/block/base/BasicBlock.java diff --git a/src/Java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java b/src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java index 2bfd09d848..2bfd09d848 100644 --- a/src/Java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java +++ b/src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java diff --git a/src/Java/gtPlusPlus/core/block/base/BlockBaseFluid.java b/src/main/java/gtPlusPlus/core/block/base/BlockBaseFluid.java index db37e18a32..db37e18a32 100644 --- a/src/Java/gtPlusPlus/core/block/base/BlockBaseFluid.java +++ b/src/main/java/gtPlusPlus/core/block/base/BlockBaseFluid.java diff --git a/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java b/src/main/java/gtPlusPlus/core/block/base/BlockBaseModular.java index c0113e869b..c0113e869b 100644 --- a/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java +++ b/src/main/java/gtPlusPlus/core/block/base/BlockBaseModular.java diff --git a/src/Java/gtPlusPlus/core/block/base/BlockBaseNBT.java b/src/main/java/gtPlusPlus/core/block/base/BlockBaseNBT.java index e4dff82ec4..e4dff82ec4 100644 --- a/src/Java/gtPlusPlus/core/block/base/BlockBaseNBT.java +++ b/src/main/java/gtPlusPlus/core/block/base/BlockBaseNBT.java diff --git a/src/Java/gtPlusPlus/core/block/base/BlockBaseOre.java b/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java index e1bc3462be..e1bc3462be 100644 --- a/src/Java/gtPlusPlus/core/block/base/BlockBaseOre.java +++ b/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java diff --git a/src/Java/gtPlusPlus/core/block/base/MetaBlock.java b/src/main/java/gtPlusPlus/core/block/base/MetaBlock.java index 880bb3a597..880bb3a597 100644 --- a/src/Java/gtPlusPlus/core/block/base/MetaBlock.java +++ b/src/main/java/gtPlusPlus/core/block/base/MetaBlock.java diff --git a/src/Java/gtPlusPlus/core/block/base/MultiTextureBlock.java b/src/main/java/gtPlusPlus/core/block/base/MultiTextureBlock.java index a04bf841ba..a04bf841ba 100644 --- a/src/Java/gtPlusPlus/core/block/base/MultiTextureBlock.java +++ b/src/main/java/gtPlusPlus/core/block/base/MultiTextureBlock.java diff --git a/src/Java/gtPlusPlus/core/block/general/BlockCompressedObsidian.java b/src/main/java/gtPlusPlus/core/block/general/BlockCompressedObsidian.java index 03ca846b7d..03ca846b7d 100644 --- a/src/Java/gtPlusPlus/core/block/general/BlockCompressedObsidian.java +++ b/src/main/java/gtPlusPlus/core/block/general/BlockCompressedObsidian.java diff --git a/src/Java/gtPlusPlus/core/block/general/BlockNet.java b/src/main/java/gtPlusPlus/core/block/general/BlockNet.java index 1f0f145392..1f0f145392 100644 --- a/src/Java/gtPlusPlus/core/block/general/BlockNet.java +++ b/src/main/java/gtPlusPlus/core/block/general/BlockNet.java diff --git a/src/Java/gtPlusPlus/core/block/general/BlockSuperLight.java b/src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java index a1ba3be487..a1ba3be487 100644 --- a/src/Java/gtPlusPlus/core/block/general/BlockSuperLight.java +++ b/src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java diff --git a/src/Java/gtPlusPlus/core/block/general/BlockTankXpConverter.java b/src/main/java/gtPlusPlus/core/block/general/BlockTankXpConverter.java index f7f0b446ce..f7f0b446ce 100644 --- a/src/Java/gtPlusPlus/core/block/general/BlockTankXpConverter.java +++ b/src/main/java/gtPlusPlus/core/block/general/BlockTankXpConverter.java diff --git a/src/Java/gtPlusPlus/core/block/general/FirePit.java b/src/main/java/gtPlusPlus/core/block/general/FirePit.java index 6f35715c48..6f35715c48 100644 --- a/src/Java/gtPlusPlus/core/block/general/FirePit.java +++ b/src/main/java/gtPlusPlus/core/block/general/FirePit.java diff --git a/src/Java/gtPlusPlus/core/block/general/FluidTankInfinite.java b/src/main/java/gtPlusPlus/core/block/general/FluidTankInfinite.java index b979f7864b..b979f7864b 100644 --- a/src/Java/gtPlusPlus/core/block/general/FluidTankInfinite.java +++ b/src/main/java/gtPlusPlus/core/block/general/FluidTankInfinite.java diff --git a/src/Java/gtPlusPlus/core/block/general/HellFire.java b/src/main/java/gtPlusPlus/core/block/general/HellFire.java index 233f200815..233f200815 100644 --- a/src/Java/gtPlusPlus/core/block/general/HellFire.java +++ b/src/main/java/gtPlusPlus/core/block/general/HellFire.java diff --git a/src/Java/gtPlusPlus/core/block/general/LightGlass.java b/src/main/java/gtPlusPlus/core/block/general/LightGlass.java index 30da7f1d56..30da7f1d56 100644 --- a/src/Java/gtPlusPlus/core/block/general/LightGlass.java +++ b/src/main/java/gtPlusPlus/core/block/general/LightGlass.java diff --git a/src/Java/gtPlusPlus/core/block/general/MiningExplosives.java b/src/main/java/gtPlusPlus/core/block/general/MiningExplosives.java index 8925962e4e..8925962e4e 100644 --- a/src/Java/gtPlusPlus/core/block/general/MiningExplosives.java +++ b/src/main/java/gtPlusPlus/core/block/general/MiningExplosives.java diff --git a/src/Java/gtPlusPlus/core/block/general/PlayerDoors.java b/src/main/java/gtPlusPlus/core/block/general/PlayerDoors.java index a4c0c1a0a5..a4c0c1a0a5 100644 --- a/src/Java/gtPlusPlus/core/block/general/PlayerDoors.java +++ b/src/main/java/gtPlusPlus/core/block/general/PlayerDoors.java diff --git a/src/Java/gtPlusPlus/core/block/general/antigrief/BlockWitherProof.java b/src/main/java/gtPlusPlus/core/block/general/antigrief/BlockWitherProof.java index 2210e68e8a..2210e68e8a 100644 --- a/src/Java/gtPlusPlus/core/block/general/antigrief/BlockWitherProof.java +++ b/src/main/java/gtPlusPlus/core/block/general/antigrief/BlockWitherProof.java diff --git a/src/Java/gtPlusPlus/core/block/general/antigrief/TowerDevice.java b/src/main/java/gtPlusPlus/core/block/general/antigrief/TowerDevice.java index 01a2116a0b..01a2116a0b 100644 --- a/src/Java/gtPlusPlus/core/block/general/antigrief/TowerDevice.java +++ b/src/main/java/gtPlusPlus/core/block/general/antigrief/TowerDevice.java diff --git a/src/Java/gtPlusPlus/core/block/general/fluids/BlockFluidSludge.java b/src/main/java/gtPlusPlus/core/block/general/fluids/BlockFluidSludge.java index 6af27639ae..6af27639ae 100644 --- a/src/Java/gtPlusPlus/core/block/general/fluids/BlockFluidSludge.java +++ b/src/main/java/gtPlusPlus/core/block/general/fluids/BlockFluidSludge.java diff --git a/src/Java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstone.java b/src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstone.java index b84c96be99..b84c96be99 100644 --- a/src/Java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstone.java +++ b/src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstone.java diff --git a/src/Java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstoneDetector.java b/src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstoneDetector.java index 43247110f1..43247110f1 100644 --- a/src/Java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstoneDetector.java +++ b/src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstoneDetector.java diff --git a/src/Java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstoneEmitter.java b/src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstoneEmitter.java index df8a929302..df8a929302 100644 --- a/src/Java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstoneEmitter.java +++ b/src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstoneEmitter.java diff --git a/src/Java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstoneTest.java b/src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstoneTest.java index 0f1f983cd0..0f1f983cd0 100644 --- a/src/Java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstoneTest.java +++ b/src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstoneTest.java diff --git a/src/Java/gtPlusPlus/core/block/machine/BlockGtFrameBox.java b/src/main/java/gtPlusPlus/core/block/machine/BlockGtFrameBox.java index a4ed895b13..a4ed895b13 100644 --- a/src/Java/gtPlusPlus/core/block/machine/BlockGtFrameBox.java +++ b/src/main/java/gtPlusPlus/core/block/machine/BlockGtFrameBox.java diff --git a/src/Java/gtPlusPlus/core/block/machine/CircuitProgrammer.java b/src/main/java/gtPlusPlus/core/block/machine/CircuitProgrammer.java index 7d8b3eb708..7d8b3eb708 100644 --- a/src/Java/gtPlusPlus/core/block/machine/CircuitProgrammer.java +++ b/src/main/java/gtPlusPlus/core/block/machine/CircuitProgrammer.java diff --git a/src/Java/gtPlusPlus/core/block/machine/DecayablesChest.java b/src/main/java/gtPlusPlus/core/block/machine/DecayablesChest.java index 15d330defc..15d330defc 100644 --- a/src/Java/gtPlusPlus/core/block/machine/DecayablesChest.java +++ b/src/main/java/gtPlusPlus/core/block/machine/DecayablesChest.java diff --git a/src/Java/gtPlusPlus/core/block/machine/EggBox.java b/src/main/java/gtPlusPlus/core/block/machine/EggBox.java index 630c4b5bc2..630c4b5bc2 100644 --- a/src/Java/gtPlusPlus/core/block/machine/EggBox.java +++ b/src/main/java/gtPlusPlus/core/block/machine/EggBox.java diff --git a/src/Java/gtPlusPlus/core/block/machine/FishTrap.java b/src/main/java/gtPlusPlus/core/block/machine/FishTrap.java index 037ec61ced..037ec61ced 100644 --- a/src/Java/gtPlusPlus/core/block/machine/FishTrap.java +++ b/src/main/java/gtPlusPlus/core/block/machine/FishTrap.java diff --git a/src/Java/gtPlusPlus/core/block/machine/HeliumGenerator.java b/src/main/java/gtPlusPlus/core/block/machine/HeliumGenerator.java index 5dc8604a93..5dc8604a93 100644 --- a/src/Java/gtPlusPlus/core/block/machine/HeliumGenerator.java +++ b/src/main/java/gtPlusPlus/core/block/machine/HeliumGenerator.java diff --git a/src/Java/gtPlusPlus/core/block/machine/Machine_ModularityTable.java b/src/main/java/gtPlusPlus/core/block/machine/Machine_ModularityTable.java index 6f60d39ce7..6f60d39ce7 100644 --- a/src/Java/gtPlusPlus/core/block/machine/Machine_ModularityTable.java +++ b/src/main/java/gtPlusPlus/core/block/machine/Machine_ModularityTable.java diff --git a/src/Java/gtPlusPlus/core/block/machine/Machine_PestKiller.java b/src/main/java/gtPlusPlus/core/block/machine/Machine_PestKiller.java index 11fa80f439..11fa80f439 100644 --- a/src/Java/gtPlusPlus/core/block/machine/Machine_PestKiller.java +++ b/src/main/java/gtPlusPlus/core/block/machine/Machine_PestKiller.java diff --git a/src/Java/gtPlusPlus/core/block/machine/Machine_PooCollector.java b/src/main/java/gtPlusPlus/core/block/machine/Machine_PooCollector.java index 945cf7b581..945cf7b581 100644 --- a/src/Java/gtPlusPlus/core/block/machine/Machine_PooCollector.java +++ b/src/main/java/gtPlusPlus/core/block/machine/Machine_PooCollector.java diff --git a/src/Java/gtPlusPlus/core/block/machine/Machine_ProjectTable.java b/src/main/java/gtPlusPlus/core/block/machine/Machine_ProjectTable.java index fdb6b1a0a8..fdb6b1a0a8 100644 --- a/src/Java/gtPlusPlus/core/block/machine/Machine_ProjectTable.java +++ b/src/main/java/gtPlusPlus/core/block/machine/Machine_ProjectTable.java diff --git a/src/Java/gtPlusPlus/core/block/machine/Machine_RoundRobinator.java b/src/main/java/gtPlusPlus/core/block/machine/Machine_RoundRobinator.java index dc87b885b9..dc87b885b9 100644 --- a/src/Java/gtPlusPlus/core/block/machine/Machine_RoundRobinator.java +++ b/src/main/java/gtPlusPlus/core/block/machine/Machine_RoundRobinator.java diff --git a/src/Java/gtPlusPlus/core/block/machine/Machine_SuperJukebox.java b/src/main/java/gtPlusPlus/core/block/machine/Machine_SuperJukebox.java index fe8120e635..021279f820 100644 --- a/src/Java/gtPlusPlus/core/block/machine/Machine_SuperJukebox.java +++ b/src/main/java/gtPlusPlus/core/block/machine/Machine_SuperJukebox.java @@ -532,14 +532,12 @@ public class Machine_SuperJukebox extends BlockJukebox } return this.getInventory().isItemValidForSlot(slot, itemstack); } + + private final static int[] SIDED_SLOTS = new int[] {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17}; @Override public int[] getAccessibleSlotsFromSide(final int p_94128_1_) { - final int[] accessibleSides = new int[this.getSizeInventory()]; - for (int r = 0; r < this.getInventory().getSizeInventory(); r++) { - accessibleSides[r] = r; - } - return accessibleSides; + return SIDED_SLOTS; } diff --git a/src/Java/gtPlusPlus/core/block/machine/Machine_TradeTable.java b/src/main/java/gtPlusPlus/core/block/machine/Machine_TradeTable.java index 5195e0f18c..5195e0f18c 100644 --- a/src/Java/gtPlusPlus/core/block/machine/Machine_TradeTable.java +++ b/src/main/java/gtPlusPlus/core/block/machine/Machine_TradeTable.java diff --git a/src/Java/gtPlusPlus/core/block/machine/Machine_WireiusDeletus.java b/src/main/java/gtPlusPlus/core/block/machine/Machine_WireiusDeletus.java index e964a9da01..e964a9da01 100644 --- a/src/Java/gtPlusPlus/core/block/machine/Machine_WireiusDeletus.java +++ b/src/main/java/gtPlusPlus/core/block/machine/Machine_WireiusDeletus.java diff --git a/src/Java/gtPlusPlus/core/block/machine/Machine_Workbench.java b/src/main/java/gtPlusPlus/core/block/machine/Machine_Workbench.java index 5c08612042..5c08612042 100644 --- a/src/Java/gtPlusPlus/core/block/machine/Machine_Workbench.java +++ b/src/main/java/gtPlusPlus/core/block/machine/Machine_Workbench.java diff --git a/src/Java/gtPlusPlus/core/block/machine/Machine_WorkbenchAdvanced.java b/src/main/java/gtPlusPlus/core/block/machine/Machine_WorkbenchAdvanced.java index af2f9f82e0..af2f9f82e0 100644 --- a/src/Java/gtPlusPlus/core/block/machine/Machine_WorkbenchAdvanced.java +++ b/src/main/java/gtPlusPlus/core/block/machine/Machine_WorkbenchAdvanced.java diff --git a/src/Java/gtPlusPlus/core/block/machine/VolumetricFlaskSetter.java b/src/main/java/gtPlusPlus/core/block/machine/VolumetricFlaskSetter.java index 36ea2af7cc..90f9c1056a 100644 --- a/src/Java/gtPlusPlus/core/block/machine/VolumetricFlaskSetter.java +++ b/src/main/java/gtPlusPlus/core/block/machine/VolumetricFlaskSetter.java @@ -92,12 +92,7 @@ public class VolumetricFlaskSetter extends BasicTileBlockWithTooltip { @Override public int getRenderBlockPass() { - return 1; - } - - @Override - public boolean isOpaqueCube() { - return false; + return 0; } @Override diff --git a/src/Java/gtPlusPlus/core/block/machine/bedrock/Mining_Head_Fake.java b/src/main/java/gtPlusPlus/core/block/machine/bedrock/Mining_Head_Fake.java index b8f9662ac7..b8f9662ac7 100644 --- a/src/Java/gtPlusPlus/core/block/machine/bedrock/Mining_Head_Fake.java +++ b/src/main/java/gtPlusPlus/core/block/machine/bedrock/Mining_Head_Fake.java diff --git a/src/Java/gtPlusPlus/core/block/machine/bedrock/Mining_Pipe_Fake.java b/src/main/java/gtPlusPlus/core/block/machine/bedrock/Mining_Pipe_Fake.java index bba185a0c1..bba185a0c1 100644 --- a/src/Java/gtPlusPlus/core/block/machine/bedrock/Mining_Pipe_Fake.java +++ b/src/main/java/gtPlusPlus/core/block/machine/bedrock/Mining_Pipe_Fake.java diff --git a/src/Java/gtPlusPlus/core/chunkloading/GTPP_ChunkManager.java b/src/main/java/gtPlusPlus/core/chunkloading/GTPP_ChunkManager.java index ddfe9b8227..ddfe9b8227 100644 --- a/src/Java/gtPlusPlus/core/chunkloading/GTPP_ChunkManager.java +++ b/src/main/java/gtPlusPlus/core/chunkloading/GTPP_ChunkManager.java diff --git a/src/Java/gtPlusPlus/core/chunkloading/StaticChunkFunctions.java b/src/main/java/gtPlusPlus/core/chunkloading/StaticChunkFunctions.java index 36d9fa670c..36d9fa670c 100644 --- a/src/Java/gtPlusPlus/core/chunkloading/StaticChunkFunctions.java +++ b/src/main/java/gtPlusPlus/core/chunkloading/StaticChunkFunctions.java diff --git a/src/Java/gtPlusPlus/core/client/CustomTextureSet.java b/src/main/java/gtPlusPlus/core/client/CustomTextureSet.java index 400503b2fa..400503b2fa 100644 --- a/src/Java/gtPlusPlus/core/client/CustomTextureSet.java +++ b/src/main/java/gtPlusPlus/core/client/CustomTextureSet.java diff --git a/src/Java/gtPlusPlus/core/client/model/ModelBatKing.java b/src/main/java/gtPlusPlus/core/client/model/ModelBatKing.java index ac64dee26a..ac64dee26a 100644 --- a/src/Java/gtPlusPlus/core/client/model/ModelBatKing.java +++ b/src/main/java/gtPlusPlus/core/client/model/ModelBatKing.java diff --git a/src/Java/gtPlusPlus/core/client/model/ModelDecayChest.java b/src/main/java/gtPlusPlus/core/client/model/ModelDecayChest.java index c116dcf115..c116dcf115 100644 --- a/src/Java/gtPlusPlus/core/client/model/ModelDecayChest.java +++ b/src/main/java/gtPlusPlus/core/client/model/ModelDecayChest.java diff --git a/src/Java/gtPlusPlus/core/client/model/ModelEggBox.java b/src/main/java/gtPlusPlus/core/client/model/ModelEggBox.java index 0aef4eb7b0..0aef4eb7b0 100644 --- a/src/Java/gtPlusPlus/core/client/model/ModelEggBox.java +++ b/src/main/java/gtPlusPlus/core/client/model/ModelEggBox.java diff --git a/src/Java/gtPlusPlus/core/client/model/ModelGiantChicken.java b/src/main/java/gtPlusPlus/core/client/model/ModelGiantChicken.java index f7fb92f550..f7fb92f550 100644 --- a/src/Java/gtPlusPlus/core/client/model/ModelGiantChicken.java +++ b/src/main/java/gtPlusPlus/core/client/model/ModelGiantChicken.java diff --git a/src/Java/gtPlusPlus/core/client/model/ModelSickBlaze.java b/src/main/java/gtPlusPlus/core/client/model/ModelSickBlaze.java index 455df761cb..455df761cb 100644 --- a/src/Java/gtPlusPlus/core/client/model/ModelSickBlaze.java +++ b/src/main/java/gtPlusPlus/core/client/model/ModelSickBlaze.java diff --git a/src/Java/gtPlusPlus/core/client/model/ModelStaballoyConstruct.java b/src/main/java/gtPlusPlus/core/client/model/ModelStaballoyConstruct.java index aa23635b4d..aa23635b4d 100644 --- a/src/Java/gtPlusPlus/core/client/model/ModelStaballoyConstruct.java +++ b/src/main/java/gtPlusPlus/core/client/model/ModelStaballoyConstruct.java diff --git a/src/Java/gtPlusPlus/core/client/model/tabula/ModelTabulaBase.java b/src/main/java/gtPlusPlus/core/client/model/tabula/ModelTabulaBase.java index 3a0cbb636b..3a0cbb636b 100644 --- a/src/Java/gtPlusPlus/core/client/model/tabula/ModelTabulaBase.java +++ b/src/main/java/gtPlusPlus/core/client/model/tabula/ModelTabulaBase.java diff --git a/src/Java/gtPlusPlus/core/client/renderer/CustomItemBlockRenderer.java b/src/main/java/gtPlusPlus/core/client/renderer/CustomItemBlockRenderer.java index f40357495a..f40357495a 100644 --- a/src/Java/gtPlusPlus/core/client/renderer/CustomItemBlockRenderer.java +++ b/src/main/java/gtPlusPlus/core/client/renderer/CustomItemBlockRenderer.java diff --git a/src/Java/gtPlusPlus/core/client/renderer/CustomOreBlockRenderer.java b/src/main/java/gtPlusPlus/core/client/renderer/CustomOreBlockRenderer.java index a0b34d3b0b..a0b34d3b0b 100644 --- a/src/Java/gtPlusPlus/core/client/renderer/CustomOreBlockRenderer.java +++ b/src/main/java/gtPlusPlus/core/client/renderer/CustomOreBlockRenderer.java diff --git a/src/Java/gtPlusPlus/core/client/renderer/RenderBatKing.java b/src/main/java/gtPlusPlus/core/client/renderer/RenderBatKing.java index 000badb80f..000badb80f 100644 --- a/src/Java/gtPlusPlus/core/client/renderer/RenderBatKing.java +++ b/src/main/java/gtPlusPlus/core/client/renderer/RenderBatKing.java diff --git a/src/Java/gtPlusPlus/core/client/renderer/RenderDecayChest.java b/src/main/java/gtPlusPlus/core/client/renderer/RenderDecayChest.java index 73ab4093eb..73ab4093eb 100644 --- a/src/Java/gtPlusPlus/core/client/renderer/RenderDecayChest.java +++ b/src/main/java/gtPlusPlus/core/client/renderer/RenderDecayChest.java diff --git a/src/Java/gtPlusPlus/core/client/renderer/RenderGiantChicken.java b/src/main/java/gtPlusPlus/core/client/renderer/RenderGiantChicken.java index cc1249280b..cc1249280b 100644 --- a/src/Java/gtPlusPlus/core/client/renderer/RenderGiantChicken.java +++ b/src/main/java/gtPlusPlus/core/client/renderer/RenderGiantChicken.java diff --git a/src/Java/gtPlusPlus/core/client/renderer/RenderMiningExplosivesPrimed.java b/src/main/java/gtPlusPlus/core/client/renderer/RenderMiningExplosivesPrimed.java index 893982e8ac..893982e8ac 100644 --- a/src/Java/gtPlusPlus/core/client/renderer/RenderMiningExplosivesPrimed.java +++ b/src/main/java/gtPlusPlus/core/client/renderer/RenderMiningExplosivesPrimed.java diff --git a/src/Java/gtPlusPlus/core/client/renderer/RenderPlasmaBolt.java b/src/main/java/gtPlusPlus/core/client/renderer/RenderPlasmaBolt.java index b73154da10..b73154da10 100644 --- a/src/Java/gtPlusPlus/core/client/renderer/RenderPlasmaBolt.java +++ b/src/main/java/gtPlusPlus/core/client/renderer/RenderPlasmaBolt.java diff --git a/src/Java/gtPlusPlus/core/client/renderer/RenderPotionthrow.java b/src/main/java/gtPlusPlus/core/client/renderer/RenderPotionthrow.java index a0e396bc23..a0e396bc23 100644 --- a/src/Java/gtPlusPlus/core/client/renderer/RenderPotionthrow.java +++ b/src/main/java/gtPlusPlus/core/client/renderer/RenderPotionthrow.java diff --git a/src/Java/gtPlusPlus/core/client/renderer/RenderSickBlaze.java b/src/main/java/gtPlusPlus/core/client/renderer/RenderSickBlaze.java index e1e8360840..e1e8360840 100644 --- a/src/Java/gtPlusPlus/core/client/renderer/RenderSickBlaze.java +++ b/src/main/java/gtPlusPlus/core/client/renderer/RenderSickBlaze.java diff --git a/src/Java/gtPlusPlus/core/client/renderer/RenderStaballoyConstruct.java b/src/main/java/gtPlusPlus/core/client/renderer/RenderStaballoyConstruct.java index c1fd88773d..c1fd88773d 100644 --- a/src/Java/gtPlusPlus/core/client/renderer/RenderStaballoyConstruct.java +++ b/src/main/java/gtPlusPlus/core/client/renderer/RenderStaballoyConstruct.java diff --git a/src/Java/gtPlusPlus/core/client/renderer/RenderToxinball.java b/src/main/java/gtPlusPlus/core/client/renderer/RenderToxinball.java index 711cec169b..711cec169b 100644 --- a/src/Java/gtPlusPlus/core/client/renderer/RenderToxinball.java +++ b/src/main/java/gtPlusPlus/core/client/renderer/RenderToxinball.java diff --git a/src/Java/gtPlusPlus/core/client/renderer/particle/EntityDropParticleFX.java b/src/main/java/gtPlusPlus/core/client/renderer/particle/EntityDropParticleFX.java index ed2fdff272..ed2fdff272 100644 --- a/src/Java/gtPlusPlus/core/client/renderer/particle/EntityDropParticleFX.java +++ b/src/main/java/gtPlusPlus/core/client/renderer/particle/EntityDropParticleFX.java diff --git a/src/Java/gtPlusPlus/core/client/renderer/tabula/RenderTabulaBase.java b/src/main/java/gtPlusPlus/core/client/renderer/tabula/RenderTabulaBase.java index b4f64f9b35..b4f64f9b35 100644 --- a/src/Java/gtPlusPlus/core/client/renderer/tabula/RenderTabulaBase.java +++ b/src/main/java/gtPlusPlus/core/client/renderer/tabula/RenderTabulaBase.java diff --git a/src/Java/gtPlusPlus/core/commands/CommandDebugChunks.java b/src/main/java/gtPlusPlus/core/commands/CommandDebugChunks.java index 8e86bcdcd6..8e86bcdcd6 100644 --- a/src/Java/gtPlusPlus/core/commands/CommandDebugChunks.java +++ b/src/main/java/gtPlusPlus/core/commands/CommandDebugChunks.java diff --git a/src/Java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java b/src/main/java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java index c9cdc41424..493b7d415d 100644 --- a/src/Java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java +++ b/src/main/java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java @@ -4,8 +4,10 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; +import cpw.mods.fml.common.registry.GameRegistry; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; +import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -105,6 +107,20 @@ public class CommandEnableDebugWhileRunning implements ICommand PlayerUtils.messagePlayer(P, ItemUtils.getItemName(mSemiFluidgen)); } }*/ + + else if (argString[0].toLowerCase().equals("inv")) { + final EntityPlayer P = CommandUtils.getPlayer(S); + if (P != null && !P.worldObj.isRemote) { + ItemStack[] aInv = P.inventory.mainInventory; + for (ItemStack aItem : aInv) { + if (aItem != null) { + String aModID = GameRegistry.findUniqueIdentifierFor(aItem.getItem()).modId; + String aRegistryName = GameRegistry.findUniqueIdentifierFor(aItem.getItem()).name; + Logger.INFO(aModID+":"+aRegistryName); + } + } + } + } else if (argString[0].toLowerCase().equals("hand")) { final EntityPlayer P = CommandUtils.getPlayer(S); if (P != null) { @@ -133,15 +149,21 @@ public class CommandEnableDebugWhileRunning implements ICommand } } - String aFluidContainerData = ""; + AutoMap<String> aFluidContainerData = new AutoMap<String>(); FluidStack aHeldItemFluid = FluidContainerRegistry.getFluidForFilledItem(aHeldItem); if (aHeldItemFluid != null) { - aFluidContainerData = "["+aHeldItemFluid.getUnlocalizedName()+"]["+aHeldItemFluid.getLocalizedName()+"]"; + aFluidContainerData.put("FluidStack Unlocal Name: "+aHeldItemFluid.getUnlocalizedName()); + aFluidContainerData.put("FluidStack Local Name: "+aHeldItemFluid.getLocalizedName()); + aFluidContainerData.put("Fluid Unlocal Name: "+aHeldItemFluid.getFluid().getUnlocalizedName()); + aFluidContainerData.put("Fluid Local Name: "+aHeldItemFluid.getFluid().getLocalizedName()); + aFluidContainerData.put("Fluid Name: "+aHeldItemFluid.getFluid().getName()); } PlayerUtils.messagePlayer(P, "["+aItemUnlocalName+"]"+"["+aItemDisplayName+"] "); - if (aFluidContainerData.length() > 0) { - PlayerUtils.messagePlayer(P, ""+aFluidContainerData); + if (aFluidContainerData.size() > 0) { + for (String s : aFluidContainerData) { + PlayerUtils.messagePlayer(P, ""+s); + } } if (!aOreDictNames.isEmpty()) { PlayerUtils.messagePlayer(P, ""+aOreDictData); diff --git a/src/Java/gtPlusPlus/core/commands/CommandMath.java b/src/main/java/gtPlusPlus/core/commands/CommandMath.java index 5ccfb3397f..5ccfb3397f 100644 --- a/src/Java/gtPlusPlus/core/commands/CommandMath.java +++ b/src/main/java/gtPlusPlus/core/commands/CommandMath.java diff --git a/src/Java/gtPlusPlus/core/commands/CommandUtils.java b/src/main/java/gtPlusPlus/core/commands/CommandUtils.java index 175925d40c..175925d40c 100644 --- a/src/Java/gtPlusPlus/core/commands/CommandUtils.java +++ b/src/main/java/gtPlusPlus/core/commands/CommandUtils.java diff --git a/src/Java/gtPlusPlus/core/common/BasePlayer.java b/src/main/java/gtPlusPlus/core/common/BasePlayer.java index 4686f34207..4686f34207 100644 --- a/src/Java/gtPlusPlus/core/common/BasePlayer.java +++ b/src/main/java/gtPlusPlus/core/common/BasePlayer.java diff --git a/src/Java/gtPlusPlus/core/common/CommonProxy.java b/src/main/java/gtPlusPlus/core/common/CommonProxy.java index 9565d242c4..c038afce8f 100644 --- a/src/Java/gtPlusPlus/core/common/CommonProxy.java +++ b/src/main/java/gtPlusPlus/core/common/CommonProxy.java @@ -3,7 +3,6 @@ package gtPlusPlus.core.common; import cpw.mods.fml.common.event.*; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import cpw.mods.fml.common.registry.GameRegistry; -import gregtech.api.enums.ItemList; import gregtech.api.enums.OrePrefixes; import gtPlusPlus.GTplusplus; import gtPlusPlus.api.objects.Logger; @@ -51,8 +50,6 @@ import net.minecraftforge.client.IItemRenderer; public class CommonProxy { - private boolean mFluidsGenerated = false; - public CommonProxy() { // Should Register Gregtech Materials I've Made Utils.registerEvent(this); @@ -99,11 +96,6 @@ public class CommonProxy { Logger.INFO("[Proxy] Calling Render registrator."); registerRenderThings(); - if (!mFluidsGenerated && ItemList.Cell_Empty.hasBeenSet()) { - Material.generateQueuedFluids(); - mFluidsGenerated = true; - } - } public void init(final FMLInitializationEvent e) { @@ -114,15 +106,6 @@ public class CommonProxy { registerCustomItemsForMaterials(); ModBlocks.blockCustomMobSpawner = new BlockGenericSpawner(); - - if (!mFluidsGenerated && ItemList.Cell_Empty.hasBeenSet()) { - Material.generateQueuedFluids(); - mFluidsGenerated = true; - } else { - Logger.INFO("[ERROR] Did not generate fluids at all."); - Logger.WARNING("[ERROR] Did not generate fluids at all."); - Logger.ERROR("[ERROR] Did not generate fluids at all."); - } CI.init(); FluidFactory.init(); @@ -236,7 +219,7 @@ public class CommonProxy { } public void registerCustomItemsForMaterials() { - Material.registerComponentForMaterial(GenericChem.CARBYNE, OrePrefixes.plate, GregtechItemList.Carbyne_Sheet_Finished.get(1)); + //Material.registerComponentForMaterial(GenericChem.CARBYNE, OrePrefixes.plate, GregtechItemList.Carbyne_Sheet_Finished.get(1)); } public void registerCustomMobDrops() { diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_Baubles.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Baubles.java index c9704603af..c9704603af 100644 --- a/src/Java/gtPlusPlus/core/common/compat/COMPAT_Baubles.java +++ b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Baubles.java diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_BigReactors.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_BigReactors.java index 3854f6612f..3854f6612f 100644 --- a/src/Java/gtPlusPlus/core/common/compat/COMPAT_BigReactors.java +++ b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_BigReactors.java diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_CompactWindmills.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_CompactWindmills.java index cd5d36b653..cd5d36b653 100644 --- a/src/Java/gtPlusPlus/core/common/compat/COMPAT_CompactWindmills.java +++ b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_CompactWindmills.java diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_EnderIO.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_EnderIO.java index 6598a7e21e..6598a7e21e 100644 --- a/src/Java/gtPlusPlus/core/common/compat/COMPAT_EnderIO.java +++ b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_EnderIO.java diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_ExtraUtils.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_ExtraUtils.java index d5ee51f61a..d5ee51f61a 100644 --- a/src/Java/gtPlusPlus/core/common/compat/COMPAT_ExtraUtils.java +++ b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_ExtraUtils.java diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_HarvestCraft.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_HarvestCraft.java index 9e148f0102..9e148f0102 100644 --- a/src/Java/gtPlusPlus/core/common/compat/COMPAT_HarvestCraft.java +++ b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_HarvestCraft.java diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_IC2.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_IC2.java index e1ed2a666a..e1ed2a666a 100644 --- a/src/Java/gtPlusPlus/core/common/compat/COMPAT_IC2.java +++ b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_IC2.java diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_MorePlanets.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_MorePlanets.java index b7da7c436e..b7da7c436e 100644 --- a/src/Java/gtPlusPlus/core/common/compat/COMPAT_MorePlanets.java +++ b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_MorePlanets.java diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_OpenBlocks.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_OpenBlocks.java index 6381a6705e..6381a6705e 100644 --- a/src/Java/gtPlusPlus/core/common/compat/COMPAT_OpenBlocks.java +++ b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_OpenBlocks.java diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_PlayerAPI.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_PlayerAPI.java index 12b3a94083..12b3a94083 100644 --- a/src/Java/gtPlusPlus/core/common/compat/COMPAT_PlayerAPI.java +++ b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_PlayerAPI.java diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_PneumaticCraft.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_PneumaticCraft.java index 0f80dc8be4..0f80dc8be4 100644 --- a/src/Java/gtPlusPlus/core/common/compat/COMPAT_PneumaticCraft.java +++ b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_PneumaticCraft.java diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_RFTools.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_RFTools.java index 37c87ad99d..37c87ad99d 100644 --- a/src/Java/gtPlusPlus/core/common/compat/COMPAT_RFTools.java +++ b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_RFTools.java diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_Railcraft.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Railcraft.java index f6c8e86808..f6c8e86808 100644 --- a/src/Java/gtPlusPlus/core/common/compat/COMPAT_Railcraft.java +++ b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Railcraft.java diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_SimplyJetpacks.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_SimplyJetpacks.java index 5f9976acb0..5f9976acb0 100644 --- a/src/Java/gtPlusPlus/core/common/compat/COMPAT_SimplyJetpacks.java +++ b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_SimplyJetpacks.java diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_Thaumcraft.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Thaumcraft.java index b78c10c8ce..b78c10c8ce 100644 --- a/src/Java/gtPlusPlus/core/common/compat/COMPAT_Thaumcraft.java +++ b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Thaumcraft.java diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_Witchery.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Witchery.java index cde6e3ae98..cde6e3ae98 100644 --- a/src/Java/gtPlusPlus/core/common/compat/COMPAT_Witchery.java +++ b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Witchery.java diff --git a/src/Java/gtPlusPlus/core/config/ConfigHandler.java b/src/main/java/gtPlusPlus/core/config/ConfigHandler.java index 7c1b584d87..382b63e2c3 100644 --- a/src/Java/gtPlusPlus/core/config/ConfigHandler.java +++ b/src/main/java/gtPlusPlus/core/config/ConfigHandler.java @@ -225,10 +225,10 @@ public class ConfigHandler { pollutionPerSecondMultiMassFabricator = config.get("pollution", "pollutionPerSecondMultiMassFabricator", pollutionPerSecondMultiMassFabricator,"pollution rate in gibbl/s for the Matter fabrication CPU").getInt(pollutionPerSecondMultiMassFabricator); pollutionPerSecondMultiRefinery = config.get("pollution", "pollutionPerSecondMultiRefinery", pollutionPerSecondMultiRefinery,"pollution rate in gibbl/s for the Reactor fuel processing plant").getInt(pollutionPerSecondMultiRefinery); //pollutionPerSecondMultiGeneratorArray; + pollutionPerSecondMultiIndustrialRockBreaker = config.get("pollution", "pollutionPerSecondMultiIndustrialRockBreaker", pollutionPerSecondMultiIndustrialRockBreaker,"pollution rate in gibbl/s for the Industrial Rock Breaker").getInt(pollutionPerSecondMultiIndustrialRockBreaker); + pollutionPerSecondMultiIndustrialChisel = config.get("pollution", "pollutionPerSecondMultiIndustrialChisel", pollutionPerSecondMultiIndustrialChisel,"pollution rate in gibbl/s for the Industrial Chisel").getInt(pollutionPerSecondMultiIndustrialChisel); pollutionPerSecondMultiTreeFarm = config.get("pollution", "pollutionPerSecondMultiTreeFarm", pollutionPerSecondMultiTreeFarm,"pollution rate in gibbl/s for the Tree growth simulator").getInt(pollutionPerSecondMultiTreeFarm); pollutionPerSecondMultiFrothFlotationCell = config.get("pollution", "pollutionPerSecondMultiFrothFlotationCell", pollutionPerSecondMultiFrothFlotationCell,"pollution rate in gibbl/s for the Flotation cell regulator").getInt(pollutionPerSecondMultiFrothFlotationCell); - pollutionPerSecondMultiNuclearReactor_ModeBoosted = config.get("pollution", "pollutionPerSecondMultiNuclearReactor_ModeBoosted", pollutionPerSecondMultiNuclearReactor_ModeBoosted,"pollution rate in gibbl/s for the Thorium reactor when boosted").getInt(pollutionPerSecondMultiNuclearReactor_ModeBoosted); - pollutionPerSecondMultiNuclearReactor_ModeNormal = config.get("pollution", "pollutionPerSecondMultiNuclearReactor_ModeNormal", pollutionPerSecondMultiNuclearReactor_ModeNormal,"pollution rate in gibbl/s for the Thorium reactor").getInt(pollutionPerSecondMultiNuclearReactor_ModeNormal); pollutionPerSecondMultiAutoCrafter = config.get("pollution", "pollutionPerSecondMultiAutoCrafter", pollutionPerSecondMultiAutoCrafter,"pollution rate in gibbl/s for the Large-Scale auto assembler v1.01").getInt(pollutionPerSecondMultiAutoCrafter); pollutionPerSecondMultiThermalBoiler = config.get("pollution", "pollutionPerSecondMultiThermalBoiler", pollutionPerSecondMultiThermalBoiler,"pollution rate in gibbl/s for the Thermal boiler").getInt(pollutionPerSecondMultiThermalBoiler); pollutionPerSecondMultiAlgaePond = config.get("pollution", "pollutionPerSecondMultiAlgaePond", pollutionPerSecondMultiAlgaePond,"pollution rate in gibbl/s for the Algae farm").getInt(pollutionPerSecondMultiAlgaePond); diff --git a/src/Java/gtPlusPlus/core/container/Container_BackpackBase.java b/src/main/java/gtPlusPlus/core/container/Container_BackpackBase.java index ad76bebe81..ad76bebe81 100644 --- a/src/Java/gtPlusPlus/core/container/Container_BackpackBase.java +++ b/src/main/java/gtPlusPlus/core/container/Container_BackpackBase.java diff --git a/src/Java/gtPlusPlus/core/container/Container_CircuitProgrammer.java b/src/main/java/gtPlusPlus/core/container/Container_CircuitProgrammer.java index d8ce521fb5..d8ce521fb5 100644 --- a/src/Java/gtPlusPlus/core/container/Container_CircuitProgrammer.java +++ b/src/main/java/gtPlusPlus/core/container/Container_CircuitProgrammer.java diff --git a/src/Java/gtPlusPlus/core/container/Container_DecayablesChest.java b/src/main/java/gtPlusPlus/core/container/Container_DecayablesChest.java index 5bc384cd29..5bc384cd29 100644 --- a/src/Java/gtPlusPlus/core/container/Container_DecayablesChest.java +++ b/src/main/java/gtPlusPlus/core/container/Container_DecayablesChest.java diff --git a/src/Java/gtPlusPlus/core/container/Container_EggBox.java b/src/main/java/gtPlusPlus/core/container/Container_EggBox.java index c4396cca6f..c4396cca6f 100644 --- a/src/Java/gtPlusPlus/core/container/Container_EggBox.java +++ b/src/main/java/gtPlusPlus/core/container/Container_EggBox.java diff --git a/src/Java/gtPlusPlus/core/container/Container_FishTrap.java b/src/main/java/gtPlusPlus/core/container/Container_FishTrap.java index a2f44441d9..a2f44441d9 100644 --- a/src/Java/gtPlusPlus/core/container/Container_FishTrap.java +++ b/src/main/java/gtPlusPlus/core/container/Container_FishTrap.java diff --git a/src/Java/gtPlusPlus/core/container/Container_Grindle.java b/src/main/java/gtPlusPlus/core/container/Container_Grindle.java index 4ab79322c9..4ab79322c9 100644 --- a/src/Java/gtPlusPlus/core/container/Container_Grindle.java +++ b/src/main/java/gtPlusPlus/core/container/Container_Grindle.java diff --git a/src/Java/gtPlusPlus/core/container/Container_HeliumGenerator.java b/src/main/java/gtPlusPlus/core/container/Container_HeliumGenerator.java index 39e07f2f0e..39e07f2f0e 100644 --- a/src/Java/gtPlusPlus/core/container/Container_HeliumGenerator.java +++ b/src/main/java/gtPlusPlus/core/container/Container_HeliumGenerator.java diff --git a/src/Java/gtPlusPlus/core/container/Container_ModularityTable.java b/src/main/java/gtPlusPlus/core/container/Container_ModularityTable.java index e0fb51fe61..e0fb51fe61 100644 --- a/src/Java/gtPlusPlus/core/container/Container_ModularityTable.java +++ b/src/main/java/gtPlusPlus/core/container/Container_ModularityTable.java diff --git a/src/Java/gtPlusPlus/core/container/Container_PestKiller.java b/src/main/java/gtPlusPlus/core/container/Container_PestKiller.java index 2f25c5aace..2f25c5aace 100644 --- a/src/Java/gtPlusPlus/core/container/Container_PestKiller.java +++ b/src/main/java/gtPlusPlus/core/container/Container_PestKiller.java diff --git a/src/Java/gtPlusPlus/core/container/Container_ProjectTable.java b/src/main/java/gtPlusPlus/core/container/Container_ProjectTable.java index 2cdf7ee783..2cdf7ee783 100644 --- a/src/Java/gtPlusPlus/core/container/Container_ProjectTable.java +++ b/src/main/java/gtPlusPlus/core/container/Container_ProjectTable.java diff --git a/src/Java/gtPlusPlus/core/container/Container_RoundRobinator.java b/src/main/java/gtPlusPlus/core/container/Container_RoundRobinator.java index cbd08c2cca..cbd08c2cca 100644 --- a/src/Java/gtPlusPlus/core/container/Container_RoundRobinator.java +++ b/src/main/java/gtPlusPlus/core/container/Container_RoundRobinator.java diff --git a/src/Java/gtPlusPlus/core/container/Container_SuperJukebox.java b/src/main/java/gtPlusPlus/core/container/Container_SuperJukebox.java index f9bf617e1b..f9bf617e1b 100644 --- a/src/Java/gtPlusPlus/core/container/Container_SuperJukebox.java +++ b/src/main/java/gtPlusPlus/core/container/Container_SuperJukebox.java diff --git a/src/Java/gtPlusPlus/core/container/Container_TradeTable.java b/src/main/java/gtPlusPlus/core/container/Container_TradeTable.java index f812e384a7..f812e384a7 100644 --- a/src/Java/gtPlusPlus/core/container/Container_TradeTable.java +++ b/src/main/java/gtPlusPlus/core/container/Container_TradeTable.java diff --git a/src/Java/gtPlusPlus/core/container/Container_VolumetricFlaskSetter.java b/src/main/java/gtPlusPlus/core/container/Container_VolumetricFlaskSetter.java index de3106c957..65e84d7272 100644 --- a/src/Java/gtPlusPlus/core/container/Container_VolumetricFlaskSetter.java +++ b/src/main/java/gtPlusPlus/core/container/Container_VolumetricFlaskSetter.java @@ -4,6 +4,7 @@ import java.util.Iterator; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.inventories.Inventory_VolumetricFlaskSetter; import gtPlusPlus.core.slots.SlotNoInput; @@ -24,8 +25,8 @@ public class Container_VolumetricFlaskSetter extends Container { public final Inventory_VolumetricFlaskSetter inventoryChest; - public short mCustomValue; - private short oCustomValue; + public int mCustomValue; + private int oCustomValue; private int mTimer; @@ -181,5 +182,9 @@ public class Container_VolumetricFlaskSetter extends Container { break; } } + + public void log(String aString) { + Logger.INFO("[Flask-Container] "+aString); + } }
\ No newline at end of file diff --git a/src/Java/gtPlusPlus/core/container/Container_Workbench.java b/src/main/java/gtPlusPlus/core/container/Container_Workbench.java index 55ef1a3d0c..55ef1a3d0c 100644 --- a/src/Java/gtPlusPlus/core/container/Container_Workbench.java +++ b/src/main/java/gtPlusPlus/core/container/Container_Workbench.java diff --git a/src/Java/gtPlusPlus/core/container/Container_WorkbenchAdvanced.java b/src/main/java/gtPlusPlus/core/container/Container_WorkbenchAdvanced.java index dc499c570f..dc499c570f 100644 --- a/src/Java/gtPlusPlus/core/container/Container_WorkbenchAdvanced.java +++ b/src/main/java/gtPlusPlus/core/container/Container_WorkbenchAdvanced.java diff --git a/src/Java/gtPlusPlus/core/container/box/LunchBoxContainer.java b/src/main/java/gtPlusPlus/core/container/box/LunchBoxContainer.java index 8e56c661f2..8e56c661f2 100644 --- a/src/Java/gtPlusPlus/core/container/box/LunchBoxContainer.java +++ b/src/main/java/gtPlusPlus/core/container/box/LunchBoxContainer.java diff --git a/src/Java/gtPlusPlus/core/container/box/MagicBagContainer.java b/src/main/java/gtPlusPlus/core/container/box/MagicBagContainer.java index 7820d56814..7820d56814 100644 --- a/src/Java/gtPlusPlus/core/container/box/MagicBagContainer.java +++ b/src/main/java/gtPlusPlus/core/container/box/MagicBagContainer.java diff --git a/src/Java/gtPlusPlus/core/container/box/ToolBoxContainer.java b/src/main/java/gtPlusPlus/core/container/box/ToolBoxContainer.java index 49719aa9ba..49719aa9ba 100644 --- a/src/Java/gtPlusPlus/core/container/box/ToolBoxContainer.java +++ b/src/main/java/gtPlusPlus/core/container/box/ToolBoxContainer.java diff --git a/src/Java/gtPlusPlus/core/creative/AddToCreativeTab.java b/src/main/java/gtPlusPlus/core/creative/AddToCreativeTab.java index 218bef46bd..218bef46bd 100644 --- a/src/Java/gtPlusPlus/core/creative/AddToCreativeTab.java +++ b/src/main/java/gtPlusPlus/core/creative/AddToCreativeTab.java diff --git a/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabBlock.java b/src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabBlock.java index 2851a514d0..2851a514d0 100644 --- a/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabBlock.java +++ b/src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabBlock.java diff --git a/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMachines.java b/src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMachines.java index 96c809c4da..96c809c4da 100644 --- a/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMachines.java +++ b/src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMachines.java diff --git a/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMisc.java b/src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMisc.java index a67668bbf0..a67668bbf0 100644 --- a/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMisc.java +++ b/src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabMisc.java diff --git a/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabOther.java b/src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabOther.java index afd89346c0..afd89346c0 100644 --- a/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabOther.java +++ b/src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabOther.java diff --git a/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabTools.java b/src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabTools.java index ab1ab069de..ab1ab069de 100644 --- a/src/Java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabTools.java +++ b/src/main/java/gtPlusPlus/core/creative/tabs/MiscUtilCreativeTabTools.java diff --git a/src/Java/gtPlusPlus/core/entity/EntityPrimedMiningExplosive.java b/src/main/java/gtPlusPlus/core/entity/EntityPrimedMiningExplosive.java index 9abd07392d..9abd07392d 100644 --- a/src/Java/gtPlusPlus/core/entity/EntityPrimedMiningExplosive.java +++ b/src/main/java/gtPlusPlus/core/entity/EntityPrimedMiningExplosive.java diff --git a/src/Java/gtPlusPlus/core/entity/EntityTeleportFX.java b/src/main/java/gtPlusPlus/core/entity/EntityTeleportFX.java index ea667b8667..ea667b8667 100644 --- a/src/Java/gtPlusPlus/core/entity/EntityTeleportFX.java +++ b/src/main/java/gtPlusPlus/core/entity/EntityTeleportFX.java diff --git a/src/Java/gtPlusPlus/core/entity/EntityTeslaTowerLightning.java b/src/main/java/gtPlusPlus/core/entity/EntityTeslaTowerLightning.java index bf629bd147..bf629bd147 100644 --- a/src/Java/gtPlusPlus/core/entity/EntityTeslaTowerLightning.java +++ b/src/main/java/gtPlusPlus/core/entity/EntityTeslaTowerLightning.java diff --git a/src/Java/gtPlusPlus/core/entity/InternalEntityRegistry.java b/src/main/java/gtPlusPlus/core/entity/InternalEntityRegistry.java index 6b88d5775c..6b88d5775c 100644 --- a/src/Java/gtPlusPlus/core/entity/InternalEntityRegistry.java +++ b/src/main/java/gtPlusPlus/core/entity/InternalEntityRegistry.java diff --git a/src/Java/gtPlusPlus/core/entity/ai/batking/EntityAIBatKingAttack.java b/src/main/java/gtPlusPlus/core/entity/ai/batking/EntityAIBatKingAttack.java index 52d1d6100c..52d1d6100c 100644 --- a/src/Java/gtPlusPlus/core/entity/ai/batking/EntityAIBatKingAttack.java +++ b/src/main/java/gtPlusPlus/core/entity/ai/batking/EntityAIBatKingAttack.java diff --git a/src/Java/gtPlusPlus/core/entity/item/ItemEntityGiantEgg.java b/src/main/java/gtPlusPlus/core/entity/item/ItemEntityGiantEgg.java index 8e0b1b48ce..8e0b1b48ce 100644 --- a/src/Java/gtPlusPlus/core/entity/item/ItemEntityGiantEgg.java +++ b/src/main/java/gtPlusPlus/core/entity/item/ItemEntityGiantEgg.java diff --git a/src/Java/gtPlusPlus/core/entity/monster/EntityBatKing.java b/src/main/java/gtPlusPlus/core/entity/monster/EntityBatKing.java index 55e0f4c571..55e0f4c571 100644 --- a/src/Java/gtPlusPlus/core/entity/monster/EntityBatKing.java +++ b/src/main/java/gtPlusPlus/core/entity/monster/EntityBatKing.java diff --git a/src/Java/gtPlusPlus/core/entity/monster/EntityGiantChickenBase.java b/src/main/java/gtPlusPlus/core/entity/monster/EntityGiantChickenBase.java index 3a094e129b..3a094e129b 100644 --- a/src/Java/gtPlusPlus/core/entity/monster/EntityGiantChickenBase.java +++ b/src/main/java/gtPlusPlus/core/entity/monster/EntityGiantChickenBase.java diff --git a/src/Java/gtPlusPlus/core/entity/monster/EntitySickBlaze.java b/src/main/java/gtPlusPlus/core/entity/monster/EntitySickBlaze.java index a530f294e1..a530f294e1 100644 --- a/src/Java/gtPlusPlus/core/entity/monster/EntitySickBlaze.java +++ b/src/main/java/gtPlusPlus/core/entity/monster/EntitySickBlaze.java diff --git a/src/Java/gtPlusPlus/core/entity/monster/EntityStaballoyConstruct.java b/src/main/java/gtPlusPlus/core/entity/monster/EntityStaballoyConstruct.java index f6f397f59e..f6f397f59e 100644 --- a/src/Java/gtPlusPlus/core/entity/monster/EntityStaballoyConstruct.java +++ b/src/main/java/gtPlusPlus/core/entity/monster/EntityStaballoyConstruct.java diff --git a/src/Java/gtPlusPlus/core/entity/projectile/EntityHydrofluoricAcidPotion.java b/src/main/java/gtPlusPlus/core/entity/projectile/EntityHydrofluoricAcidPotion.java index 9f3e6b8bf1..9f3e6b8bf1 100644 --- a/src/Java/gtPlusPlus/core/entity/projectile/EntityHydrofluoricAcidPotion.java +++ b/src/main/java/gtPlusPlus/core/entity/projectile/EntityHydrofluoricAcidPotion.java diff --git a/src/Java/gtPlusPlus/core/entity/projectile/EntityLightningAttack.java b/src/main/java/gtPlusPlus/core/entity/projectile/EntityLightningAttack.java index 868517d1db..868517d1db 100644 --- a/src/Java/gtPlusPlus/core/entity/projectile/EntityLightningAttack.java +++ b/src/main/java/gtPlusPlus/core/entity/projectile/EntityLightningAttack.java diff --git a/src/Java/gtPlusPlus/core/entity/projectile/EntitySulfuricAcidPotion.java b/src/main/java/gtPlusPlus/core/entity/projectile/EntitySulfuricAcidPotion.java index 7660dd1b75..7660dd1b75 100644 --- a/src/Java/gtPlusPlus/core/entity/projectile/EntitySulfuricAcidPotion.java +++ b/src/main/java/gtPlusPlus/core/entity/projectile/EntitySulfuricAcidPotion.java diff --git a/src/Java/gtPlusPlus/core/entity/projectile/EntityThrowableBomb.java b/src/main/java/gtPlusPlus/core/entity/projectile/EntityThrowableBomb.java index 49daa459e0..49daa459e0 100644 --- a/src/Java/gtPlusPlus/core/entity/projectile/EntityThrowableBomb.java +++ b/src/main/java/gtPlusPlus/core/entity/projectile/EntityThrowableBomb.java diff --git a/src/Java/gtPlusPlus/core/entity/projectile/EntityToxinball.java b/src/main/java/gtPlusPlus/core/entity/projectile/EntityToxinball.java index 4fe72345b2..4fe72345b2 100644 --- a/src/Java/gtPlusPlus/core/entity/projectile/EntityToxinball.java +++ b/src/main/java/gtPlusPlus/core/entity/projectile/EntityToxinball.java diff --git a/src/Java/gtPlusPlus/core/entity/projectile/EntityToxinballSmall.java b/src/main/java/gtPlusPlus/core/entity/projectile/EntityToxinballSmall.java index 78469c9dad..78469c9dad 100644 --- a/src/Java/gtPlusPlus/core/entity/projectile/EntityToxinballSmall.java +++ b/src/main/java/gtPlusPlus/core/entity/projectile/EntityToxinballSmall.java diff --git a/src/Java/gtPlusPlus/core/fluids/BlockFluidBase.java b/src/main/java/gtPlusPlus/core/fluids/BlockFluidBase.java index dc7c9c2e78..dc7c9c2e78 100644 --- a/src/Java/gtPlusPlus/core/fluids/BlockFluidBase.java +++ b/src/main/java/gtPlusPlus/core/fluids/BlockFluidBase.java diff --git a/src/Java/gtPlusPlus/core/fluids/FactoryFluid.java b/src/main/java/gtPlusPlus/core/fluids/FactoryFluid.java index e3383aee91..e3383aee91 100644 --- a/src/Java/gtPlusPlus/core/fluids/FactoryFluid.java +++ b/src/main/java/gtPlusPlus/core/fluids/FactoryFluid.java diff --git a/src/Java/gtPlusPlus/core/fluids/FluidFactory.java b/src/main/java/gtPlusPlus/core/fluids/FluidFactory.java index dffd7f55e9..d94fa35af7 100644 --- a/src/Java/gtPlusPlus/core/fluids/FluidFactory.java +++ b/src/main/java/gtPlusPlus/core/fluids/FluidFactory.java @@ -11,11 +11,11 @@ import gtPlusPlus.GTplusplus.INIT_PHASE; import gtPlusPlus.api.objects.GregtechException; import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.core.item.base.itemblock.FluidItemBlock; +import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; import net.minecraft.block.Block; -import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; @@ -122,7 +122,8 @@ public class FluidFactory { try { throw new GregtechException("Cannot generate Fluid Packages outside of Pre-Init!"); } catch (GregtechException e) { - System.exit(0); + e.printStackTrace(); + CORE.crash("Cannot generate Fluid Packages outside of Pre-Init!"); } } diff --git a/src/Java/gtPlusPlus/core/fluids/FluidPackage.java b/src/main/java/gtPlusPlus/core/fluids/FluidPackage.java index 29f831776b..29f831776b 100644 --- a/src/Java/gtPlusPlus/core/fluids/FluidPackage.java +++ b/src/main/java/gtPlusPlus/core/fluids/FluidPackage.java diff --git a/src/Java/gtPlusPlus/core/fluids/FluidRegistryHandler.java b/src/main/java/gtPlusPlus/core/fluids/FluidRegistryHandler.java index bc4df596de..bc4df596de 100644 --- a/src/Java/gtPlusPlus/core/fluids/FluidRegistryHandler.java +++ b/src/main/java/gtPlusPlus/core/fluids/FluidRegistryHandler.java diff --git a/src/Java/gtPlusPlus/core/fluids/ItemGenericFluidBucket.java b/src/main/java/gtPlusPlus/core/fluids/ItemGenericFluidBucket.java index d41fccb3ed..6354be632d 100644 --- a/src/Java/gtPlusPlus/core/fluids/ItemGenericFluidBucket.java +++ b/src/main/java/gtPlusPlus/core/fluids/ItemGenericFluidBucket.java @@ -44,7 +44,8 @@ public class ItemGenericFluidBucket extends ItemBucket { try { throw new GregtechException(""+aID+" is already registered! Unable to register fluid: "+FluidFactory.mMetaToFluidMap.get(aID).getLocalizedName()); } catch (GregtechException e) { - System.exit(0); + e.printStackTrace(); + CORE.crash(""+aID+" is already registered! Unable to register fluid: "+FluidFactory.mMetaToFluidMap.get(aID).getLocalizedName()); } } mInternalFluidCache.put(FluidFactory.mMetaToBlockMap.get(aID)); diff --git a/src/Java/gtPlusPlus/core/gui/GUI_Base_Tile_Entity.java b/src/main/java/gtPlusPlus/core/gui/GUI_Base_Tile_Entity.java index aa10363e7c..aa10363e7c 100644 --- a/src/Java/gtPlusPlus/core/gui/GUI_Base_Tile_Entity.java +++ b/src/main/java/gtPlusPlus/core/gui/GUI_Base_Tile_Entity.java diff --git a/src/Java/gtPlusPlus/core/gui/beta/Gui_ID_Registry.java b/src/main/java/gtPlusPlus/core/gui/beta/Gui_ID_Registry.java index 1212054f01..1212054f01 100644 --- a/src/Java/gtPlusPlus/core/gui/beta/Gui_ID_Registry.java +++ b/src/main/java/gtPlusPlus/core/gui/beta/Gui_ID_Registry.java diff --git a/src/Java/gtPlusPlus/core/gui/beta/Gui_Types.java b/src/main/java/gtPlusPlus/core/gui/beta/Gui_Types.java index 9348f40c9c..9348f40c9c 100644 --- a/src/Java/gtPlusPlus/core/gui/beta/Gui_Types.java +++ b/src/main/java/gtPlusPlus/core/gui/beta/Gui_Types.java diff --git a/src/Java/gtPlusPlus/core/gui/beta/MU_GuiId.java b/src/main/java/gtPlusPlus/core/gui/beta/MU_GuiId.java index 116ad48480..116ad48480 100644 --- a/src/Java/gtPlusPlus/core/gui/beta/MU_GuiId.java +++ b/src/main/java/gtPlusPlus/core/gui/beta/MU_GuiId.java diff --git a/src/Java/gtPlusPlus/core/gui/item/GuiBaseBackpack.java b/src/main/java/gtPlusPlus/core/gui/item/GuiBaseBackpack.java index 0ad4b9b51f..0ad4b9b51f 100644 --- a/src/Java/gtPlusPlus/core/gui/item/GuiBaseBackpack.java +++ b/src/main/java/gtPlusPlus/core/gui/item/GuiBaseBackpack.java diff --git a/src/Java/gtPlusPlus/core/gui/item/GuiBaseGrindle.java b/src/main/java/gtPlusPlus/core/gui/item/GuiBaseGrindle.java index ed347e8d30..ed347e8d30 100644 --- a/src/Java/gtPlusPlus/core/gui/item/GuiBaseGrindle.java +++ b/src/main/java/gtPlusPlus/core/gui/item/GuiBaseGrindle.java diff --git a/src/Java/gtPlusPlus/core/gui/item/GuiScreenGrindle.java b/src/main/java/gtPlusPlus/core/gui/item/GuiScreenGrindle.java index cf94fbbb84..cf94fbbb84 100644 --- a/src/Java/gtPlusPlus/core/gui/item/GuiScreenGrindle.java +++ b/src/main/java/gtPlusPlus/core/gui/item/GuiScreenGrindle.java diff --git a/src/Java/gtPlusPlus/core/gui/item/box/GuiBaseBox.java b/src/main/java/gtPlusPlus/core/gui/item/box/GuiBaseBox.java index 97ec58bfa4..97ec58bfa4 100644 --- a/src/Java/gtPlusPlus/core/gui/item/box/GuiBaseBox.java +++ b/src/main/java/gtPlusPlus/core/gui/item/box/GuiBaseBox.java diff --git a/src/Java/gtPlusPlus/core/gui/item/box/LunchBoxGui.java b/src/main/java/gtPlusPlus/core/gui/item/box/LunchBoxGui.java index 28e3913ac8..28e3913ac8 100644 --- a/src/Java/gtPlusPlus/core/gui/item/box/LunchBoxGui.java +++ b/src/main/java/gtPlusPlus/core/gui/item/box/LunchBoxGui.java diff --git a/src/Java/gtPlusPlus/core/gui/item/box/MagicBagGui.java b/src/main/java/gtPlusPlus/core/gui/item/box/MagicBagGui.java index 958cdd3c70..958cdd3c70 100644 --- a/src/Java/gtPlusPlus/core/gui/item/box/MagicBagGui.java +++ b/src/main/java/gtPlusPlus/core/gui/item/box/MagicBagGui.java diff --git a/src/Java/gtPlusPlus/core/gui/item/box/ToolBoxGui.java b/src/main/java/gtPlusPlus/core/gui/item/box/ToolBoxGui.java index c440c017e9..c440c017e9 100644 --- a/src/Java/gtPlusPlus/core/gui/item/box/ToolBoxGui.java +++ b/src/main/java/gtPlusPlus/core/gui/item/box/ToolBoxGui.java diff --git a/src/Java/gtPlusPlus/core/gui/machine/GUI_CircuitProgrammer.java b/src/main/java/gtPlusPlus/core/gui/machine/GUI_CircuitProgrammer.java index 2ab5b58aa7..2ab5b58aa7 100644 --- a/src/Java/gtPlusPlus/core/gui/machine/GUI_CircuitProgrammer.java +++ b/src/main/java/gtPlusPlus/core/gui/machine/GUI_CircuitProgrammer.java diff --git a/src/Java/gtPlusPlus/core/gui/machine/GUI_DecayablesChest.java b/src/main/java/gtPlusPlus/core/gui/machine/GUI_DecayablesChest.java index 094629ae48..094629ae48 100644 --- a/src/Java/gtPlusPlus/core/gui/machine/GUI_DecayablesChest.java +++ b/src/main/java/gtPlusPlus/core/gui/machine/GUI_DecayablesChest.java diff --git a/src/Java/gtPlusPlus/core/gui/machine/GUI_EggBox.java b/src/main/java/gtPlusPlus/core/gui/machine/GUI_EggBox.java index 49d9890d3a..49d9890d3a 100644 --- a/src/Java/gtPlusPlus/core/gui/machine/GUI_EggBox.java +++ b/src/main/java/gtPlusPlus/core/gui/machine/GUI_EggBox.java diff --git a/src/Java/gtPlusPlus/core/gui/machine/GUI_FishTrap.java b/src/main/java/gtPlusPlus/core/gui/machine/GUI_FishTrap.java index 3d3bad7ece..3d3bad7ece 100644 --- a/src/Java/gtPlusPlus/core/gui/machine/GUI_FishTrap.java +++ b/src/main/java/gtPlusPlus/core/gui/machine/GUI_FishTrap.java diff --git a/src/Java/gtPlusPlus/core/gui/machine/GUI_HeliumGenerator.java b/src/main/java/gtPlusPlus/core/gui/machine/GUI_HeliumGenerator.java index 44d5c2ff9c..44d5c2ff9c 100644 --- a/src/Java/gtPlusPlus/core/gui/machine/GUI_HeliumGenerator.java +++ b/src/main/java/gtPlusPlus/core/gui/machine/GUI_HeliumGenerator.java diff --git a/src/Java/gtPlusPlus/core/gui/machine/GUI_ModularityTable.java b/src/main/java/gtPlusPlus/core/gui/machine/GUI_ModularityTable.java index bbd4dd0ad8..bbd4dd0ad8 100644 --- a/src/Java/gtPlusPlus/core/gui/machine/GUI_ModularityTable.java +++ b/src/main/java/gtPlusPlus/core/gui/machine/GUI_ModularityTable.java diff --git a/src/Java/gtPlusPlus/core/gui/machine/GUI_PestKiller.java b/src/main/java/gtPlusPlus/core/gui/machine/GUI_PestKiller.java index 881c6c82a1..881c6c82a1 100644 --- a/src/Java/gtPlusPlus/core/gui/machine/GUI_PestKiller.java +++ b/src/main/java/gtPlusPlus/core/gui/machine/GUI_PestKiller.java diff --git a/src/Java/gtPlusPlus/core/gui/machine/GUI_ProjectTable.java b/src/main/java/gtPlusPlus/core/gui/machine/GUI_ProjectTable.java index 4870269080..4870269080 100644 --- a/src/Java/gtPlusPlus/core/gui/machine/GUI_ProjectTable.java +++ b/src/main/java/gtPlusPlus/core/gui/machine/GUI_ProjectTable.java diff --git a/src/Java/gtPlusPlus/core/gui/machine/GUI_RoundRobinator.java b/src/main/java/gtPlusPlus/core/gui/machine/GUI_RoundRobinator.java index edb53e8ec0..edb53e8ec0 100644 --- a/src/Java/gtPlusPlus/core/gui/machine/GUI_RoundRobinator.java +++ b/src/main/java/gtPlusPlus/core/gui/machine/GUI_RoundRobinator.java diff --git a/src/Java/gtPlusPlus/core/gui/machine/GUI_ScrollTest.java b/src/main/java/gtPlusPlus/core/gui/machine/GUI_ScrollTest.java index 8a1f7c3fe9..8a1f7c3fe9 100644 --- a/src/Java/gtPlusPlus/core/gui/machine/GUI_ScrollTest.java +++ b/src/main/java/gtPlusPlus/core/gui/machine/GUI_ScrollTest.java diff --git a/src/Java/gtPlusPlus/core/gui/machine/GUI_SuperJukebox.java b/src/main/java/gtPlusPlus/core/gui/machine/GUI_SuperJukebox.java index d3d8f1e814..d3d8f1e814 100644 --- a/src/Java/gtPlusPlus/core/gui/machine/GUI_SuperJukebox.java +++ b/src/main/java/gtPlusPlus/core/gui/machine/GUI_SuperJukebox.java diff --git a/src/Java/gtPlusPlus/core/gui/machine/GUI_TradeTable.java b/src/main/java/gtPlusPlus/core/gui/machine/GUI_TradeTable.java index 7c71f09302..7c71f09302 100644 --- a/src/Java/gtPlusPlus/core/gui/machine/GUI_TradeTable.java +++ b/src/main/java/gtPlusPlus/core/gui/machine/GUI_TradeTable.java diff --git a/src/main/java/gtPlusPlus/core/gui/machine/GUI_VolumetricFlaskSetter.java b/src/main/java/gtPlusPlus/core/gui/machine/GUI_VolumetricFlaskSetter.java new file mode 100644 index 0000000000..512f31dd47 --- /dev/null +++ b/src/main/java/gtPlusPlus/core/gui/machine/GUI_VolumetricFlaskSetter.java @@ -0,0 +1,274 @@ +package gtPlusPlus.core.gui.machine; + +import org.lwjgl.input.Keyboard; +import org.lwjgl.opengl.GL11; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import gtPlusPlus.api.objects.Logger; +import gtPlusPlus.core.container.Container_VolumetricFlaskSetter; +import gtPlusPlus.core.gui.widget.GuiValueField; +import gtPlusPlus.core.handler.PacketHandler; +import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.network.packet.Packet_VolumetricFlaskGui; +import gtPlusPlus.core.tileentities.general.TileEntityVolumetricFlaskSetter; +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.client.resources.I18n; +import net.minecraft.util.ResourceLocation; + +@SideOnly(Side.CLIENT) +public class GUI_VolumetricFlaskSetter extends GuiContainer { + + private static final ResourceLocation mGuiTextures = new ResourceLocation( + CORE.MODID, "textures/gui/VolumetricFlaskSetter.png" + ); + private Container_VolumetricFlaskSetter mContainer; + private boolean mIsOpen = false; + private GuiValueField mText; + private TileEntityVolumetricFlaskSetter mTile; + + public GUI_VolumetricFlaskSetter(Container_VolumetricFlaskSetter aContainer) { + super(aContainer); + mContainer = aContainer; + mTile = mContainer.mTileEntity; + } + + @Override + protected void drawGuiContainerBackgroundLayer(final float f, final int i, final int j) { + GL11.glColor4f(1.0f, 1.0f, 1.0f, 1.0f); + this.mc.renderEngine.bindTexture(mGuiTextures); + final int x = (this.width - this.xSize) / 2; + final int y = (this.height - this.ySize) / 2; + this.drawTexturedModalRect(x, y, 0, 0, this.xSize, this.ySize); + } + + @Override + protected void drawGuiContainerForegroundLayer(final int i, final int j) { + super.drawGuiContainerForegroundLayer(i, j); + this.mText.drawTextBox(); + this.fontRendererObj.drawString( + I18n.format("container.VolumetricFlaskSetter", new Object[0]), 4, 3, 4210752 + ); + int aYVal = 49; + this.fontRendererObj.drawString( + I18n.format("0 = 16l", new Object[0]), 8, aYVal, 4210752 + ); + this.fontRendererObj.drawString( + I18n.format("4 = 576l", new Object[0]), 64, aYVal, 4210752 + ); + this.fontRendererObj.drawString( + I18n.format("1 = 36l", new Object[0]), 8, aYVal += 8, 4210752 + ); + this.fontRendererObj.drawString( + I18n.format("5 = 720l", new Object[0]), 64, aYVal, 4210752 + ); + this.fontRendererObj.drawString( + I18n.format("2 = 144l", new Object[0]), 8, aYVal += 8, 4210752 + ); + this.fontRendererObj.drawString( + I18n.format("6 = 864l", new Object[0]), 64, aYVal, 4210752 + ); + this.fontRendererObj.drawString( + I18n.format("3 = 432l", new Object[0]), 8, aYVal += 8, 4210752 + ); + this.fontRendererObj.drawString( + I18n.format("-> = Custom", new Object[0]), 59, aYVal, 4210752 + ); + + } + + public void drawScreen(int par1, int par2, float par3) { + this.drawDefaultBackground(); + super.drawScreen(par1, par2, par3); + } + + protected String getText() { + return this.mText.getText(); + } + + public void initGui() { + super.initGui(); + // Keyboard.enableRepeatEvents(true); + mIsOpen = true; + this.mText = new GuiValueField( + this.fontRendererObj, 26, 31, this.width / 2 + - 62, this.height / 2 - 52, 106, 14, this + ); + mText.setMaxStringLength(5); + mText.setEnableBackgroundDrawing(true); + mText.setText("0"); + mText.setFocused(true); + } + + public boolean isNumber(char c) { + boolean isNum = ((c >= 48 && c <= 57) || c == 45); + if (isNum) { + log("Found Digit: "+c+" | char value"); + } + else { + switch (c) { + case '0' : + case '1' : + case '2' : + case '3' : + case '4' : + case '5' : + case '6' : + case '7' : + case '8' : + case '9' : + log("Found Digit: "+c+" | char switch"); + return true; + } + } + return isNum; + } + + public boolean isNumber(int c) { + switch (c) { + case Keyboard.KEY_0 : + case Keyboard.KEY_1 : + case Keyboard.KEY_2 : + case Keyboard.KEY_3 : + case Keyboard.KEY_4 : + case Keyboard.KEY_5 : + case Keyboard.KEY_6 : + case Keyboard.KEY_7 : + case Keyboard.KEY_8 : + case Keyboard.KEY_9 : + case Keyboard.KEY_NUMPAD0 : + case Keyboard.KEY_NUMPAD1 : + case Keyboard.KEY_NUMPAD2 : + case Keyboard.KEY_NUMPAD3 : + case Keyboard.KEY_NUMPAD4 : + case Keyboard.KEY_NUMPAD5 : + case Keyboard.KEY_NUMPAD6 : + case Keyboard.KEY_NUMPAD7 : + case Keyboard.KEY_NUMPAD8 : + case Keyboard.KEY_NUMPAD9 : + log("Found Digit: "+Keyboard.getKeyName(c)+" | LWJGL Keybinding"); + return true; + } + return false; + } + + protected void keyTyped(char par1, int par2) { + if (mIsOpen) { + log("Pressed " + par1 + " | " + par2); + if (mText.isFocused()) { + log("Text box has focus."); + if (par2 == Keyboard.KEY_RETURN) { + log("Pressed Enter, unfocusing."); + mText.setFocused(false); + } + else if (par2 == Keyboard.KEY_BACK) { + log("Pressed Backspace."); + String aCurrentText = getText(); + if (aCurrentText.length() > 0) { + this.mText.setText( + aCurrentText.substring( + 0, aCurrentText.length() - 1 + ) + ); + if (getText().length() <= 0) { + setText(0); + } + sendUpdateToServer(); + } + } + else { + if (isNumber(par2) || isNumber(par1)) { + log("Pressed number."); + if (this.mText.getText().equals("0")) { + this.mText.textboxKeyTyped(par1, par2); + sendUpdateToServer(); + } + else { + this.mText.textboxKeyTyped(par1, par2); + sendUpdateToServer(); + } + } + else { + log("Pressed unused key."); + super.keyTyped(par1, par2); + } + } + } + else { + log("Text box not focused."); + super.keyTyped(par1, par2); + } + } + else { + log("Gui is not open?"); + } + } + + protected void mouseClicked(int x, int y, int btn) { + if (mIsOpen) { + log("Clicked."); + this.mText.mouseClicked(x, y, btn); + if (!mText.didClickInTextField(x, y)) { + log("Did not click in text box, passing to super."); + super.mouseClicked(x, y, btn); + } + } + else { + log("Gui is not open?"); + } + } + + @Override + public void onGuiClosed() { + mIsOpen = false; + mText.setEnabled(false); + mText.setVisible(false); + super.onGuiClosed(); + // Keyboard.enableRepeatEvents(false); + } + + public int parse(String aValue) { + try { + return Integer.parseInt(getText()); + } + catch (NumberFormatException e) { + return 0; + } + } + + public void sendUpdateToServer() { + if (getText().length() > 0) { + PacketHandler.sendToServer(new Packet_VolumetricFlaskGui(mTile, parse(getText()))); + } + } + + public void setText(int aValue) { + this.mText.setText("" + aValue); + } + + public void updateScreen() { + super.updateScreen(); + // Update Textbox to 0 if Empty + if (getText().length() <= 0) { + this.mText.setText("0"); + sendUpdateToServer(); + } + this.mText.updateCursorCounter(); + + // Check TextBox Value is correct + if (getText().length() > 0) { + int aCustomValue = parse(getText()); + int aTileValue = ((Container_VolumetricFlaskSetter) mContainer).mCustomValue; + if (mContainer != null) { + if (aTileValue != aCustomValue) { + setText(aTileValue); + } + } + } + } + + public void log(String aString) { + Logger.INFO("[Flask-GUI] "+aString); + } + +} diff --git a/src/Java/gtPlusPlus/core/gui/machine/GUI_Workbench.java b/src/main/java/gtPlusPlus/core/gui/machine/GUI_Workbench.java index 861c2ba6b6..861c2ba6b6 100644 --- a/src/Java/gtPlusPlus/core/gui/machine/GUI_Workbench.java +++ b/src/main/java/gtPlusPlus/core/gui/machine/GUI_Workbench.java diff --git a/src/Java/gtPlusPlus/core/gui/machine/GUI_WorkbenchAdvanced.java b/src/main/java/gtPlusPlus/core/gui/machine/GUI_WorkbenchAdvanced.java index 20183eb0b0..20183eb0b0 100644 --- a/src/Java/gtPlusPlus/core/gui/machine/GUI_WorkbenchAdvanced.java +++ b/src/main/java/gtPlusPlus/core/gui/machine/GUI_WorkbenchAdvanced.java diff --git a/src/main/java/gtPlusPlus/core/gui/widget/GuiValueField.java b/src/main/java/gtPlusPlus/core/gui/widget/GuiValueField.java new file mode 100644 index 0000000000..c9c294ea1c --- /dev/null +++ b/src/main/java/gtPlusPlus/core/gui/widget/GuiValueField.java @@ -0,0 +1,98 @@ +package gtPlusPlus.core.gui.widget; + +import java.lang.reflect.Field; + +import gtPlusPlus.core.gui.machine.GUI_VolumetricFlaskSetter; +import gtPlusPlus.core.util.reflect.ReflectionUtils; +import gtPlusPlus.preloader.DevHelper; +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.gui.GuiTextField; + +public class GuiValueField extends GuiTextField { + + private final FontRenderer mFontRenderer; + private final int mScreenLocationX; + private final int mScreenLocationY; + private final GUI_VolumetricFlaskSetter mGUI; + + public GuiValueField(FontRenderer aFontRenderer, int aX, int aY, int aScreenLocationX, int aScreenLocationY, int aWidth, int aHeight, GUI_VolumetricFlaskSetter aGUI) { + super(aFontRenderer, aX, aY, aWidth, aHeight); + mFontRenderer = aFontRenderer; + mScreenLocationX = aScreenLocationX; + mScreenLocationY = aScreenLocationY; + mGUI = aGUI; + } + + public boolean canLoseFocus() { + Field canLoseFocus = ReflectionUtils.getField(GuiTextField.class, DevHelper.isObfuscatedEnvironment() ? "field_146212_n" : "canLoseFocus"); + if (canLoseFocus != null) { + return (boolean) ReflectionUtils.getFieldValue(canLoseFocus, this); + } + return true; + } + + @Override + public boolean isFocused() { + return super.isFocused(); + } + + public boolean isBackgroundDrawingEnabled() { + Field enableBackgroundDrawing = ReflectionUtils.getField(GuiTextField.class, DevHelper.isObfuscatedEnvironment() ? "field_146215_m" : "enableBackgroundDrawing"); + if (enableBackgroundDrawing != null) { + return (boolean) ReflectionUtils.getFieldValue(enableBackgroundDrawing, this); + } + return true; + } + + public int getLineScrollOffset() { + Field lineScrollOffset = ReflectionUtils.getField(GuiTextField.class, DevHelper.isObfuscatedEnvironment() ? "field_146225_q" : "lineScrollOffset"); + if (lineScrollOffset != null) { + return (int) ReflectionUtils.getFieldValue(lineScrollOffset, this); + } + return 0; + } + + public boolean didClickInTextField(int aX, int aY) { + mGUI.log("Clicked at X:"+aX+", Y:"+aY); + boolean aDidClick = aX >= this.mScreenLocationX && aX < this.mScreenLocationX + this.width && aY >= this.mScreenLocationY && aY < this.mScreenLocationY + this.height; + mGUI.log("Did click in textbox? "+aDidClick); + mGUI.log("Expected Region: X:"+mScreenLocationX+"-"+(this.mScreenLocationX + this.width)); + mGUI.log("Expected Region: Y:"+mScreenLocationY+"-"+(this.mScreenLocationY + this.height)); + return aDidClick; + } + + /** + * Args: x, y, buttonClicked + */ + @Override + public void mouseClicked(int aX, int aY, int aButton){ + boolean aDidClick = didClickInTextField(aX, aY); + + mGUI.log("Did click inside text box? "+aDidClick); + mGUI.log("Focus 1: "+this.isFocused()); + this.setFocused(aDidClick); + mGUI.log("Focus 2: "+this.isFocused()); + if (isFocused()) { + int l = aX - this.mScreenLocationX; + if (isBackgroundDrawingEnabled()) { + l -= 4; + } + if (aButton == 0) { + mGUI.log("Left clicked in text box."); + String s = this.mFontRenderer.trimStringToWidth(this.getText().substring(getLineScrollOffset()), this.getWidth()); + this.setCursorPosition(this.mFontRenderer.trimStringToWidth(s, l).length() + getLineScrollOffset()); + } + else if (aButton == 1) { + mGUI.log("Right clicked in text box."); + mGUI.setText(0); + mGUI.sendUpdateToServer(); + String s = this.mFontRenderer.trimStringToWidth(this.getText().substring(getLineScrollOffset()), this.getWidth()); + this.setCursorPosition(this.mFontRenderer.trimStringToWidth(s, l).length() + getLineScrollOffset()); + } + } + else { + mGUI.log("Clicked, but no focus."); + } + } + +} diff --git a/src/Java/gtPlusPlus/core/handler/AchievementHandler.java b/src/main/java/gtPlusPlus/core/handler/AchievementHandler.java index fa10f4def3..fa10f4def3 100644 --- a/src/Java/gtPlusPlus/core/handler/AchievementHandler.java +++ b/src/main/java/gtPlusPlus/core/handler/AchievementHandler.java diff --git a/src/Java/gtPlusPlus/core/handler/BookHandler.java b/src/main/java/gtPlusPlus/core/handler/BookHandler.java index 4bfd39e9a3..79f6488487 100644 --- a/src/Java/gtPlusPlus/core/handler/BookHandler.java +++ b/src/main/java/gtPlusPlus/core/handler/BookHandler.java @@ -38,7 +38,7 @@ public class BookHandler { "First you need to craft the following things for a Thermal Boiler to Function: The Main Boiler Block, 20 Thermal Containment Casings, two Input Hatches, two Output Hatches, a bunch of different Tools and a Maintenance Hatch.", "To begin the building, lay out the first 3x3 layer of Machine Casings on the ground (with a Hatch in the Middle), then place the Boiler Block facing outward in the middle of one of the 3m wide Sides.", "Now grab 3 other Hatches and place them on the remaining three 3m wide Sides also facing outwards. And now the four corners of the Machine need also a Machine Casing. There should only be a Hole left in the middle of the Cube.", - "So, now place a 3x3 of Machine Casings ontop, at the 3rd Layer with the last Hatch in the middle facing outwards as well.", + "So, now place a 3x3 of Machine Casings on top, at the 3rd Layer with the last Hatch in the middle facing outwards as well.", "When accessing the Boiler Block, it should now stop telling you, that the structure is incomplete (bottom Line of that Screen). Now go with a bunch of different Tools (Metal Hammer, Rubber Hammer, Screwdriver, Wrench, Soldering Iron and Crowbar)", "to the Maintenance Hatch and access it. After that you grab the 6 Tools and rightclick the Slot with each of them in your Hand in the Maintenance GUI. Note that you need Soldering Tin/Lead in your Inventory to use the Soldering Iron.", "The Main Block should now tell you that you need to use the Rubber Hammer on it to (re)activate the Machine. The Rubber Hammer can enable and disable Machines. The Machine disables itself after something important broke.", @@ -49,7 +49,7 @@ public class BookHandler { "The Thermal Boiler will produce 800 Liters of Steam per tick for about 5 or 6 Liters of Water per tick at reaching 100% Efficiency. In case of Lava it consumes 1666 Liters every Second.", "A Thermal Boiler is worth about 33 small Thermal Generators, and as the Boilers get much less Efficient, when not having enough Fuel, you should consider making a large Nether Pump for Lava, or a good Nuclear Reactor for molten Salt.", "Input and Output Slots are fully optional, you can place multiple ones of them or even none on the Machine. A Machine without Input couldn't process any Recipes, while a Machine without Output just voids all outputted Items and Liquids.", - "It might be useful to use the Screwdriver on the Output Hatches to determine what is outputted where." }); + "It might be useful to use the Screwdriver on the Output Hatches to determine what is outputted where." }); @@ -60,7 +60,7 @@ public class BookHandler { "Alkalus", new String[] { //Page 1 - "So, when it comes to power storage you relaly have three seperate options:\n"+ + "So, when it comes to power storage you really have three separate options:\n"+ " \n"+ "Battery Buffers,\n"+ "Energy Buffers,\n"+ @@ -69,7 +69,7 @@ public class BookHandler { "Battery Buffer\n" + " \n" + "Is rather portable. Allowing you to throw set one up and insert batteries where ever you may need."+"\n"+ - "They output 1A for each battery stored inside, upto a maximum of 16A.", + "They output 1A for each battery stored inside, up to a maximum of 16A.", //Page 3 "Energy Buffer\n" + " \n" + @@ -81,7 +81,7 @@ public class BookHandler { "Is used for storing Insane amounts of power later game."+"\n"+ "Consumes 2% of the average voltage of all energy type hatches every tick."+"\n", //Page 5 - "Allows Insertation/Removal of power from the rear face of the controller, swap with a screwdriver."+"\n"+ + "Allows Insertion/Removal of power from the rear face of the controller, swap with a screwdriver."+"\n"+ "Variable Height Structure, between 4-16Y. Inserted Redox Cells dictate max energy tier of structure."+"\n", //Page 6 "Redox Cells cannot be placed into the Top or Bottom layer and only take up 3xhx3 internally."+"\n"+ @@ -288,49 +288,49 @@ public class BookHandler { "XXXXXXX", "Layer 2:" + "\n" + "\n" + - "AAAAAAA" + "\n" + + "XAAAAAX" + "\n" + "AMMMMMA" + "\n" + "AMCCCMA" + "\n" + "AMCCCMA" + "\n" + "AMCCCMA" + "\n" + "AMMMMMA" + "\n" + - "AAAAAAA", + "XAAAAAX", "Layer 3:" + "\n" + "\n" + - "AAAAAAA" + "\n" + + "XAAAAAX" + "\n" + "AAAAAAA" + "\n" + "AAPPPAA" + "\n" + "AAPPPAA" + "\n" + "AAPPPAA" + "\n" + "AAAAAAA" + "\n" + - "AAAAAAA", + "XAAAAAX", "Layer 4:" + "\n" + "\n" + - "AAAAAAA" + "\n" + + "XAAAAAX" + "\n" + "AAAAAAA" + "\n" + "AACCCAA" + "\n" + "AACCCAA" + "\n" + "AACCCAA" + "\n" + "AAAAAAA" + "\n" + - "AAAAAAA", + "XAAAAAX", "Layer 5:" + "\n" + "\n" + - "AAAAAAA" + "\n" + + "XAAAAAX" + "\n" + "AAAAAAA" + "\n" + "AAPPPAA" + "\n" + "AAPPPAA" + "\n" + "AAPPPAA" + "\n" + "AAAAAAA" + "\n" + - "AAAAAAA", + "XAAAAAX", "Layer 6:" + "\n" + "\n" + - "AAAAAAA" + "\n" + + "XAAAAAX" + "\n" + "AMMMMMA" + "\n" + "AMCCCMA" + "\n" + "AMCCCMA" + "\n" + "AMCCCMA" + "\n" + "AMMMMMA" + "\n" + - "AAAAAAA", + "XAAAAAX", "Layer 7:" + "\n" + "\n" + "XXXXXXX" + "\n" + diff --git a/src/Java/gtPlusPlus/core/handler/BurnableFuelHandler.java b/src/main/java/gtPlusPlus/core/handler/BurnableFuelHandler.java index 82bcdc84e6..82bcdc84e6 100644 --- a/src/Java/gtPlusPlus/core/handler/BurnableFuelHandler.java +++ b/src/main/java/gtPlusPlus/core/handler/BurnableFuelHandler.java diff --git a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java b/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java index 4fda17ee8a..bb47bb2380 100644 --- a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java +++ b/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java @@ -43,6 +43,8 @@ import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaGarbageCollector; import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_FluidCanning; import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_Recycling; +import gtPlusPlus.xmod.gregtech.loaders.recipe.RecipeLoader_GTNH; +import gtPlusPlus.xmod.gregtech.loaders.recipe.RecipeLoader_Nuclear; import gtPlusPlus.xmod.gregtech.registration.gregtech.*; import net.minecraft.item.ItemStack; @@ -158,6 +160,8 @@ public class COMPAT_HANDLER { GregtechIsaMill.run(); GregtechSteamMultis.run(); //GregtechIndustrialElementDuplicator.run(); + GregtechIndustrialRockBreaker.run(); + GregtechIndustrialChisel.run(); //New Horizons Content NewHorizonsAccelerator.run(); @@ -228,7 +232,9 @@ public class COMPAT_HANDLER { public static void startLoadingGregAPIBasedRecipes(){ //Add hand-made recipes - RECIPES_GREGTECH.run(); + RECIPES_GREGTECH.run(); + RecipeLoader_GTNH.generate(); + RecipeLoader_Nuclear.generate(); //Add autogenerated Recipes from Item Components for (Set<RunnableWithInfo<Material>> m : MaterialGenerator.mRecipeMapsToGenerate) { for (RunnableWithInfo<Material> r : m) { diff --git a/src/Java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java b/src/main/java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java index 9a1b551d30..9a1b551d30 100644 --- a/src/Java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java +++ b/src/main/java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java diff --git a/src/Java/gtPlusPlus/core/handler/CraftingManager.java b/src/main/java/gtPlusPlus/core/handler/CraftingManager.java index 6fb580cc32..6fb580cc32 100644 --- a/src/Java/gtPlusPlus/core/handler/CraftingManager.java +++ b/src/main/java/gtPlusPlus/core/handler/CraftingManager.java diff --git a/src/Java/gtPlusPlus/core/handler/EnumHelperHandler.java b/src/main/java/gtPlusPlus/core/handler/EnumHelperHandler.java index d164efa3d7..d164efa3d7 100644 --- a/src/Java/gtPlusPlus/core/handler/EnumHelperHandler.java +++ b/src/main/java/gtPlusPlus/core/handler/EnumHelperHandler.java diff --git a/src/Java/gtPlusPlus/core/handler/GuiHandler.java b/src/main/java/gtPlusPlus/core/handler/GuiHandler.java index 0567d6c5dd..0567d6c5dd 100644 --- a/src/Java/gtPlusPlus/core/handler/GuiHandler.java +++ b/src/main/java/gtPlusPlus/core/handler/GuiHandler.java diff --git a/src/Java/gtPlusPlus/core/handler/OldCircuitHandler.java b/src/main/java/gtPlusPlus/core/handler/OldCircuitHandler.java index e20e13a337..e20e13a337 100644 --- a/src/Java/gtPlusPlus/core/handler/OldCircuitHandler.java +++ b/src/main/java/gtPlusPlus/core/handler/OldCircuitHandler.java diff --git a/src/Java/gtPlusPlus/core/handler/PacketHandler.java b/src/main/java/gtPlusPlus/core/handler/PacketHandler.java index 382b82df29..382b82df29 100644 --- a/src/Java/gtPlusPlus/core/handler/PacketHandler.java +++ b/src/main/java/gtPlusPlus/core/handler/PacketHandler.java diff --git a/src/Java/gtPlusPlus/core/handler/Recipes/DecayableRecipe.java b/src/main/java/gtPlusPlus/core/handler/Recipes/DecayableRecipe.java index 360b0440a2..360b0440a2 100644 --- a/src/Java/gtPlusPlus/core/handler/Recipes/DecayableRecipe.java +++ b/src/main/java/gtPlusPlus/core/handler/Recipes/DecayableRecipe.java diff --git a/src/Java/gtPlusPlus/core/handler/Recipes/LateRegistrationHandler.java b/src/main/java/gtPlusPlus/core/handler/Recipes/LateRegistrationHandler.java index 5bf6374725..5bf6374725 100644 --- a/src/Java/gtPlusPlus/core/handler/Recipes/LateRegistrationHandler.java +++ b/src/main/java/gtPlusPlus/core/handler/Recipes/LateRegistrationHandler.java diff --git a/src/Java/gtPlusPlus/core/handler/Recipes/RegistrationHandler.java b/src/main/java/gtPlusPlus/core/handler/Recipes/RegistrationHandler.java index 4192e71091..4192e71091 100644 --- a/src/Java/gtPlusPlus/core/handler/Recipes/RegistrationHandler.java +++ b/src/main/java/gtPlusPlus/core/handler/Recipes/RegistrationHandler.java diff --git a/src/Java/gtPlusPlus/core/handler/StopAnnoyingFuckingAchievements.java b/src/main/java/gtPlusPlus/core/handler/StopAnnoyingFuckingAchievements.java index b3b720497e..8499f98525 100644 --- a/src/Java/gtPlusPlus/core/handler/StopAnnoyingFuckingAchievements.java +++ b/src/main/java/gtPlusPlus/core/handler/StopAnnoyingFuckingAchievements.java @@ -38,7 +38,7 @@ public class StopAnnoyingFuckingAchievements { Field aGameSettings = ReflectionUtils.getField(aClazz2, "gameSettings"); Object aGameSettingsObj = ReflectionUtils.getFieldValue(aInstanceMC, aGameSettings); Class aClazz3 = aGameSettingsObj.getClass(); - if (aClazz2 != null) { + if (aClazz3 != null) { Field ainvHint = ReflectionUtils.getField(aClazz3, "showInventoryAchievementHint"); ReflectionUtils.setField(aGameSettingsObj, ainvHint, false); } diff --git a/src/Java/gtPlusPlus/core/handler/events/BlockEventHandler.java b/src/main/java/gtPlusPlus/core/handler/events/BlockEventHandler.java index 03bb99bb2a..03bb99bb2a 100644 --- a/src/Java/gtPlusPlus/core/handler/events/BlockEventHandler.java +++ b/src/main/java/gtPlusPlus/core/handler/events/BlockEventHandler.java diff --git a/src/Java/gtPlusPlus/core/handler/events/CustomMovementHandler.java b/src/main/java/gtPlusPlus/core/handler/events/CustomMovementHandler.java index b70e58d009..b70e58d009 100644 --- a/src/Java/gtPlusPlus/core/handler/events/CustomMovementHandler.java +++ b/src/main/java/gtPlusPlus/core/handler/events/CustomMovementHandler.java diff --git a/src/Java/gtPlusPlus/core/handler/events/EnderDragonDeathHandler.java b/src/main/java/gtPlusPlus/core/handler/events/EnderDragonDeathHandler.java index 884f14386d..884f14386d 100644 --- a/src/Java/gtPlusPlus/core/handler/events/EnderDragonDeathHandler.java +++ b/src/main/java/gtPlusPlus/core/handler/events/EnderDragonDeathHandler.java diff --git a/src/Java/gtPlusPlus/core/handler/events/EntityDeathHandler.java b/src/main/java/gtPlusPlus/core/handler/events/EntityDeathHandler.java index 391672e028..391672e028 100644 --- a/src/Java/gtPlusPlus/core/handler/events/EntityDeathHandler.java +++ b/src/main/java/gtPlusPlus/core/handler/events/EntityDeathHandler.java diff --git a/src/Java/gtPlusPlus/core/handler/events/GeneralTooltipEventHandler.java b/src/main/java/gtPlusPlus/core/handler/events/GeneralTooltipEventHandler.java index fda7760607..10dea8a7bf 100644 --- a/src/Java/gtPlusPlus/core/handler/events/GeneralTooltipEventHandler.java +++ b/src/main/java/gtPlusPlus/core/handler/events/GeneralTooltipEventHandler.java @@ -6,8 +6,10 @@ import gtPlusPlus.GTplusplus; import gtPlusPlus.GTplusplus.INIT_PHASE; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.sys.KeyboardUtils; +import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; @@ -22,7 +24,7 @@ public class GeneralTooltipEventHandler { @SubscribeEvent public void onItemTooltip(ItemTooltipEvent event){ - + if (GTplusplus.CURRENT_LOAD_PHASE != INIT_PHASE.STARTED && GTplusplus.CURRENT_LOAD_PHASE != INIT_PHASE.SERVER_START) { return; } @@ -68,8 +70,16 @@ public class GeneralTooltipEventHandler { event.toolTip.add(EnumChatFormatting.GOLD+"Capacity: "+EnumChatFormatting.AQUA+"128000L"); } } - - + + // Custom Flasks + + if (GregtechItemList.VOLUMETRIC_FLASK_8k.hasBeenSet() && event.itemStack.getItem() == GregtechItemList.VOLUMETRIC_FLASK_8k.getItem()) { + event.toolTip.add("Max Capacity: "+MathUtils.formatNumbers(8000)+"L"); + } + if (GregtechItemList.VOLUMETRIC_FLASK_32k.hasBeenSet() && event.itemStack.getItem() == GregtechItemList.VOLUMETRIC_FLASK_32k.getItem()) { + event.toolTip.add("Max Capacity: "+MathUtils.formatNumbers(32000)+"L"); + } + if (CORE.ConfigSwitches.enableAnimatedTurbines) { boolean shift = false; diff --git a/src/Java/gtPlusPlus/core/handler/events/LoginEventHandler.java b/src/main/java/gtPlusPlus/core/handler/events/LoginEventHandler.java index 1a8d87882e..1a8d87882e 100644 --- a/src/Java/gtPlusPlus/core/handler/events/LoginEventHandler.java +++ b/src/main/java/gtPlusPlus/core/handler/events/LoginEventHandler.java diff --git a/src/Java/gtPlusPlus/core/handler/events/MissingMappingsEvent.java b/src/main/java/gtPlusPlus/core/handler/events/MissingMappingsEvent.java index 31600a36c3..31600a36c3 100644 --- a/src/Java/gtPlusPlus/core/handler/events/MissingMappingsEvent.java +++ b/src/main/java/gtPlusPlus/core/handler/events/MissingMappingsEvent.java diff --git a/src/Java/gtPlusPlus/core/handler/events/PickaxeBlockBreakEventHandler.java b/src/main/java/gtPlusPlus/core/handler/events/PickaxeBlockBreakEventHandler.java index 956d045b3e..956d045b3e 100644 --- a/src/Java/gtPlusPlus/core/handler/events/PickaxeBlockBreakEventHandler.java +++ b/src/main/java/gtPlusPlus/core/handler/events/PickaxeBlockBreakEventHandler.java diff --git a/src/Java/gtPlusPlus/core/handler/events/PlayerTickHandler.java b/src/main/java/gtPlusPlus/core/handler/events/PlayerTickHandler.java index dc7ccb3e72..dc7ccb3e72 100644 --- a/src/Java/gtPlusPlus/core/handler/events/PlayerTickHandler.java +++ b/src/main/java/gtPlusPlus/core/handler/events/PlayerTickHandler.java diff --git a/src/Java/gtPlusPlus/core/handler/events/SneakManager.java b/src/main/java/gtPlusPlus/core/handler/events/SneakManager.java index 3e51c6488a..3e51c6488a 100644 --- a/src/Java/gtPlusPlus/core/handler/events/SneakManager.java +++ b/src/main/java/gtPlusPlus/core/handler/events/SneakManager.java diff --git a/src/Java/gtPlusPlus/core/handler/events/UnbreakableBlockManager.java b/src/main/java/gtPlusPlus/core/handler/events/UnbreakableBlockManager.java index b653c6ffb6..b653c6ffb6 100644 --- a/src/Java/gtPlusPlus/core/handler/events/UnbreakableBlockManager.java +++ b/src/main/java/gtPlusPlus/core/handler/events/UnbreakableBlockManager.java diff --git a/src/Java/gtPlusPlus/core/handler/events/ZombieBackupSpawnEventHandler.java b/src/main/java/gtPlusPlus/core/handler/events/ZombieBackupSpawnEventHandler.java index 68df68aa2a..68df68aa2a 100644 --- a/src/Java/gtPlusPlus/core/handler/events/ZombieBackupSpawnEventHandler.java +++ b/src/main/java/gtPlusPlus/core/handler/events/ZombieBackupSpawnEventHandler.java diff --git a/src/Java/gtPlusPlus/core/handler/render/CapeHandler.java b/src/main/java/gtPlusPlus/core/handler/render/CapeHandler.java index 491d9a2aba..491d9a2aba 100644 --- a/src/Java/gtPlusPlus/core/handler/render/CapeHandler.java +++ b/src/main/java/gtPlusPlus/core/handler/render/CapeHandler.java diff --git a/src/Java/gtPlusPlus/core/handler/render/FirepitModel.java b/src/main/java/gtPlusPlus/core/handler/render/FirepitModel.java index 029d961bff..029d961bff 100644 --- a/src/Java/gtPlusPlus/core/handler/render/FirepitModel.java +++ b/src/main/java/gtPlusPlus/core/handler/render/FirepitModel.java diff --git a/src/Java/gtPlusPlus/core/handler/render/FirepitRender.java b/src/main/java/gtPlusPlus/core/handler/render/FirepitRender.java index 7b8d23e25b..7b8d23e25b 100644 --- a/src/Java/gtPlusPlus/core/handler/render/FirepitRender.java +++ b/src/main/java/gtPlusPlus/core/handler/render/FirepitRender.java diff --git a/src/Java/gtPlusPlus/core/handler/workbench/Workbench_CraftingHandler.java b/src/main/java/gtPlusPlus/core/handler/workbench/Workbench_CraftingHandler.java index d6a73512e2..d6a73512e2 100644 --- a/src/Java/gtPlusPlus/core/handler/workbench/Workbench_CraftingHandler.java +++ b/src/main/java/gtPlusPlus/core/handler/workbench/Workbench_CraftingHandler.java diff --git a/src/Java/gtPlusPlus/core/handler/workbench/Workbench_RecipeSorter.java b/src/main/java/gtPlusPlus/core/handler/workbench/Workbench_RecipeSorter.java index 9d5f7d03ed..9d5f7d03ed 100644 --- a/src/Java/gtPlusPlus/core/handler/workbench/Workbench_RecipeSorter.java +++ b/src/main/java/gtPlusPlus/core/handler/workbench/Workbench_RecipeSorter.java diff --git a/src/Java/gtPlusPlus/core/interfaces/IGuiManager.java b/src/main/java/gtPlusPlus/core/interfaces/IGuiManager.java index 1d0ad9ed87..1d0ad9ed87 100644 --- a/src/Java/gtPlusPlus/core/interfaces/IGuiManager.java +++ b/src/main/java/gtPlusPlus/core/interfaces/IGuiManager.java diff --git a/src/Java/gtPlusPlus/core/interfaces/IGuiManagerMiscUtils.java b/src/main/java/gtPlusPlus/core/interfaces/IGuiManagerMiscUtils.java index cf46c67a54..cf46c67a54 100644 --- a/src/Java/gtPlusPlus/core/interfaces/IGuiManagerMiscUtils.java +++ b/src/main/java/gtPlusPlus/core/interfaces/IGuiManagerMiscUtils.java diff --git a/src/Java/gtPlusPlus/core/interfaces/IItemBlueprint.java b/src/main/java/gtPlusPlus/core/interfaces/IItemBlueprint.java index 473aa827b6..473aa827b6 100644 --- a/src/Java/gtPlusPlus/core/interfaces/IItemBlueprint.java +++ b/src/main/java/gtPlusPlus/core/interfaces/IItemBlueprint.java diff --git a/src/Java/gtPlusPlus/core/inventories/BaseInventoryBackpack.java b/src/main/java/gtPlusPlus/core/inventories/BaseInventoryBackpack.java index 256fedb13c..256fedb13c 100644 --- a/src/Java/gtPlusPlus/core/inventories/BaseInventoryBackpack.java +++ b/src/main/java/gtPlusPlus/core/inventories/BaseInventoryBackpack.java diff --git a/src/Java/gtPlusPlus/core/inventories/BaseInventoryGrindle.java b/src/main/java/gtPlusPlus/core/inventories/BaseInventoryGrindle.java index 823398bd57..823398bd57 100644 --- a/src/Java/gtPlusPlus/core/inventories/BaseInventoryGrindle.java +++ b/src/main/java/gtPlusPlus/core/inventories/BaseInventoryGrindle.java diff --git a/src/Java/gtPlusPlus/core/inventories/InventoryCircuitProgrammer.java b/src/main/java/gtPlusPlus/core/inventories/InventoryCircuitProgrammer.java index da45b5a988..da45b5a988 100644 --- a/src/Java/gtPlusPlus/core/inventories/InventoryCircuitProgrammer.java +++ b/src/main/java/gtPlusPlus/core/inventories/InventoryCircuitProgrammer.java diff --git a/src/Java/gtPlusPlus/core/inventories/InventoryFishTrap.java b/src/main/java/gtPlusPlus/core/inventories/InventoryFishTrap.java index 429ff517c1..429ff517c1 100644 --- a/src/Java/gtPlusPlus/core/inventories/InventoryFishTrap.java +++ b/src/main/java/gtPlusPlus/core/inventories/InventoryFishTrap.java diff --git a/src/Java/gtPlusPlus/core/inventories/InventoryHeliumGenerator.java b/src/main/java/gtPlusPlus/core/inventories/InventoryHeliumGenerator.java index 0288aa4d29..0288aa4d29 100644 --- a/src/Java/gtPlusPlus/core/inventories/InventoryHeliumGenerator.java +++ b/src/main/java/gtPlusPlus/core/inventories/InventoryHeliumGenerator.java diff --git a/src/Java/gtPlusPlus/core/inventories/InventoryPestKiller.java b/src/main/java/gtPlusPlus/core/inventories/InventoryPestKiller.java index 1c5d98f7d2..1c5d98f7d2 100644 --- a/src/Java/gtPlusPlus/core/inventories/InventoryPestKiller.java +++ b/src/main/java/gtPlusPlus/core/inventories/InventoryPestKiller.java diff --git a/src/Java/gtPlusPlus/core/inventories/InventoryWorkbenchChest.java b/src/main/java/gtPlusPlus/core/inventories/InventoryWorkbenchChest.java index 3ea5675ba2..3ea5675ba2 100644 --- a/src/Java/gtPlusPlus/core/inventories/InventoryWorkbenchChest.java +++ b/src/main/java/gtPlusPlus/core/inventories/InventoryWorkbenchChest.java diff --git a/src/Java/gtPlusPlus/core/inventories/InventoryWorkbenchCrafting.java b/src/main/java/gtPlusPlus/core/inventories/InventoryWorkbenchCrafting.java index f49540b5e2..f49540b5e2 100644 --- a/src/Java/gtPlusPlus/core/inventories/InventoryWorkbenchCrafting.java +++ b/src/main/java/gtPlusPlus/core/inventories/InventoryWorkbenchCrafting.java diff --git a/src/Java/gtPlusPlus/core/inventories/InventoryWorkbenchHoloCrafting.java b/src/main/java/gtPlusPlus/core/inventories/InventoryWorkbenchHoloCrafting.java index 432a425a9b..432a425a9b 100644 --- a/src/Java/gtPlusPlus/core/inventories/InventoryWorkbenchHoloCrafting.java +++ b/src/main/java/gtPlusPlus/core/inventories/InventoryWorkbenchHoloCrafting.java diff --git a/src/Java/gtPlusPlus/core/inventories/InventoryWorkbenchHoloSlots.java b/src/main/java/gtPlusPlus/core/inventories/InventoryWorkbenchHoloSlots.java index 1966e8fdca..1966e8fdca 100644 --- a/src/Java/gtPlusPlus/core/inventories/InventoryWorkbenchHoloSlots.java +++ b/src/main/java/gtPlusPlus/core/inventories/InventoryWorkbenchHoloSlots.java diff --git a/src/Java/gtPlusPlus/core/inventories/InventoryWorkbenchTools.java b/src/main/java/gtPlusPlus/core/inventories/InventoryWorkbenchTools.java index 6543f6e9ea..6543f6e9ea 100644 --- a/src/Java/gtPlusPlus/core/inventories/InventoryWorkbenchTools.java +++ b/src/main/java/gtPlusPlus/core/inventories/InventoryWorkbenchTools.java diff --git a/src/Java/gtPlusPlus/core/inventories/InventoryWorkbenchToolsElectric.java b/src/main/java/gtPlusPlus/core/inventories/InventoryWorkbenchToolsElectric.java index 29bf306b08..29bf306b08 100644 --- a/src/Java/gtPlusPlus/core/inventories/InventoryWorkbenchToolsElectric.java +++ b/src/main/java/gtPlusPlus/core/inventories/InventoryWorkbenchToolsElectric.java diff --git a/src/Java/gtPlusPlus/core/inventories/Inventory_DecayablesChest.java b/src/main/java/gtPlusPlus/core/inventories/Inventory_DecayablesChest.java index 666f4aac53..666f4aac53 100644 --- a/src/Java/gtPlusPlus/core/inventories/Inventory_DecayablesChest.java +++ b/src/main/java/gtPlusPlus/core/inventories/Inventory_DecayablesChest.java diff --git a/src/Java/gtPlusPlus/core/inventories/Inventory_EggBox.java b/src/main/java/gtPlusPlus/core/inventories/Inventory_EggBox.java index 334afc3300..334afc3300 100644 --- a/src/Java/gtPlusPlus/core/inventories/Inventory_EggBox.java +++ b/src/main/java/gtPlusPlus/core/inventories/Inventory_EggBox.java diff --git a/src/Java/gtPlusPlus/core/inventories/Inventory_RoundRobinator.java b/src/main/java/gtPlusPlus/core/inventories/Inventory_RoundRobinator.java index a47f250c39..a47f250c39 100644 --- a/src/Java/gtPlusPlus/core/inventories/Inventory_RoundRobinator.java +++ b/src/main/java/gtPlusPlus/core/inventories/Inventory_RoundRobinator.java diff --git a/src/Java/gtPlusPlus/core/inventories/Inventory_SuperJukebox.java b/src/main/java/gtPlusPlus/core/inventories/Inventory_SuperJukebox.java index 681c67a988..681c67a988 100644 --- a/src/Java/gtPlusPlus/core/inventories/Inventory_SuperJukebox.java +++ b/src/main/java/gtPlusPlus/core/inventories/Inventory_SuperJukebox.java diff --git a/src/Java/gtPlusPlus/core/inventories/Inventory_VolumetricFlaskSetter.java b/src/main/java/gtPlusPlus/core/inventories/Inventory_VolumetricFlaskSetter.java index e2dc91a413..e2dc91a413 100644 --- a/src/Java/gtPlusPlus/core/inventories/Inventory_VolumetricFlaskSetter.java +++ b/src/main/java/gtPlusPlus/core/inventories/Inventory_VolumetricFlaskSetter.java diff --git a/src/Java/gtPlusPlus/core/inventories/box/LunchBoxInventory.java b/src/main/java/gtPlusPlus/core/inventories/box/LunchBoxInventory.java index 03350a3c18..03350a3c18 100644 --- a/src/Java/gtPlusPlus/core/inventories/box/LunchBoxInventory.java +++ b/src/main/java/gtPlusPlus/core/inventories/box/LunchBoxInventory.java diff --git a/src/Java/gtPlusPlus/core/inventories/box/MagicBagInventory.java b/src/main/java/gtPlusPlus/core/inventories/box/MagicBagInventory.java index 56b1835113..56b1835113 100644 --- a/src/Java/gtPlusPlus/core/inventories/box/MagicBagInventory.java +++ b/src/main/java/gtPlusPlus/core/inventories/box/MagicBagInventory.java diff --git a/src/Java/gtPlusPlus/core/inventories/box/ToolBoxInventory.java b/src/main/java/gtPlusPlus/core/inventories/box/ToolBoxInventory.java index 30893aeb4b..30893aeb4b 100644 --- a/src/Java/gtPlusPlus/core/inventories/box/ToolBoxInventory.java +++ b/src/main/java/gtPlusPlus/core/inventories/box/ToolBoxInventory.java diff --git a/src/Java/gtPlusPlus/core/inventories/modulartable/InventoryModularMain.java b/src/main/java/gtPlusPlus/core/inventories/modulartable/InventoryModularMain.java index 825a9a8851..825a9a8851 100644 --- a/src/Java/gtPlusPlus/core/inventories/modulartable/InventoryModularMain.java +++ b/src/main/java/gtPlusPlus/core/inventories/modulartable/InventoryModularMain.java diff --git a/src/Java/gtPlusPlus/core/inventories/modulartable/InventoryModularOutput.java b/src/main/java/gtPlusPlus/core/inventories/modulartable/InventoryModularOutput.java index d3c59ee2a4..d3c59ee2a4 100644 --- a/src/Java/gtPlusPlus/core/inventories/modulartable/InventoryModularOutput.java +++ b/src/main/java/gtPlusPlus/core/inventories/modulartable/InventoryModularOutput.java diff --git a/src/Java/gtPlusPlus/core/inventories/projecttable/InventoryProjectMain.java b/src/main/java/gtPlusPlus/core/inventories/projecttable/InventoryProjectMain.java index 2d91869027..2d91869027 100644 --- a/src/Java/gtPlusPlus/core/inventories/projecttable/InventoryProjectMain.java +++ b/src/main/java/gtPlusPlus/core/inventories/projecttable/InventoryProjectMain.java diff --git a/src/Java/gtPlusPlus/core/inventories/projecttable/InventoryProjectOutput.java b/src/main/java/gtPlusPlus/core/inventories/projecttable/InventoryProjectOutput.java index 41ddd06ef1..41ddd06ef1 100644 --- a/src/Java/gtPlusPlus/core/inventories/projecttable/InventoryProjectOutput.java +++ b/src/main/java/gtPlusPlus/core/inventories/projecttable/InventoryProjectOutput.java diff --git a/src/Java/gtPlusPlus/core/inventories/tradetable/InventoryTradeMain.java b/src/main/java/gtPlusPlus/core/inventories/tradetable/InventoryTradeMain.java index aa7e8b1866..aa7e8b1866 100644 --- a/src/Java/gtPlusPlus/core/inventories/tradetable/InventoryTradeMain.java +++ b/src/main/java/gtPlusPlus/core/inventories/tradetable/InventoryTradeMain.java diff --git a/src/Java/gtPlusPlus/core/inventories/tradetable/InventoryTradeOutput.java b/src/main/java/gtPlusPlus/core/inventories/tradetable/InventoryTradeOutput.java index fb4329e11a..fb4329e11a 100644 --- a/src/Java/gtPlusPlus/core/inventories/tradetable/InventoryTradeOutput.java +++ b/src/main/java/gtPlusPlus/core/inventories/tradetable/InventoryTradeOutput.java diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/main/java/gtPlusPlus/core/item/ModItems.java index 1e0b779bac..fca4c5d3c6 100644 --- a/src/Java/gtPlusPlus/core/item/ModItems.java +++ b/src/main/java/gtPlusPlus/core/item/ModItems.java @@ -5,6 +5,7 @@ import static gtPlusPlus.core.lib.CORE.LOAD_ALL_CONTENT; import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.enums.Materials; +import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_OreDictUnificator; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.block.base.BasicBlock.BlockTypes; @@ -13,6 +14,8 @@ import gtPlusPlus.core.common.compat.COMPAT_Baubles; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.item.base.*; import gtPlusPlus.core.item.base.BaseItemComponent.ComponentTypes; +import gtPlusPlus.core.item.base.cell.BaseItemCell; +import gtPlusPlus.core.item.base.dusts.BaseItemDust; import gtPlusPlus.core.item.base.foil.BaseItemFoil; import gtPlusPlus.core.item.base.foods.BaseItemFood; import gtPlusPlus.core.item.base.foods.BaseItemHotFood; @@ -201,6 +204,8 @@ public final class ModItems { public static Item dustIgnis; public static Item dustTerra; public static Item dustAqua; + + public static Item cellHydrogenChlorideMix; public static BaseEuItem metaItem2; @@ -231,7 +236,17 @@ public final class ModItems { public static Item dustFertUN18; public static Item dustFertUN32; - public static Fluid fluidFLiBeSalt; + //public static Fluid fluidFLiBeSalt; + //public static Fluid fluidFLiBeSaltBurnt; + + public static Fluid fluidLftrCore1; + public static Fluid fluidLftrCore2; + public static Fluid fluidLftrCore3; + public static Fluid fluidLftrCore4; + public static Fluid fluidLftrBlanket1; + public static Fluid fluidLftrBlanket2; + public static Fluid fluidLftrBlanket3; + public static Fluid fluidNuclearWaste; //Possibly missing base items that GT may be missing. @@ -245,6 +260,7 @@ public final class ModItems { public static Item itemDoublePlateClay; public static Item itemDoublePlateEuropium; public static Item itemFoilUranium235; + public static Item itemDustIndium; public static BlockBaseModular blockRawMeat; public static Item itemBoilerChassis; @@ -283,6 +299,7 @@ public final class ModItems { public static Item dustNeptunium238; public static Item dustDecayedRadium226; public static Item dustRadium226; + public static Item dustProtactinium233; public static ItemGiantEgg itemBigEgg; @@ -458,6 +475,8 @@ public final class ModItems { 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); @@ -507,6 +526,9 @@ public final class ModItems { MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().POLONIUM210, false); MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().AMERICIUM241, false); + if (!CORE.GTNH) { + MaterialGenerator.generateOreMaterialWithAllExcessComponents(ELEMENT.getInstance().TRINIUM); + } //Custom Materials that will have standalone refinery processes MaterialGenerator.generate(ELEMENT.STANDALONE.ADVANCED_NITINOL, false); @@ -518,8 +540,8 @@ public final class ModItems { //Custom Materials that are from Runescape MaterialGenerator.generate(ELEMENT.STANDALONE.BLACK_METAL); MaterialGenerator.generate(ELEMENT.STANDALONE.WHITE_METAL); - MaterialGenerator.generate(ELEMENT.STANDALONE.GRANITE, false, false); - MaterialGenerator.generate(ELEMENT.STANDALONE.RUNITE, false); + MaterialGenerator.generateOreMaterialWithAllExcessComponents(ELEMENT.STANDALONE.GRANITE); + MaterialGenerator.generateOreMaterialWithAllExcessComponents(ELEMENT.STANDALONE.RUNITE); MaterialGenerator.generate(ELEMENT.STANDALONE.DRAGON_METAL, false); MISC_MATERIALS.run(); @@ -536,30 +558,31 @@ public final class ModItems { MaterialGenerator.generate(ALLOY.TUNGSTEN_TITANIUM_CARBIDE); //LFTR Fuel components - MaterialGenerator.generate(MISC_MATERIALS.HYDROXIDE); //LFTR fuel component - MaterialGenerator.generate(MISC_MATERIALS.AMMONIA); //LFTR fuel component - MaterialGenerator.generate(MISC_MATERIALS.AMMONIUM); //LFTR fuel component - MaterialGenerator.generate(FLUORIDES.AMMONIUM_BIFLUORIDE); //LFTR fuel component - MaterialGenerator.generate(FLUORIDES.BERYLLIUM_HYDROXIDE); //LFTR fuel component - MaterialGenerator.generate(FLUORIDES.AMMONIUM_TETRAFLUOROBERYLLATE); //LFTR fuel component + //MaterialGenerator.generate(MISC_MATERIALS.HYDROXIDE); //LFTR fuel component + //MaterialGenerator.generate(MISC_MATERIALS.AMMONIA); //LFTR fuel component + //MaterialGenerator.generate(MISC_MATERIALS.AMMONIUM); //LFTR fuel component + MaterialGenerator.generateNuclearDusts(FLUORIDES.AMMONIUM_BIFLUORIDE); //LFTR fuel component + MaterialGenerator.generateNuclearDusts(FLUORIDES.BERYLLIUM_HYDROXIDE); //LFTR fuel component + MaterialGenerator.generateNuclearDusts(FLUORIDES.AMMONIUM_TETRAFLUOROBERYLLATE); //LFTR fuel component //Generate Fluorides - MaterialGenerator.generateNuclearMaterial(FLUORIDES.BERYLLIUM_FLUORIDE); - MaterialGenerator.generateNuclearMaterial(FLUORIDES.LITHIUM_FLUORIDE); - MaterialGenerator.generateNuclearMaterial(FLUORIDES.THORIUM_TETRAFLUORIDE); - MaterialGenerator.generateNuclearMaterial(FLUORIDES.THORIUM_HEXAFLUORIDE); - MaterialGenerator.generateNuclearMaterial(FLUORIDES.URANIUM_TETRAFLUORIDE); - MaterialGenerator.generateNuclearMaterial(FLUORIDES.URANIUM_HEXAFLUORIDE); - MaterialGenerator.generateNuclearMaterial(FLUORIDES.ZIRCONIUM_TETRAFLUORIDE); + 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); //LFTR Fluoride outputs - MaterialGenerator.generateNuclearMaterial(FLUORIDES.NEPTUNIUM_HEXAFLUORIDE); - MaterialGenerator.generateNuclearMaterial(FLUORIDES.TECHNETIUM_HEXAFLUORIDE); - MaterialGenerator.generateNuclearMaterial(FLUORIDES.SELENIUM_HEXAFLUORIDE); + MaterialGenerator.generateNuclearDusts(FLUORIDES.NEPTUNIUM_HEXAFLUORIDE); + MaterialGenerator.generateNuclearDusts(FLUORIDES.TECHNETIUM_HEXAFLUORIDE); + MaterialGenerator.generateNuclearDusts(FLUORIDES.SELENIUM_HEXAFLUORIDE); //Generate Reactor Fuel Salts - MaterialGenerator.generateNuclearMaterial(NUCLIDE.LiFBeF2ZrF4U235, false); - MaterialGenerator.generateNuclearMaterial(NUCLIDE.LiFBeF2ZrF4UF4, false); - MaterialGenerator.generateNuclearMaterial(NUCLIDE.LiFBeF2ThF4UF4, false); + MaterialGenerator.generateNuclearDusts(NUCLIDE.LiFBeF2ZrF4U235); + MaterialGenerator.generateNuclearDusts(NUCLIDE.LiFBeF2ZrF4UF4); + MaterialGenerator.generateNuclearDusts(NUCLIDE.LiFBeF2ThF4UF4); + //MaterialGenerator.generateNuclearMaterial(NUCLIDE.Li2BeF4, false); //Generate some Alloys @@ -626,12 +649,14 @@ public final class ModItems { MaterialGenerator.generate(ALLOY.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(ALLOY.BOTMIUM); + MaterialGenerator.generate(ALLOY.HS188A); MaterialGenerator.generate(ALLOY.TITANSTEEL); @@ -690,7 +715,10 @@ public final class ModItems { 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]; + dustAqua = ItemUtils.generateSpecialUseDusts(ELEMENT.getInstance().AQUA, true)[0]; + + ItemUtils.generateSpecialUseDusts(MISC_MATERIALS.WOODS_GLASS, false); + cellHydrogenChlorideMix = new BaseItemCell("hydrogenchloridemix", "Hydrogen Chloride Mix", MISC_MATERIALS.HYDROGEN_CHLORIDE.getRGB()); //Nuclear Fuel Dusts dustLithiumCarbonate = ItemUtils.generateSpecialUseDusts("LithiumCarbonate", "Lithium Carbonate", "Li2CO3", Utils.rgbtoHexValue(240, 240, 240))[0]; //https://en.wikipedia.org/wiki/Lithium_carbonate @@ -710,12 +738,26 @@ public final class ModItems { GT_OreDictUnificator.registerOre("dustCalciumSulfate", ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustGypsum", 1)); } dustLi2CO3CaOH2 = ItemUtils.generateSpecialUseDusts("Li2CO3CaOH2", "Li2CO3 + Ca(OH)2 Compound", "Li2CO3CaOH2", Utils.rgbtoHexValue(255, 255, 255))[0]; //https://en.wikipedia.org/wiki/Calcium_carbonate - + MaterialUtils.generateSpecialDustAndAssignToAMaterial(FLUORIDES.SODIUM_FLUORIDE, false); //FLiBe Fuel Compounds - dustLi2BeF4 = ItemUtils.generateSpecialUseDusts("Li2BeF4", "Li2BeF4 Fuel Compound", "Li2BeF4", Utils.rgbtoHexValue(255, 255, 255))[0]; //https://en.wikipedia.org/wiki/FLiBe + 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)); //fluidFLiBeSalt = ("Li2BeF4", "Li2BeF4", 7430, new short[]{255, 255, 255, 100}, 0); - fluidFLiBeSalt = FluidUtils.addGTFluidNoPrefix("Li2BeF4", "Li2BeF4", new short[]{255, 255, 255, 100}, 0, 743, null, CI.emptyCells(1), 1000, true); - + //fluidFLiBeSalt = FluidUtils.addGTFluidNoPrefix("Li2BeF4", "Lithium Tetrafluoroberyllate", new short[]{255, 255, 255, 100}, 0, 743, null, CI.emptyCells(1), 1000, true); + //fluidFLiBeSaltBurnt = FluidUtils.addGTFluidNoPrefix("Li2BeF2UF4", "Li2BeF2UF4", new short[]{50, 255, 50, 100}, 0, 743, null, CI.emptyCells(1), 1000, true); + + // LFTR Core Fluid Processing + //fluidLftrCore1 = FluidUtils.addGTFluidNoPrefix("LiBeF2UF4FP", "LiBeF2UF4FP", new short[]{110, 255, 110, 100}, 0, 800, null, CI.emptyCells(1), 1000, true); + //fluidLftrCore2 = FluidUtils.addGTFluidNoPrefix("UF6F2FP", "UF6F2FP", new short[]{150, 255, 150, 100}, 0, 800, null, CI.emptyCells(1), 1000, true); + //fluidLftrCore3 = FluidUtils.addGTFluidNoPrefix("LiFBeF2", "LiFBeF2", new short[]{100, 255, 50, 100}, 0, 800, null, CI.emptyCells(1), 1000, true); + //fluidLftrCore4 = FluidUtils.addGTFluidNoPrefix("LiFBeF2UF4", "LiFBeF2UF4", new short[]{50, 255, 100, 100}, 0, 800, null, CI.emptyCells(1), 1000, true); + // LFTR Blanket Fluid Processing + //fluidLftrBlanket1 = FluidUtils.addGTFluidNoPrefix("LiFThF4", "LiFThF4", new short[]{50, 150, 255, 50}, 0, 500, null, CI.emptyCells(1), 1000, true); + //fluidLftrBlanket2 = FluidUtils.addGTFluidNoPrefix("LiFBeF2ThF4", "LiFBeF2ThF4", new short[]{100, 150, 100, 100}, 0, 500, null, CI.emptyCells(1), 1000, true); + //fluidLftrBlanket3 = FluidUtils.addGTFluidNoPrefix("UF6F2", "UF6F2", new short[]{10, 150, 10, 100}, 0, 500, null, CI.emptyCells(1), 1000, true); + fluidNuclearWaste = FluidUtils.addGTFluidNoPrefix("nuclear.waste", "Nuclear Waste", new short[]{10, 250, 10, 100}, 0, 1000, null, CI.emptyCells(1), 1000, true); + + //LFTR Control Circuit itemCircuitLFTR = new CoreItem("itemCircuitLFTR", ""+EnumChatFormatting.GREEN+"Control Circuit", AddToCreativeTab.tabMisc, 1, 0, new String[] {"Keeps Multiblocks Stable"}, EnumRarity.epic, EnumChatFormatting.DARK_GREEN, false, null); @@ -737,7 +779,8 @@ public final class ModItems { //GT_OreDictUnificator.registerOre("cellZrF4", ItemUtils.getItemStackOfAmountFromOreDict("cellZirconiumTetrafluoride", 1)); //GT_OreDictUnificator.registerOre("dustZrF4", ItemUtils.getItemStackOfAmountFromOreDict("dustZirconiumTetrafluoride", 1)); fluidZrF4 = FluidUtils.generateFluidNoPrefix("ZirconiumTetrafluoride", "Zirconium Tetrafluoride", 500, new short[]{170, 170, 140, 100}); //https://en.wikipedia.org/wiki/Zirconium_tetrafluoride - + FLUORIDES.ZIRCONIUM_TETRAFLUORIDE.setFluid(fluidZrF4); + //Coolant Salt //NaBF4 - NaF - 621C //dustNaBF4NaF = ItemUtils.generateSpecialUseDusts("NaBF4NaF", "NaBF4NaF", Utils.rgbtoHexValue(45, 45, 90))[0]; //https://en.wikipedia.org/wiki/Zirconium_tetrafluoride @@ -831,6 +874,11 @@ public final class ModItems { else { itemHotTitaniumIngot = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("ingotHotTitanium", 1); } + + //Need this for Laurenium + if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustIndium", 1) == null){ + itemDustIndium = new BaseItemDust(ELEMENT.getInstance().INDIUM); + } //Industrial Diamonds itemExquisiteIndustrialDiamond = new CoreItem("IndustrialDiamondExquisite", "High Quality Industrial Diamond", tabMisc); @@ -938,7 +986,7 @@ public final class ModItems { dustNeptunium238 = new DustDecayable("dustNeptunium238", Utils.rgbtoHexValue(175, 240, 75), 50640, new String[] {""+StringUtils.superscript("238Np"), "Result: Plutonium 238 ("+StringUtils.superscript("238Pu")+")"}, ELEMENT.getInstance().PLUTONIUM238.getDust(1).getItem(), 5); dustDecayedRadium226 = ItemUtils.generateSpecialUseDusts("DecayedRadium226", "Decayed Radium-226", "Contains Radon ("+StringUtils.superscript("222Rn")+")", ELEMENT.getInstance().RADIUM.getRgbAsHex())[0]; dustRadium226 = new DustDecayable("dustRadium226", ELEMENT.getInstance().RADIUM.getRgbAsHex(), 90000, new String[] {""+StringUtils.superscript("226Ra"), "Result: Radon ("+StringUtils.superscript("222Rn")+")"}, ItemUtils.getSimpleStack(dustDecayedRadium226).getItem(), 5); - + dustProtactinium233 = new DustDecayable("dustProtactinium233", ELEMENT.getInstance().PROTACTINIUM.getRgbAsHex(), 32000, new String[] {""+StringUtils.superscript("233Pa"), "Result: Uranium 233("+StringUtils.superscript("233U")+")"}, ELEMENT.getInstance().URANIUM233.getDust(1).getItem(), 6); dustTechnetium99 = new DustDecayable("dustTechnetium99", ELEMENT.getInstance().TECHNETIUM.getRgbAsHex(), 164500, new String[] {""+StringUtils.superscript("99Mo"), "Result: Ruthenium 99("+StringUtils.superscript("99Ru")+")"}, ELEMENT.getInstance().RUTHENIUM.getDust(1).getItem(), 4); dustTechnetium99M = new DustDecayable("dustTechnetium99M", ELEMENT.getInstance().TECHNETIUM.getRgbAsHex(), 8570, new String[] {""+StringUtils.superscript("99áµTc"), "Result: Technicium 99 ("+StringUtils.superscript("99Tc")+")"}, dustTechnetium99, 4); dustMolybdenum99 = new DustDecayable("dustMolybdenum99", ELEMENT.getInstance().MOLYBDENUM.getRgbAsHex(), 16450, new String[] {""+StringUtils.superscript("99Mo"), "Result: Technicium 99áµ ("+StringUtils.superscript("99áµTc")+")"}, dustTechnetium99M, 4); @@ -1037,10 +1085,10 @@ public final class ModItems { GT_OreDictUnificator.registerOre("platePhasedIron", ItemUtils.getSimpleStack(itemPlatePulsatingIron)); GT_OreDictUnificator.registerOre("blockVibrantAlloy", ItemUtils.getItemStackOfAmountFromOreDict("blockPhasedGold", 1)); - CORE.RA.addFluidExtractionRecipe(MaterialEIO.REDSTONE_ALLOY.getPlate(1), MaterialEIO.REDSTONE_ALLOY.getFluid(144), 16, 4*9); - CORE.RA.addFluidExtractionRecipe(MaterialEIO.REDSTONE_ALLOY.getIngot(1), MaterialEIO.REDSTONE_ALLOY.getFluid(144), 16, 4*9); - CORE.RA.addFluidExtractionRecipe(MaterialEIO.REDSTONE_ALLOY.getNugget(1), MaterialEIO.REDSTONE_ALLOY.getFluid(16), 16, 4); - CORE.RA.addFluidExtractionRecipe(MaterialEIO.REDSTONE_ALLOY.getBlock(1), MaterialEIO.REDSTONE_ALLOY.getFluid(1294), 16, 4*9*9); + CORE.RA.addFluidExtractionRecipe(MaterialEIO.REDSTONE_ALLOY.getPlate(1), MaterialEIO.REDSTONE_ALLOY.getFluidStack(144), 16, 4*9); + CORE.RA.addFluidExtractionRecipe(MaterialEIO.REDSTONE_ALLOY.getIngot(1), MaterialEIO.REDSTONE_ALLOY.getFluidStack(144), 16, 4*9); + CORE.RA.addFluidExtractionRecipe(MaterialEIO.REDSTONE_ALLOY.getNugget(1), MaterialEIO.REDSTONE_ALLOY.getFluidStack(16), 16, 4); + CORE.RA.addFluidExtractionRecipe(MaterialEIO.REDSTONE_ALLOY.getBlock(1), MaterialEIO.REDSTONE_ALLOY.getFluidStack(1294), 16, 4*9*9); } else { diff --git a/src/Java/gtPlusPlus/core/item/base/BaseEuItem.java b/src/main/java/gtPlusPlus/core/item/base/BaseEuItem.java index b4988136c0..b4988136c0 100644 --- a/src/Java/gtPlusPlus/core/item/base/BaseEuItem.java +++ b/src/main/java/gtPlusPlus/core/item/base/BaseEuItem.java diff --git a/src/Java/gtPlusPlus/core/item/base/BaseItemBackpack.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemBackpack.java index 246620344a..246620344a 100644 --- a/src/Java/gtPlusPlus/core/item/base/BaseItemBackpack.java +++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemBackpack.java diff --git a/src/Java/gtPlusPlus/core/item/base/BaseItemBrain.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemBrain.java index 73ed4afb42..73ed4afb42 100644 --- a/src/Java/gtPlusPlus/core/item/base/BaseItemBrain.java +++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemBrain.java diff --git a/src/Java/gtPlusPlus/core/item/base/BaseItemBurnable.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemBurnable.java index a5db714822..a5db714822 100644 --- a/src/Java/gtPlusPlus/core/item/base/BaseItemBurnable.java +++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemBurnable.java diff --git a/src/Java/gtPlusPlus/core/item/base/BaseItemColourable.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemColourable.java index ca7041617d..ca7041617d 100644 --- a/src/Java/gtPlusPlus/core/item/base/BaseItemColourable.java +++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemColourable.java diff --git a/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java index 9b732e38e1..9ad8ea3feb 100644 --- a/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java +++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java @@ -84,8 +84,9 @@ public class BaseItemComponent extends Item{ else { aFormattedNameForFluids = unlocalName; } - - this.componentMaterial = null; + Material aTempMaterial = Material.mMaterialCache.get(localName.toLowerCase()); + Logger.INFO("Attempted to get "+localName+" cell material from cache. Valid? "+(aTempMaterial != null)); + this.componentMaterial = aTempMaterial; this.unlocalName = "itemCell"+aFormattedNameForFluids; this.materialName = localName; this.componentType = ComponentTypes.CELL; @@ -94,6 +95,7 @@ public class BaseItemComponent extends Item{ this.setMaxStackSize(64); this.componentColour = MathUtils.getRgbAsHex(RGBA); this.extraData = RGBA; + this.setTextureName(CORE.MODID + ":" + "item"+ComponentTypes.CELL.COMPONENT_NAME); GameRegistry.registerItem(this, aFormattedNameForFluids); GT_OreDictUnificator.registerOre(ComponentTypes.CELL.getOreDictName()+Utils.sanitizeStringKeepBrackets(localName), ItemUtils.getSimpleStack(this)); @@ -177,10 +179,10 @@ public class BaseItemComponent extends Item{ if (this.componentMaterial != null){ - if (!this.componentMaterial.vChemicalFormula.contains("?") && this.componentMaterial.getState() != MaterialState.PURE_LIQUID) { + if (!this.componentMaterial.vChemicalFormula.contains("?")) { list.add(Utils.sanitizeStringKeepBrackets(this.componentMaterial.vChemicalFormula)); } - else if (this.componentMaterial.vChemicalFormula.contains("?") && this.componentMaterial.getState() != MaterialState.PURE_LIQUID) { + else if (this.componentMaterial.vChemicalFormula.contains("?")) { String temp = componentMaterial.vChemicalFormula; temp = temp.replace(" ", ""); temp = temp.replace("-", ""); @@ -202,6 +204,12 @@ public class BaseItemComponent extends Item{ } } } + else { + String aChemicalFormula = Material.sChemicalFormula.get(materialName.toLowerCase()); + if (aChemicalFormula != null && aChemicalFormula.length() > 0) { + list.add(Utils.sanitizeStringKeepBrackets(aChemicalFormula)); + } + } //Hidden Tooltip if (KeyboardUtils.isCtrlKeyDown()) { diff --git a/src/Java/gtPlusPlus/core/item/base/BaseItemDamageable.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemDamageable.java index 4209ec0a59..4209ec0a59 100644 --- a/src/Java/gtPlusPlus/core/item/base/BaseItemDamageable.java +++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemDamageable.java diff --git a/src/Java/gtPlusPlus/core/item/base/BaseItemGeneric.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemGeneric.java index 970d5ec0c8..970d5ec0c8 100644 --- a/src/Java/gtPlusPlus/core/item/base/BaseItemGeneric.java +++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemGeneric.java diff --git a/src/Java/gtPlusPlus/core/item/base/BaseItemLoot.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemLoot.java index 3d9ff9fa48..3d9ff9fa48 100644 --- a/src/Java/gtPlusPlus/core/item/base/BaseItemLoot.java +++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemLoot.java diff --git a/src/Java/gtPlusPlus/core/item/base/BaseItemTCShard.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemTCShard.java index 4f0db3e2ec..4f0db3e2ec 100644 --- a/src/Java/gtPlusPlus/core/item/base/BaseItemTCShard.java +++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemTCShard.java diff --git a/src/Java/gtPlusPlus/core/item/base/BaseItemTickable.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemTickable.java index 79a49f92b7..eb066024e0 100644 --- a/src/Java/gtPlusPlus/core/item/base/BaseItemTickable.java +++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemTickable.java @@ -45,6 +45,7 @@ public class BaseItemTickable extends CoreItem { this.maxTicks = maxTicks; this.twoRenderPasses = twoPass; this.ticksInContainers = containerTick; + this.maxStackSize = 1; //setGregtechItemList(); } diff --git a/src/Java/gtPlusPlus/core/item/base/BaseItemWithCharge.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemWithCharge.java index d81112e0c6..d81112e0c6 100644 --- a/src/Java/gtPlusPlus/core/item/base/BaseItemWithCharge.java +++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemWithCharge.java diff --git a/src/Java/gtPlusPlus/core/item/base/BaseItemWithDamageValue.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemWithDamageValue.java index 14597ae876..14597ae876 100644 --- a/src/Java/gtPlusPlus/core/item/base/BaseItemWithDamageValue.java +++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemWithDamageValue.java diff --git a/src/Java/gtPlusPlus/core/item/base/BasicSpawnEgg.java b/src/main/java/gtPlusPlus/core/item/base/BasicSpawnEgg.java index 57d42d721e..57d42d721e 100644 --- a/src/Java/gtPlusPlus/core/item/base/BasicSpawnEgg.java +++ b/src/main/java/gtPlusPlus/core/item/base/BasicSpawnEgg.java diff --git a/src/Java/gtPlusPlus/core/item/base/CoreItem.java b/src/main/java/gtPlusPlus/core/item/base/CoreItem.java index 7ce96b2a88..7ce96b2a88 100644 --- a/src/Java/gtPlusPlus/core/item/base/CoreItem.java +++ b/src/main/java/gtPlusPlus/core/item/base/CoreItem.java diff --git a/src/Java/gtPlusPlus/core/item/base/bolts/BaseItemBolt.java b/src/main/java/gtPlusPlus/core/item/base/bolts/BaseItemBolt.java index 0420809253..0420809253 100644 --- a/src/Java/gtPlusPlus/core/item/base/bolts/BaseItemBolt.java +++ b/src/main/java/gtPlusPlus/core/item/base/bolts/BaseItemBolt.java diff --git a/src/Java/gtPlusPlus/core/item/base/cell/BaseItemCell.java b/src/main/java/gtPlusPlus/core/item/base/cell/BaseItemCell.java index 688483b831..ad47adcf64 100644 --- a/src/Java/gtPlusPlus/core/item/base/cell/BaseItemCell.java +++ b/src/main/java/gtPlusPlus/core/item/base/cell/BaseItemCell.java @@ -12,6 +12,7 @@ import gtPlusPlus.core.util.minecraft.ItemUtils; import ic2.core.Ic2Items; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidStack; public class BaseItemCell extends BaseItemComponent{ @@ -26,7 +27,10 @@ public class BaseItemCell extends BaseItemComponent{ public BaseItemCell(final String unlocalName, final String localName, final short[] RGBa) { super(unlocalName, localName, RGBa); this.fluidColour = RGBa; - FluidContainerRegistry.registerFluidContainer(FluidUtils.getFluidStack(unlocalName.toLowerCase(), 0), ItemUtils.getSimpleStack(this), Ic2Items.cell.copy()); + FluidStack aFluid = FluidUtils.getFluidStack(unlocalName.toLowerCase(), 1000); + if (aFluid != null) { + FluidContainerRegistry.registerFluidContainer(aFluid, ItemUtils.getSimpleStack(this), Ic2Items.cell.copy()); + } } public BaseItemCell(final String unlocalName, final String localName, final short[] RGBa, final Fluid cellFluid) { diff --git a/src/Java/gtPlusPlus/core/item/base/cell/BaseItemPlasmaCell.java b/src/main/java/gtPlusPlus/core/item/base/cell/BaseItemPlasmaCell.java index 23d1d022fa..23d1d022fa 100644 --- a/src/Java/gtPlusPlus/core/item/base/cell/BaseItemPlasmaCell.java +++ b/src/main/java/gtPlusPlus/core/item/base/cell/BaseItemPlasmaCell.java diff --git a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java b/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java index 9022f864cb..9022f864cb 100644 --- a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java +++ b/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java diff --git a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustAbstract.java b/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustAbstract.java index 8ee871e9c4..8ee871e9c4 100644 --- a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustAbstract.java +++ b/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustAbstract.java diff --git a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustEx.java b/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustEx.java index 0757177e58..0757177e58 100644 --- a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustEx.java +++ b/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustEx.java diff --git a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java b/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java index e4fa06c58e..e4fa06c58e 100644 --- a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java +++ b/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java diff --git a/src/Java/gtPlusPlus/core/item/base/dusts/decimal/BaseItemCentidust.java b/src/main/java/gtPlusPlus/core/item/base/dusts/decimal/BaseItemCentidust.java index c6aff85da1..c6aff85da1 100644 --- a/src/Java/gtPlusPlus/core/item/base/dusts/decimal/BaseItemCentidust.java +++ b/src/main/java/gtPlusPlus/core/item/base/dusts/decimal/BaseItemCentidust.java diff --git a/src/Java/gtPlusPlus/core/item/base/dusts/decimal/BaseItemDecidust.java b/src/main/java/gtPlusPlus/core/item/base/dusts/decimal/BaseItemDecidust.java index 2d1b4a8d27..2d1b4a8d27 100644 --- a/src/Java/gtPlusPlus/core/item/base/dusts/decimal/BaseItemDecidust.java +++ b/src/main/java/gtPlusPlus/core/item/base/dusts/decimal/BaseItemDecidust.java diff --git a/src/Java/gtPlusPlus/core/item/base/foil/BaseItemFoil.java b/src/main/java/gtPlusPlus/core/item/base/foil/BaseItemFoil.java index 3e2816bf52..3e2816bf52 100644 --- a/src/Java/gtPlusPlus/core/item/base/foil/BaseItemFoil.java +++ b/src/main/java/gtPlusPlus/core/item/base/foil/BaseItemFoil.java diff --git a/src/Java/gtPlusPlus/core/item/base/foods/BaseItemFood.java b/src/main/java/gtPlusPlus/core/item/base/foods/BaseItemFood.java index 54aa90c03f..54aa90c03f 100644 --- a/src/Java/gtPlusPlus/core/item/base/foods/BaseItemFood.java +++ b/src/main/java/gtPlusPlus/core/item/base/foods/BaseItemFood.java diff --git a/src/Java/gtPlusPlus/core/item/base/foods/BaseItemHotFood.java b/src/main/java/gtPlusPlus/core/item/base/foods/BaseItemHotFood.java index 528b9593e6..528b9593e6 100644 --- a/src/Java/gtPlusPlus/core/item/base/foods/BaseItemHotFood.java +++ b/src/main/java/gtPlusPlus/core/item/base/foods/BaseItemHotFood.java diff --git a/src/Java/gtPlusPlus/core/item/base/gears/BaseItemGear.java b/src/main/java/gtPlusPlus/core/item/base/gears/BaseItemGear.java index b72ea5db15..b72ea5db15 100644 --- a/src/Java/gtPlusPlus/core/item/base/gears/BaseItemGear.java +++ b/src/main/java/gtPlusPlus/core/item/base/gears/BaseItemGear.java diff --git a/src/Java/gtPlusPlus/core/item/base/gears/BaseItemSmallGear.java b/src/main/java/gtPlusPlus/core/item/base/gears/BaseItemSmallGear.java index 5435c692c6..5435c692c6 100644 --- a/src/Java/gtPlusPlus/core/item/base/gears/BaseItemSmallGear.java +++ b/src/main/java/gtPlusPlus/core/item/base/gears/BaseItemSmallGear.java diff --git a/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngot.java b/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngot.java index 5f0254bc51..ea96e2914c 100644 --- a/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngot.java +++ b/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngot.java @@ -1,12 +1,7 @@ package gtPlusPlus.core.item.base.ingots; -import net.minecraft.item.ItemStack; - -import gregtech.api.util.GT_ModHandler; - import gtPlusPlus.core.item.base.BaseItemComponent; import gtPlusPlus.core.material.Material; -import gtPlusPlus.core.util.minecraft.ItemUtils; public class BaseItemIngot extends BaseItemComponent{ @@ -21,18 +16,6 @@ public class BaseItemIngot extends BaseItemComponent{ super(material, type); this.materialName = material.getLocalizedName(); this.unlocalName = material.getUnlocalizedName(); - if (type != ComponentTypes.HOTINGOT) { - this.generateCompressorRecipe(); - } } - private void generateCompressorRecipe(){ - final ItemStack tempStack = componentMaterial.getIngot(9); - final ItemStack tempOutput = componentMaterial.getBlock(1); - if (ItemUtils.checkForInvalidItems(new ItemStack[] {tempStack, tempOutput})){ - GT_ModHandler.addCompressionRecipe(tempStack, tempOutput); - } - } - - } diff --git a/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java b/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java index f9acdded7e..c19fecd924 100644 --- a/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java +++ b/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java @@ -52,8 +52,8 @@ public class BaseItemIngotHot extends BaseItemIngot{ } private void generateRecipe(){ - Logger.WARNING("Adding Vacuum Freezer recipe for a Hot Ingot of "+this.materialName+"."); - GT_Values.RA.addVacuumFreezerRecipe(ItemUtils.getSimpleStack(this), this.outputIngot.copy(), 60*this.mTier); + Logger.WARNING("Adding Vacuum Freezer recipe for a Hot Ingot of "+this.materialName+"."); + CORE.RA.addVacuumFreezerRecipe(ItemUtils.getSimpleStack(this), this.outputIngot.copy(), (int) Math.max(this.componentMaterial.getMass() * 3L, 1L), this.componentMaterial.vVoltageMultiplier); } @Override diff --git a/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngot_OLD.java b/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngot_OLD.java index 6ad323333f..6ad323333f 100644 --- a/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngot_OLD.java +++ b/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngot_OLD.java diff --git a/src/Java/gtPlusPlus/core/item/base/itemblock/FluidItemBlock.java b/src/main/java/gtPlusPlus/core/item/base/itemblock/FluidItemBlock.java index 96b5425437..96b5425437 100644 --- a/src/Java/gtPlusPlus/core/item/base/itemblock/FluidItemBlock.java +++ b/src/main/java/gtPlusPlus/core/item/base/itemblock/FluidItemBlock.java diff --git a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockBasicTile.java b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockBasicTile.java index 14344c1817..14344c1817 100644 --- a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockBasicTile.java +++ b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockBasicTile.java diff --git a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockDoor.java b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockDoor.java index 2aba494d6e..2aba494d6e 100644 --- a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockDoor.java +++ b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockDoor.java diff --git a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockEntityBase.java b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockEntityBase.java index ac6740f268..ac6740f268 100644 --- a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockEntityBase.java +++ b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockEntityBase.java diff --git a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java index 396689ef63..396689ef63 100644 --- a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java +++ b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java diff --git a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtFrameBox.java b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtFrameBox.java index 0dd125bf7b..0dd125bf7b 100644 --- a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtFrameBox.java +++ b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtFrameBox.java diff --git a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockMeta.java b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockMeta.java index b26ac67225..b26ac67225 100644 --- a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockMeta.java +++ b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockMeta.java diff --git a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockNBT.java b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockNBT.java index 99367c5ef5..99367c5ef5 100644 --- a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockNBT.java +++ b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockNBT.java diff --git a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java index e4079521d4..e4079521d4 100644 --- a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java +++ b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java diff --git a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockRoundRobinator.java b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockRoundRobinator.java index 7a4222ed0f..7a4222ed0f 100644 --- a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockRoundRobinator.java +++ b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockRoundRobinator.java diff --git a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockSpawner.java b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockSpawner.java index 53c9cdb193..53c9cdb193 100644 --- a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockSpawner.java +++ b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockSpawner.java diff --git a/src/Java/gtPlusPlus/core/item/base/misc/BaseItemMisc.java b/src/main/java/gtPlusPlus/core/item/base/misc/BaseItemMisc.java index 25070ad817..25070ad817 100644 --- a/src/Java/gtPlusPlus/core/item/base/misc/BaseItemMisc.java +++ b/src/main/java/gtPlusPlus/core/item/base/misc/BaseItemMisc.java diff --git a/src/Java/gtPlusPlus/core/item/base/misc/BaseItemParticle.java b/src/main/java/gtPlusPlus/core/item/base/misc/BaseItemParticle.java index b7bbc84757..b7bbc84757 100644 --- a/src/Java/gtPlusPlus/core/item/base/misc/BaseItemParticle.java +++ b/src/main/java/gtPlusPlus/core/item/base/misc/BaseItemParticle.java diff --git a/src/Java/gtPlusPlus/core/item/base/nugget/BaseItemNugget.java b/src/main/java/gtPlusPlus/core/item/base/nugget/BaseItemNugget.java index a6eb598622..1644856bf8 100644 --- a/src/Java/gtPlusPlus/core/item/base/nugget/BaseItemNugget.java +++ b/src/main/java/gtPlusPlus/core/item/base/nugget/BaseItemNugget.java @@ -8,4 +8,5 @@ public class BaseItemNugget extends BaseItemComponent{ public BaseItemNugget(final Material material) { super(material, BaseItemComponent.ComponentTypes.NUGGET); } + } diff --git a/src/Java/gtPlusPlus/core/item/base/ore/BaseItemCentrifugedCrushedOre.java b/src/main/java/gtPlusPlus/core/item/base/ore/BaseItemCentrifugedCrushedOre.java index 73a13f568d..73a13f568d 100644 --- a/src/Java/gtPlusPlus/core/item/base/ore/BaseItemCentrifugedCrushedOre.java +++ b/src/main/java/gtPlusPlus/core/item/base/ore/BaseItemCentrifugedCrushedOre.java diff --git a/src/Java/gtPlusPlus/core/item/base/ore/BaseItemCrushedOre.java b/src/main/java/gtPlusPlus/core/item/base/ore/BaseItemCrushedOre.java index f2ca40334f..f2ca40334f 100644 --- a/src/Java/gtPlusPlus/core/item/base/ore/BaseItemCrushedOre.java +++ b/src/main/java/gtPlusPlus/core/item/base/ore/BaseItemCrushedOre.java diff --git a/src/Java/gtPlusPlus/core/item/base/ore/BaseItemImpureDust.java b/src/main/java/gtPlusPlus/core/item/base/ore/BaseItemImpureDust.java index 45dc4f4402..45dc4f4402 100644 --- a/src/Java/gtPlusPlus/core/item/base/ore/BaseItemImpureDust.java +++ b/src/main/java/gtPlusPlus/core/item/base/ore/BaseItemImpureDust.java diff --git a/src/Java/gtPlusPlus/core/item/base/ore/BaseItemMilledOre.java b/src/main/java/gtPlusPlus/core/item/base/ore/BaseItemMilledOre.java index 4edf4ae75d..4edf4ae75d 100644 --- a/src/Java/gtPlusPlus/core/item/base/ore/BaseItemMilledOre.java +++ b/src/main/java/gtPlusPlus/core/item/base/ore/BaseItemMilledOre.java diff --git a/src/Java/gtPlusPlus/core/item/base/ore/BaseItemPurifiedCrushedOre.java b/src/main/java/gtPlusPlus/core/item/base/ore/BaseItemPurifiedCrushedOre.java index 3f2a1c23e6..3f2a1c23e6 100644 --- a/src/Java/gtPlusPlus/core/item/base/ore/BaseItemPurifiedCrushedOre.java +++ b/src/main/java/gtPlusPlus/core/item/base/ore/BaseItemPurifiedCrushedOre.java diff --git a/src/Java/gtPlusPlus/core/item/base/ore/BaseItemPurifiedDust.java b/src/main/java/gtPlusPlus/core/item/base/ore/BaseItemPurifiedDust.java index 0c9816fb56..0c9816fb56 100644 --- a/src/Java/gtPlusPlus/core/item/base/ore/BaseItemPurifiedDust.java +++ b/src/main/java/gtPlusPlus/core/item/base/ore/BaseItemPurifiedDust.java diff --git a/src/Java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java b/src/main/java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java index 883eb241da..2cb23b3f97 100644 --- a/src/Java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java +++ b/src/main/java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java @@ -14,7 +14,6 @@ import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.material.Material; -import gtPlusPlus.core.material.state.MaterialState; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.EntityUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -124,10 +123,10 @@ public class BaseOreComponent extends Item{ public final void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) { if (this.materialName != null && !this.materialName.equals("")){ if (this.componentMaterial != null){ - if (!this.componentMaterial.vChemicalFormula.contains("?") && this.componentMaterial.getState() != MaterialState.PURE_LIQUID) { + if (!this.componentMaterial.vChemicalFormula.contains("?")) { list.add(Utils.sanitizeStringKeepBrackets(this.componentMaterial.vChemicalFormula)); } - else if (this.componentMaterial.vChemicalFormula.contains("?") && this.componentMaterial.getState() != MaterialState.PURE_LIQUID) { + else if (this.componentMaterial.vChemicalFormula.contains("?")) { String temp = componentMaterial.vChemicalFormula; temp = temp.replace(" ", ""); temp = temp.replace("-", ""); @@ -142,6 +141,12 @@ public class BaseOreComponent extends Item{ list.add(CORE.GT_Tooltip_Radioactive+" | Level: "+this.componentMaterial.vRadiationLevel); } } + else { + String aChemicalFormula = Material.sChemicalFormula.get(materialName.toLowerCase()); + if (aChemicalFormula != null && aChemicalFormula.length() > 0) { + list.add(Utils.sanitizeStringKeepBrackets(aChemicalFormula)); + } + } } super.addInformation(stack, aPlayer, list, bool); } diff --git a/src/Java/gtPlusPlus/core/item/base/plates/BaseItemPlate.java b/src/main/java/gtPlusPlus/core/item/base/plates/BaseItemPlate.java index 34d44cd43e..a810b22c70 100644 --- a/src/Java/gtPlusPlus/core/item/base/plates/BaseItemPlate.java +++ b/src/main/java/gtPlusPlus/core/item/base/plates/BaseItemPlate.java @@ -15,6 +15,4 @@ public class BaseItemPlate extends BaseItemComponent{ this(MaterialUtils.generateQuickMaterial(materialName, state, new short[]{colour[0], colour[1], colour[2], 0}, sRadioactivity)); } - - } diff --git a/src/Java/gtPlusPlus/core/item/base/plates/BaseItemPlateDouble.java b/src/main/java/gtPlusPlus/core/item/base/plates/BaseItemPlateDouble.java index 373f84b7c5..31f86e8ffa 100644 --- a/src/Java/gtPlusPlus/core/item/base/plates/BaseItemPlateDouble.java +++ b/src/main/java/gtPlusPlus/core/item/base/plates/BaseItemPlateDouble.java @@ -16,4 +16,5 @@ public class BaseItemPlateDouble extends BaseItemComponent{ public String getItemStackDisplayName(final ItemStack p_77653_1_) { return ("Double "+this.materialName+ " Plate"); } + } diff --git a/src/Java/gtPlusPlus/core/item/base/plates/BaseItemPlateHeavy.java b/src/main/java/gtPlusPlus/core/item/base/plates/BaseItemPlateHeavy.java index c9072b0d82..c9072b0d82 100644 --- a/src/Java/gtPlusPlus/core/item/base/plates/BaseItemPlateHeavy.java +++ b/src/main/java/gtPlusPlus/core/item/base/plates/BaseItemPlateHeavy.java diff --git a/src/Java/gtPlusPlus/core/item/base/plates/BaseItemPlate_OLD.java b/src/main/java/gtPlusPlus/core/item/base/plates/BaseItemPlate_OLD.java index ec3f449b0a..ec3f449b0a 100644 --- a/src/Java/gtPlusPlus/core/item/base/plates/BaseItemPlate_OLD.java +++ b/src/main/java/gtPlusPlus/core/item/base/plates/BaseItemPlate_OLD.java diff --git a/src/Java/gtPlusPlus/core/item/base/rings/BaseItemRing.java b/src/main/java/gtPlusPlus/core/item/base/rings/BaseItemRing.java index 62777cc9f5..c83ae94af1 100644 --- a/src/Java/gtPlusPlus/core/item/base/rings/BaseItemRing.java +++ b/src/main/java/gtPlusPlus/core/item/base/rings/BaseItemRing.java @@ -8,4 +8,5 @@ public class BaseItemRing extends BaseItemComponent{ public BaseItemRing(final Material material) { super(material, BaseItemComponent.ComponentTypes.RING); } + } diff --git a/src/main/java/gtPlusPlus/core/item/base/rods/BaseItemRod.java b/src/main/java/gtPlusPlus/core/item/base/rods/BaseItemRod.java new file mode 100644 index 0000000000..f77f846d34 --- /dev/null +++ b/src/main/java/gtPlusPlus/core/item/base/rods/BaseItemRod.java @@ -0,0 +1,12 @@ +package gtPlusPlus.core.item.base.rods; + +import gtPlusPlus.core.item.base.BaseItemComponent; +import gtPlusPlus.core.material.Material; + +public class BaseItemRod extends BaseItemComponent{ + + public BaseItemRod(final Material material) { + super(material, BaseItemComponent.ComponentTypes.ROD); + } + +} diff --git a/src/main/java/gtPlusPlus/core/item/base/rods/BaseItemRodLong.java b/src/main/java/gtPlusPlus/core/item/base/rods/BaseItemRodLong.java new file mode 100644 index 0000000000..215012817d --- /dev/null +++ b/src/main/java/gtPlusPlus/core/item/base/rods/BaseItemRodLong.java @@ -0,0 +1,18 @@ +package gtPlusPlus.core.item.base.rods; + +import gtPlusPlus.core.item.base.BaseItemComponent; +import gtPlusPlus.core.material.Material; +import net.minecraft.item.ItemStack; + +public class BaseItemRodLong extends BaseItemComponent{ + + public BaseItemRodLong(final Material material) { + super(material, BaseItemComponent.ComponentTypes.RODLONG); + } + + @Override + public String getItemStackDisplayName(final ItemStack p_77653_1_) { + return ("Long "+this.materialName+ " Rod"); + } + +} diff --git a/src/Java/gtPlusPlus/core/item/base/rotors/BaseItemRotor.java b/src/main/java/gtPlusPlus/core/item/base/rotors/BaseItemRotor.java index 6960e89e89..6960e89e89 100644 --- a/src/Java/gtPlusPlus/core/item/base/rotors/BaseItemRotor.java +++ b/src/main/java/gtPlusPlus/core/item/base/rotors/BaseItemRotor.java diff --git a/src/main/java/gtPlusPlus/core/item/base/screws/BaseItemScrew.java b/src/main/java/gtPlusPlus/core/item/base/screws/BaseItemScrew.java new file mode 100644 index 0000000000..dbd817215a --- /dev/null +++ b/src/main/java/gtPlusPlus/core/item/base/screws/BaseItemScrew.java @@ -0,0 +1,12 @@ +package gtPlusPlus.core.item.base.screws; + +import gtPlusPlus.core.item.base.BaseItemComponent; +import gtPlusPlus.core.material.Material; + +public class BaseItemScrew extends BaseItemComponent{ + + public BaseItemScrew(final Material material) { + super(material, BaseItemComponent.ComponentTypes.SCREW); + } + +} diff --git a/src/Java/gtPlusPlus/core/item/bauble/BaseBauble.java b/src/main/java/gtPlusPlus/core/item/bauble/BaseBauble.java index fdd148b97b..fdd148b97b 100644 --- a/src/Java/gtPlusPlus/core/item/bauble/BaseBauble.java +++ b/src/main/java/gtPlusPlus/core/item/bauble/BaseBauble.java diff --git a/src/Java/gtPlusPlus/core/item/bauble/BatteryPackBaseBauble.java b/src/main/java/gtPlusPlus/core/item/bauble/BatteryPackBaseBauble.java index 70de4603e7..70de4603e7 100644 --- a/src/Java/gtPlusPlus/core/item/bauble/BatteryPackBaseBauble.java +++ b/src/main/java/gtPlusPlus/core/item/bauble/BatteryPackBaseBauble.java diff --git a/src/Java/gtPlusPlus/core/item/bauble/ElectricBaseBauble.java b/src/main/java/gtPlusPlus/core/item/bauble/ElectricBaseBauble.java index cfa5cb363d..4316f13401 100644 --- a/src/Java/gtPlusPlus/core/item/bauble/ElectricBaseBauble.java +++ b/src/main/java/gtPlusPlus/core/item/bauble/ElectricBaseBauble.java @@ -135,7 +135,7 @@ public abstract class ElectricBaseBauble extends BaseBauble implements IElectric list.add(EnumChatFormatting.GOLD + aEuInfo + EnumChatFormatting.GRAY); list.add(EnumChatFormatting.GRAY + aTier+": [" + EnumChatFormatting.YELLOW + this.getTier(stack) + EnumChatFormatting.GRAY + "] "+aInputLimit+": [" + EnumChatFormatting.YELLOW - + this.getTransferLimit(stack) + EnumChatFormatting.GRAY + aEUT); + + this.getTransferLimit(stack) + EnumChatFormatting.GRAY + aEUT+"]"); list.add(EnumChatFormatting.GRAY + aCurrentPower +": [" + EnumChatFormatting.YELLOW + (long) this.getCharge(stack) + EnumChatFormatting.GRAY + aEU +"] [" + EnumChatFormatting.YELLOW + MathUtils.findPercentage(this.getCharge(stack), this.getMaxCharge(stack)) + EnumChatFormatting.GRAY diff --git a/src/Java/gtPlusPlus/core/item/bauble/FireProtectionBauble.java b/src/main/java/gtPlusPlus/core/item/bauble/FireProtectionBauble.java index 6a8751b682..6a8751b682 100644 --- a/src/Java/gtPlusPlus/core/item/bauble/FireProtectionBauble.java +++ b/src/main/java/gtPlusPlus/core/item/bauble/FireProtectionBauble.java diff --git a/src/Java/gtPlusPlus/core/item/bauble/HealthBoostBauble.java b/src/main/java/gtPlusPlus/core/item/bauble/HealthBoostBauble.java index 49ce7ad715..49ce7ad715 100644 --- a/src/Java/gtPlusPlus/core/item/bauble/HealthBoostBauble.java +++ b/src/main/java/gtPlusPlus/core/item/bauble/HealthBoostBauble.java diff --git a/src/Java/gtPlusPlus/core/item/bauble/ModularBauble.java b/src/main/java/gtPlusPlus/core/item/bauble/ModularBauble.java index a8d216e1bc..a8d216e1bc 100644 --- a/src/Java/gtPlusPlus/core/item/bauble/ModularBauble.java +++ b/src/main/java/gtPlusPlus/core/item/bauble/ModularBauble.java diff --git a/src/Java/gtPlusPlus/core/item/bauble/MonsterKillerBaseBauble.java b/src/main/java/gtPlusPlus/core/item/bauble/MonsterKillerBaseBauble.java index aab302688b..aab302688b 100644 --- a/src/Java/gtPlusPlus/core/item/bauble/MonsterKillerBaseBauble.java +++ b/src/main/java/gtPlusPlus/core/item/bauble/MonsterKillerBaseBauble.java diff --git a/src/Java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java b/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java index e11b163753..8e7a760195 100644 --- a/src/Java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java @@ -296,7 +296,7 @@ public class AgriculturalChem extends ItemPackage { } if (aTiCon) { - aBlood = FluidUtils.getFluidStack("hell_blood", 100); + aBlood = FluidUtils.getFluidStack("blood", 100); if (aBlood != null) { Logger.INFO("Found Tinker's Construct, enabled Blood support."); CustomBlood = aBlood.getFluid(); @@ -435,7 +435,7 @@ public class AgriculturalChem extends ItemPackage { ItemStack aBone; ItemStack aMeat; ItemStack aEmptyCells = CI.emptyCells(2); - ItemStack aInputCells = ItemUtils.getItemStackOfAmountFromOreDict("cellRawWaste", 2); + ItemStack aInputCells = ItemUtils.getItemStackOfAmountFromOreDict("cellRawAnimalWaste", 2); FluidStack aOutput = FluidUtils.getFluidStack(FertileManureSlurry, 1000); for (FluidStack aBloodStack : mBloodFluids) { diff --git a/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java b/src/main/java/gtPlusPlus/core/item/chemistry/CoalTar.java index badd318414..ca9053dacb 100644 --- a/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/CoalTar.java @@ -53,27 +53,35 @@ public class CoalTar extends ItemPackage { FluidStack bioEth1 = FluidUtils.getFluidStack("fluid.bioethanol", 2000); FluidStack bioEth2 = FluidUtils.getFluidStack("bioethanol", 2000); - if (bioEth1 != null){ + if (bioEth1 != null){ CORE.RA.addDehydratorRecipe( - ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 2), - bioEth1, + new ItemStack[] { + CI.getNumberedBioCircuit(17), + ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 1) + }, + bioEth1, + FluidUtils.getWater(1000), new ItemStack[]{ - ItemUtils.getItemStackOfAmountFromOreDict("cellWater", 1), ItemUtils.getItemStackOfAmountFromOreDict("cellEthylene", 1) - }, - 120*20, + }, + new int[] {10000}, + 120 * 20, 80); } if (bioEth2 != null){ CORE.RA.addDehydratorRecipe( - ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 2), - bioEth2, + new ItemStack[] { + CI.getNumberedBioCircuit(18), + ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 1) + }, + bioEth2, + FluidUtils.getWater(1000), new ItemStack[]{ - ItemUtils.getItemStackOfAmountFromOreDict("cellWater", 1), ItemUtils.getItemStackOfAmountFromOreDict("cellEthylene", 1) - }, - 120*20, + }, + new int[] {10000}, + 120 * 20, 80); } } @@ -241,16 +249,19 @@ public class CoalTar extends ItemPackage { } - private static void recipePhthalicAcidToPhthalicAnhydride() { + private static void recipePhthalicAcidToPhthalicAnhydride() { CORE.RA.addDehydratorRecipe( - ItemUtils.getGregtechCircuit(6), - FluidUtils.getFluidStack("fluid.phthalicacid", 144), + new ItemStack[] { + CI.getNumberedBioCircuit(15) + }, + FluidUtils.getFluidStack("fluid.phthalicacid", 144), + null, new ItemStack[]{ ItemUtils.getItemStackOfAmountFromOreDict("dustPhthalicAnhydride", 1) - }, - 60*20, + }, + new int[] {10000}, + 60 * 20, 120); - } @Override diff --git a/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java b/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java index f61a2096b7..43bd669829 100644 --- a/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java @@ -36,9 +36,9 @@ public class GenericChem extends ItemPackage { * Materials */ - public static final Material BAKELITE = new Material("Bakelite", MaterialState.SOLID, TextureSet.SET_DULL, new short[]{90, 140, 140}, 120, 240, 23, 24, true, null, 0);//Not a GT Inherited Material - public static final Material NYLON = new Material("Nylon", MaterialState.SOLID, TextureSet.SET_SHINY, new short[]{45, 45, 45}, 300, 600, 44, 48, true, null, 0);//Not a GT Inherited Material - public static final Material CARBYNE = new Material("Carbyne", MaterialState.SOLID, TextureSet.SET_DULL, new short[]{25, 25, 25}, 2500, 5000, 63, 52, true, null, 0);//Not a GT Inherited Material + //public static final Material BAKELITE = new Material("Bakelite", MaterialState.SOLID, TextureSet.SET_DULL, new short[]{90, 140, 140}, 120, 240, 23, 24, true, null, 0);//Not a GT Inherited Material + //public static final Material NYLON = new Material("Nylon", MaterialState.SOLID, TextureSet.SET_SHINY, new short[]{45, 45, 45}, 300, 600, 44, 48, true, null, 0);//Not a GT Inherited Material + //public static final Material CARBYNE = new Material("Carbyne", MaterialState.SOLID, TextureSet.SET_DULL, new short[]{25, 25, 25}, 2500, 5000, 63, 52, true, null, 0);//Not a GT Inherited Material //Refined PTFE @@ -57,13 +57,7 @@ public class GenericChem extends ItemPackage { new MaterialStack(NONMATERIAL.PLASTIC, 15), new MaterialStack(ELEMENT.getInstance().CARBON, 5), new MaterialStack(ELEMENT.getInstance().SODIUM, 5) - });// Not a GT - // Inherited - // Material - - //public static final Material HYPOGEN = new Material("Hypogen", MaterialState.SOLID, TextureSets.NUCLEAR.get(), new short[]{220, 120, 75}, 12255, 19377, 240, 251, true, "Hy⚶", 0);//Not a GT Inherited Material - //public static final Material HYPOGEN = new Material("Hypogen", MaterialState.SOLID, TextureSets.NUCLEAR.get(), new short[]{220, 120, 75}, 12255, 19377, 240, 251, true, "Hy⚶", 0);//Not a GT Inherited Material - //public static final Material Nylon = new Material(); + }); /** * Fluids @@ -109,6 +103,7 @@ public class GenericChem extends ItemPackage { public static ItemStack mPurpleCatalyst; public static ItemStack mBrownCatalyst; public static ItemStack mPinkCatalyst; + public static ItemStack mFormaldehydeCatalyst; public static ItemStack mMillingBallAlumina; public static ItemStack mMillingBallSoapstone; @@ -123,8 +118,8 @@ public class GenericChem extends ItemPackage { @Override public void items() { PhenolicResins = ItemUtils.generateSpecialUseDusts("phenolicresins", "Phenolic Resin", "HOC6H4CH2OH", Utils.rgbtoHexValue(80, 40, 40))[0]; - MaterialGenerator.generate(BAKELITE, false); - MaterialGenerator.generate(NYLON, false); + //MaterialGenerator.generate(BAKELITE, false); + //MaterialGenerator.generate(NYLON, false); MaterialGenerator.generate(TEFLON, false); mGenericChemItem1 = new ItemGenericChemBase(); @@ -157,6 +152,7 @@ public class GenericChem extends ItemPackage { mSodiumEthylXanthate = ItemUtils.simpleMetaStack(mGenericChemItem1, 10, 1); mPotassiumEthylXanthate = ItemUtils.simpleMetaStack(mGenericChemItem1, 11, 1); mPotassiumHydroxide = ItemUtils.simpleMetaStack(mGenericChemItem1, 12, 1); + mFormaldehydeCatalyst = ItemUtils.simpleMetaStack(mGenericChemItem1, 13, 1); } @@ -175,6 +171,7 @@ public class GenericChem extends ItemPackage { ItemUtils.addItemToOreDictionary(mSodiumEthylXanthate, "dustSodiumEthylXanthate"); ItemUtils.addItemToOreDictionary(mPotassiumEthylXanthate, "dustPotassiumEthylXanthate"); ItemUtils.addItemToOreDictionary(mPotassiumHydroxide, "dustPotassiumHydroxide"); + ItemUtils.addItemToOreDictionary(mFormaldehydeCatalyst, "catalystFormaldehyde"); } @@ -295,6 +292,7 @@ public class GenericChem extends ItemPackage { recipeCatalystPurple(); recipeCatalystBrown(); recipeCatalystPink(); + recipeCatalystFormaldehyde(); recipeGrindingBallAlumina(); recipeGrindingBallSoapstone(); @@ -351,7 +349,7 @@ public class GenericChem extends ItemPackage { }, new FluidStack[] { - ELEMENT.getInstance().HYDROGEN.getFluid(2000) + ELEMENT.getInstance().HYDROGEN.getFluidStack(2000) }, 20 *20, 120, @@ -433,8 +431,8 @@ public class GenericChem extends ItemPackage { private void recipeHydricSulfur() { ItemStack aCellHydricSulfide = ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogenSulfide", 1); - GT_Values.RA.addChemicalRecipe( ELEMENT.getInstance().SULFUR.getDust(1), GT_Utility.getIntegratedCircuit(1), ELEMENT.getInstance().HYDROGEN.getFluid(2000), FluidUtils.getFluidStack(Hydrogen_Sulfide, 3000), GT_Values.NI, 60, 8); - GT_Values.RA.addChemicalRecipeForBasicMachineOnly(ELEMENT.getInstance().SULFUR.getDust(1), CI.emptyCells(3), ELEMENT.getInstance().HYDROGEN.getFluid(2000), GT_Values.NF, ItemUtils.getSimpleStack(aCellHydricSulfide, 3), GT_Values.NI, 60, 8); + GT_Values.RA.addChemicalRecipe( ELEMENT.getInstance().SULFUR.getDust(1), GT_Utility.getIntegratedCircuit(1), ELEMENT.getInstance().HYDROGEN.getFluidStack(2000), FluidUtils.getFluidStack(Hydrogen_Sulfide, 3000), GT_Values.NI, 60, 8); + GT_Values.RA.addChemicalRecipeForBasicMachineOnly(ELEMENT.getInstance().SULFUR.getDust(1), CI.emptyCells(3), ELEMENT.getInstance().HYDROGEN.getFluidStack(2000), GT_Values.NF, ItemUtils.getSimpleStack(aCellHydricSulfide, 3), GT_Values.NI, 60, 8); } @@ -516,9 +514,9 @@ public class GenericChem extends ItemPackage { private void recipeNitrogenDioxide() { ItemStack aNitricOxideCell = ItemUtils.getItemStackOfAmountFromOreDict("cellNitricOxide", 1); ItemStack aNitrogenDioxideCell = ItemUtils.getItemStackOfAmountFromOreDict("cellNitrogenDioxide", 1); - GT_Values.RA.addChemicalRecipe( ItemUtils.getSimpleStack(aNitricOxideCell, 2), GT_Utility.getIntegratedCircuit(1), ELEMENT.getInstance().OXYGEN.getFluid(1000), FluidUtils.getFluidStack(Nitrogen_Dioxide, 3000), CI.emptyCells(2), 160); + GT_Values.RA.addChemicalRecipe( ItemUtils.getSimpleStack(aNitricOxideCell, 2), GT_Utility.getIntegratedCircuit(1), ELEMENT.getInstance().OXYGEN.getFluidStack(1000), FluidUtils.getFluidStack(Nitrogen_Dioxide, 3000), CI.emptyCells(2), 160); GT_Values.RA.addChemicalRecipe( ELEMENT.getInstance().OXYGEN.getCell(1), GT_Utility.getIntegratedCircuit(1), FluidUtils.getFluidStack(Nitric_Oxide, 2000), FluidUtils.getFluidStack(Nitrogen_Dioxide, 3000), CI.emptyCells(1), 160); - GT_Values.RA.addChemicalRecipeForBasicMachineOnly(ItemUtils.getSimpleStack(aNitricOxideCell, 2), CI.emptyCells(1), ELEMENT.getInstance().OXYGEN.getFluid(1000), GT_Values.NF, ItemUtils.getSimpleStack(aNitrogenDioxideCell, 3), GT_Values.NI, 160, 30); + GT_Values.RA.addChemicalRecipeForBasicMachineOnly(ItemUtils.getSimpleStack(aNitricOxideCell, 2), CI.emptyCells(1), ELEMENT.getInstance().OXYGEN.getFluidStack(1000), GT_Values.NF, ItemUtils.getSimpleStack(aNitrogenDioxideCell, 3), GT_Values.NI, 160, 30); GT_Values.RA.addChemicalRecipeForBasicMachineOnly(ELEMENT.getInstance().OXYGEN.getCell(1), CI.emptyCells(2), FluidUtils.getFluidStack(Nitric_Oxide, 2000), GT_Values.NF, ItemUtils.getSimpleStack(aNitrogenDioxideCell, 3), GT_Values.NI, 160, 30); GT_Values.RA.addChemicalRecipeForBasicMachineOnly(ItemUtils.getSimpleStack(aNitricOxideCell, 2), ELEMENT.getInstance().OXYGEN.getCell(1), GT_Values.NF, GT_Values.NF, ItemUtils.getSimpleStack(aNitrogenDioxideCell, 3), GT_Values.NI, 160, 30); } @@ -527,16 +525,16 @@ public class GenericChem extends ItemPackage { private void recipeNitricOxide() { ItemStack aWaterCell = ItemUtils.getItemStackOfAmountFromOreDict("cellWater", 1); ItemStack aNitricOxideCell = ItemUtils.getItemStackOfAmountFromOreDict("cellNitricOxide", 1); - GT_Values.RA.addChemicalRecipeForBasicMachineOnly(MISC_MATERIALS.AMMONIA.getCell(8), CI.emptyCells(1), ELEMENT.getInstance().OXYGEN.getFluid(5000), FluidUtils.getFluidStack(Nitric_Oxide, 4000), ItemUtils.getSimpleStack(aWaterCell, 9), GT_Values.NI, 160, 30); - GT_Values.RA.addChemicalRecipeForBasicMachineOnly(ELEMENT.getInstance().OXYGEN.getCell(5), CI.emptyCells(4), MISC_MATERIALS.AMMONIA.getFluid(8000), FluidUtils.getFluidStack(Nitric_Oxide, 4000), ItemUtils.getSimpleStack(aWaterCell, 9), GT_Values.NI, 160, 30); - GT_Values.RA.addChemicalRecipe( MISC_MATERIALS.AMMONIA.getCell(8), GT_Utility.getIntegratedCircuit(11), ELEMENT.getInstance().OXYGEN.getFluid(5000), FluidUtils.getWater(9000), ItemUtils.getSimpleStack(aNitricOxideCell, 4), CI.emptyCells(4), 160); - GT_Values.RA.addChemicalRecipe( ELEMENT.getInstance().OXYGEN.getCell(5), GT_Utility.getIntegratedCircuit(11), MISC_MATERIALS.AMMONIA.getFluid(8000), FluidUtils.getWater(9000), ItemUtils.getSimpleStack(aNitricOxideCell, 4), CI.emptyCells(1), 160); - GT_Values.RA.addChemicalRecipe( MISC_MATERIALS.AMMONIA.getCell(8), GT_Utility.getIntegratedCircuit(2), ELEMENT.getInstance().OXYGEN.getFluid(5000), FluidUtils.getFluidStack(Nitric_Oxide, 4000), CI.emptyCells(8), 320); - GT_Values.RA.addChemicalRecipe( ELEMENT.getInstance().OXYGEN.getCell(5), GT_Utility.getIntegratedCircuit(2), MISC_MATERIALS.AMMONIA.getFluid(8000), FluidUtils.getFluidStack(Nitric_Oxide, 4000), CI.emptyCells(5), 320); - GT_Values.RA.addChemicalRecipe( MISC_MATERIALS.AMMONIA.getCell(8), GT_Utility.getIntegratedCircuit(12), ELEMENT.getInstance().OXYGEN.getFluid(5000), GT_Values.NF, ItemUtils.getSimpleStack(aNitricOxideCell, 4), CI.emptyCells(4), 160); - GT_Values.RA.addChemicalRecipe( ELEMENT.getInstance().OXYGEN.getCell(5), GT_Utility.getIntegratedCircuit(12), MISC_MATERIALS.AMMONIA.getFluid(8000), GT_Values.NF, ItemUtils.getSimpleStack(aNitricOxideCell, 4), CI.emptyCells(1), 160); + GT_Values.RA.addChemicalRecipeForBasicMachineOnly(MISC_MATERIALS.AMMONIA.getCell(8), CI.emptyCells(1), ELEMENT.getInstance().OXYGEN.getFluidStack(5000), FluidUtils.getFluidStack(Nitric_Oxide, 4000), ItemUtils.getSimpleStack(aWaterCell, 9), GT_Values.NI, 160, 30); + GT_Values.RA.addChemicalRecipeForBasicMachineOnly(ELEMENT.getInstance().OXYGEN.getCell(5), CI.emptyCells(4), MISC_MATERIALS.AMMONIA.getFluidStack(8000), FluidUtils.getFluidStack(Nitric_Oxide, 4000), ItemUtils.getSimpleStack(aWaterCell, 9), GT_Values.NI, 160, 30); + GT_Values.RA.addChemicalRecipe( MISC_MATERIALS.AMMONIA.getCell(8), GT_Utility.getIntegratedCircuit(11), ELEMENT.getInstance().OXYGEN.getFluidStack(5000), FluidUtils.getWater(9000), ItemUtils.getSimpleStack(aNitricOxideCell, 4), CI.emptyCells(4), 160); + GT_Values.RA.addChemicalRecipe( ELEMENT.getInstance().OXYGEN.getCell(5), GT_Utility.getIntegratedCircuit(11), MISC_MATERIALS.AMMONIA.getFluidStack(8000), FluidUtils.getWater(9000), ItemUtils.getSimpleStack(aNitricOxideCell, 4), CI.emptyCells(1), 160); + GT_Values.RA.addChemicalRecipe( MISC_MATERIALS.AMMONIA.getCell(8), GT_Utility.getIntegratedCircuit(2), ELEMENT.getInstance().OXYGEN.getFluidStack(5000), FluidUtils.getFluidStack(Nitric_Oxide, 4000), CI.emptyCells(8), 320); + GT_Values.RA.addChemicalRecipe( ELEMENT.getInstance().OXYGEN.getCell(5), GT_Utility.getIntegratedCircuit(2), MISC_MATERIALS.AMMONIA.getFluidStack(8000), FluidUtils.getFluidStack(Nitric_Oxide, 4000), CI.emptyCells(5), 320); + GT_Values.RA.addChemicalRecipe( MISC_MATERIALS.AMMONIA.getCell(8), GT_Utility.getIntegratedCircuit(12), ELEMENT.getInstance().OXYGEN.getFluidStack(5000), GT_Values.NF, ItemUtils.getSimpleStack(aNitricOxideCell, 4), CI.emptyCells(4), 160); + GT_Values.RA.addChemicalRecipe( ELEMENT.getInstance().OXYGEN.getCell(5), GT_Utility.getIntegratedCircuit(12), MISC_MATERIALS.AMMONIA.getFluidStack(8000), GT_Values.NF, ItemUtils.getSimpleStack(aNitricOxideCell, 4), CI.emptyCells(1), 160); GT_Values.RA.addChemicalRecipeForBasicMachineOnly(MISC_MATERIALS.AMMONIA.getCell(8), ELEMENT.getInstance().OXYGEN.getCell(5), GT_Values.NF, GT_Values.NF, ItemUtils.getSimpleStack(aNitricOxideCell, 4), ItemUtils.getSimpleStack(aWaterCell, 9), 160, 30); - GT_Values.RA.addMultiblockChemicalRecipe(new ItemStack[]{GT_Utility.getIntegratedCircuit(1)}, new FluidStack[]{MISC_MATERIALS.AMMONIA.getFluid(8000), ELEMENT.getInstance().OXYGEN.getFluid(5000)}, new FluidStack[]{FluidUtils.getFluidStack(Nitric_Oxide, 4000), FluidUtils.getWater(9000)}, null, 160, 30); + GT_Values.RA.addMultiblockChemicalRecipe(new ItemStack[]{GT_Utility.getIntegratedCircuit(1)}, new FluidStack[]{MISC_MATERIALS.AMMONIA.getFluidStack(8000), ELEMENT.getInstance().OXYGEN.getFluidStack(5000)}, new FluidStack[]{FluidUtils.getFluidStack(Nitric_Oxide, 4000), FluidUtils.getWater(9000)}, null, 160, 30); } @@ -547,7 +545,7 @@ public class GenericChem extends ItemPackage { CORE.RA.addChemicalRecipe( ELEMENT.getInstance().CHLORINE.getCell(1), GT_Utility.getIntegratedCircuit(1), - ELEMENT.getInstance().HYDROGEN.getFluid(1000), + ELEMENT.getInstance().HYDROGEN.getFluidStack(1000), FluidUtils.getFluidStack(HydrochloricAcid, 2000), CI.emptyCells(1), 60, @@ -556,7 +554,7 @@ public class GenericChem extends ItemPackage { CORE.RA.addChemicalRecipe( ELEMENT.getInstance().HYDROGEN.getCell(1), GT_Utility.getIntegratedCircuit(1), - ELEMENT.getInstance().CHLORINE.getFluid(1000), + ELEMENT.getInstance().CHLORINE.getFluidStack(1000), FluidUtils.getFluidStack(HydrochloricAcid, 2000), CI.emptyCells(1), 60, @@ -566,7 +564,7 @@ public class GenericChem extends ItemPackage { CI.emptyCells(1), GT_Utility.getIntegratedCircuit(1), FluidUtils.getFluidStack(HydrochloricAcid, 2000), - ELEMENT.getInstance().CHLORINE.getFluid(1000), + ELEMENT.getInstance().CHLORINE.getFluidStack(1000), ELEMENT.getInstance().HYDROGEN.getCell(1), GT_Values.NI, GT_Values.NI, @@ -581,7 +579,7 @@ public class GenericChem extends ItemPackage { CI.emptyCells(1), GT_Utility.getIntegratedCircuit(11), FluidUtils.getFluidStack(HydrochloricAcid, 2000), - ELEMENT.getInstance().HYDROGEN.getFluid(1000), + ELEMENT.getInstance().HYDROGEN.getFluidStack(1000), ELEMENT.getInstance().CHLORINE.getCell(1), GT_Values.NI, GT_Values.NI, @@ -779,6 +777,20 @@ public class GenericChem extends ItemPackage { 2000); } + + private void recipeCatalystFormaldehyde() { + // Assembly Recipe + CORE.RA.addSixSlotAssemblingRecipe(new ItemStack[] { + getTierThreeChip(), + CI.getEmptyCatalyst(4), + ItemUtils.getSimpleStack(RocketFuels.Formaldehyde_Catalyst_Dust, 8) + }, + GT_Values.NF, + ItemUtils.getSimpleStack(mFormaldehydeCatalyst, 4), + 30 * 20, + 240); + + } private void recipeCadaverineAndPutrescine() { diff --git a/src/Java/gtPlusPlus/core/item/chemistry/IonParticles.java b/src/main/java/gtPlusPlus/core/item/chemistry/IonParticles.java index e08a509436..e08a509436 100644 --- a/src/Java/gtPlusPlus/core/item/chemistry/IonParticles.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/IonParticles.java diff --git a/src/Java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java b/src/main/java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java index 8c6e66fcb8..8dd2cd1187 100644 --- a/src/Java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java @@ -42,6 +42,7 @@ public class MilledOreProcessing extends ItemPackage { public static Fluid GrossularFlotationFroth; public static Fluid AlmandineFlotationFroth; public static Fluid PyropeFlotationFroth; + public static Fluid MonaziteFlotationFroth; public static Fluid PineOil; @@ -81,7 +82,10 @@ public class MilledOreProcessing extends ItemPackage { public static Item milledAlmandine; // Magnesium, Manganese, Borax, Rhenium - public static Item milledPyrope; + public static Item milledPyrope; + + // Erbium, Lanthanum, Praseodymium, Europium + public static Item milledMonazite; @Override @@ -98,6 +102,7 @@ public class MilledOreProcessing extends ItemPackage { milledGrossular = BaseItemMilledOre.generate(Materials.Grossular, MaterialUtils.getVoltageForTier(6)); milledAlmandine = BaseItemMilledOre.generate(Materials.Almandine, MaterialUtils.getVoltageForTier(6)); milledPyrope = BaseItemMilledOre.generate(Materials.Pyrope, MaterialUtils.getVoltageForTier(4)); + milledMonazite = BaseItemMilledOre.generate(Materials.Monazite, MaterialUtils.getVoltageForTier(7)); } @@ -130,6 +135,8 @@ public class MilledOreProcessing extends ItemPackage { AlmandineFlotationFroth = FluidUtils.generateFluidNoPrefix("froth.almandineflotation", "Almandine Froth", 32 + 175, new short[] { aAlmandineFrothRGB[0], aAlmandineFrothRGB[1], aAlmandineFrothRGB[2], 100 }, true); short[] aPyropeFrothRGB = Materials.Pyrope.mRGBa; PyropeFlotationFroth = FluidUtils.generateFluidNoPrefix("froth.pyropeflotation", "Pyrope Froth", 32 + 175, new short[] { aPyropeFrothRGB[0], aPyropeFrothRGB[1], aPyropeFrothRGB[2], 100 }, true); + short[] aMonaziteFrothRGB = Materials.Monazite.mRGBa; + MonaziteFlotationFroth = FluidUtils.generateFluidNoPrefix("froth.Monaziteflotation", "Monazite Froth", 32 + 175, new short[] { aMonaziteFrothRGB[0], aMonaziteFrothRGB[1], aMonaziteFrothRGB[2], 100 }, true); PineOil = FluidUtils.generateFluidNoPrefix("pineoil", "Pine Oil", 32 + 175, new short[] { 250, 200, 60, 100 }, true); @@ -233,6 +240,14 @@ public class MilledOreProcessing extends ItemPackage { MaterialUtils.generateMaterialFromGtENUM(Materials.Borax), 60, ELEMENT.getInstance().RHENIUM, 20 ); + //milledMonazite TODO + registerOreDataForMilledType( + MonaziteFlotationFroth, + ELEMENT.getInstance().ERBIUM, 64, + ELEMENT.getInstance().LANTHANUM, 32, + ELEMENT.getInstance().LUTETIUM, 16, + ELEMENT.getInstance().EUROPIUM, 8 + ); } @@ -409,6 +424,21 @@ public class MilledOreProcessing extends ItemPackage { 20 * 120, MaterialUtils.getVoltageForTier(4), 3500); + CORE.RA.addVacuumFurnaceRecipe( + new ItemStack[] { + CI.getNumberedCircuit(aCircuitID++) + }, + new FluidStack[] { + FluidUtils.getFluidStack(MonaziteFlotationFroth, 4000) + }, + getOutputsFromMap(MonaziteFlotationFroth), + new FluidStack[] { + FluidUtils.getFluidStack(AgriculturalChem.RedMud, 2000), + FluidUtils.getWater(2000) + }, + 20 * 120, + MaterialUtils.getVoltageForTier(7), + 7500); } @@ -559,6 +589,20 @@ public class MilledOreProcessing extends ItemPackage { MaterialUtils.getVoltageForTier(4) ); + // Monazite + CORE.RA.addFlotationRecipe( + Materials.Monazite, + ItemUtils.getSimpleStack(GenericChem.mPotassiumEthylXanthate, 1), + new FluidStack[] { + FluidUtils.getFluidStack(PineOil, 30000), + }, + new FluidStack[] { + FluidUtils.getFluidStack(MonaziteFlotationFroth, 1000) + }, + 20 * 1200, + MaterialUtils.getVoltageForTier(6) + ); + } private void addPineOilExtraction() { diff --git a/src/Java/gtPlusPlus/core/item/chemistry/NuclearChem.java b/src/main/java/gtPlusPlus/core/item/chemistry/NuclearChem.java index 25beb6d9b5..f112b0d2a5 100644 --- a/src/Java/gtPlusPlus/core/item/chemistry/NuclearChem.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/NuclearChem.java @@ -1,14 +1,15 @@ package gtPlusPlus.core.item.chemistry; -import net.minecraft.init.Items; - -import gregtech.api.enums.GT_Values; import gtPlusPlus.api.objects.minecraft.ItemPackage; import gtPlusPlus.core.item.ModItems; +import gtPlusPlus.core.item.chemistry.general.ItemGenericChemBase; +import gtPlusPlus.core.item.chemistry.general.ItemNuclearChemBase; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; public class NuclearChem extends ItemPackage { @@ -17,25 +18,44 @@ public class NuclearChem extends ItemPackage { public static Fluid Burnt_LiFBeF2ZrF4UF4; public static Fluid Burnt_LiFBeF2ZrF4U235; + + public static Fluid Impure_LiFBeF2; + public static Fluid GeneticMutagen; private static boolean generateMutagenRecipe = false; + + public static ItemNuclearChemBase mNuclearChemItem1; + + public static ItemStack mResidueUranium; + public static ItemStack mResiduePlutonium; + public static ItemStack mResidueFluorides; + public static ItemStack mResidueNobles; @Override - public String errorMessage() { - return "bad Nuclear Chemistry Recipes."; + public void items() { + + mNuclearChemItem1 = new ItemNuclearChemBase(); + registerItemStacks(); + registerOreDict(); } - @Override - public boolean generateRecipes() { - if (generateMutagenRecipe) { - chemReator_CreateMutagen(); - } - chemReactor_MutagenWithEggs(); - return true; + + public void registerItemStacks() { + + mResidueUranium = ItemUtils.simpleMetaStack(mNuclearChemItem1, 0, 1); + mResidueUranium = ItemUtils.simpleMetaStack(mNuclearChemItem1, 1, 1); + mResidueUranium = ItemUtils.simpleMetaStack(mNuclearChemItem1, 2, 1); + mResidueUranium = ItemUtils.simpleMetaStack(mNuclearChemItem1, 3, 1); + } - @Override - public void items() { + public void registerOreDict() { + + ItemUtils.addItemToOreDictionary(mResidueUranium, "dustResidueUranium"); + ItemUtils.addItemToOreDictionary(mResiduePlutonium, "dustResiduePlutonium"); + ItemUtils.addItemToOreDictionary(mResidueFluorides, "dustResidueFluoride"); + ItemUtils.addItemToOreDictionary(mResidueNobles, "dustResidueNoble"); + } @Override @@ -48,7 +68,7 @@ public class NuclearChem extends ItemPackage { Burnt_LiFBeF2ThF4UF4 = FluidUtils.generateFluidNonMolten("BurntLiFBeF2ThF4UF4", "Burnt LiFBeF2ThF4UF4 Salt", 545, new short[]{48, 175, 48, 100}, null, null); Burnt_LiFBeF2ZrF4UF4 = FluidUtils.generateFluidNonMolten("BurntLiFBeF2ZrF4UF4", "Burnt LiFBeF2ZrF4UF4 Salt", 520, new short[]{48, 168, 68, 100}, null, null); Burnt_LiFBeF2ZrF4U235 = FluidUtils.generateFluidNonMolten("BurntLiFBeF2ZrF4U235", "Burnt LiFBeF2ZrF4U235 Salt", 533, new short[]{68, 185, 48, 100}, null, null); - + Impure_LiFBeF2 = FluidUtils.generateFluidNonMolten("ImpureLiFBeF2", "Impure LiFBeF2 Salt", 533, new short[]{110, 75, 186, 100}, null, null); if (FluidUtils.getFluidStack("fluid.Mutagen", 1) == null) { GeneticMutagen = FluidUtils.generateFluidNonMolten("GeneticMutagen", "Genetic Mutagen", 12, new short[]{22, 148, 185, 100}, null, null); generateMutagenRecipe = true; @@ -57,6 +77,20 @@ public class NuclearChem extends ItemPackage { GeneticMutagen = FluidUtils.getFluidStack("fluid.Mutagen", 1).getFluid(); } } + + @Override + public String errorMessage() { + return "Bad Nuclear Chemistry Recipes."; + } + + @Override + public boolean generateRecipes() { + if (generateMutagenRecipe) { + chemReator_CreateMutagen(); + } + chemReactor_MutagenWithEggs(); + return true; + } private static void chemReator_CreateMutagen() { CORE.RA.addChemicalRecipe( diff --git a/src/Java/gtPlusPlus/core/item/chemistry/OilChem.java b/src/main/java/gtPlusPlus/core/item/chemistry/OilChem.java index 4406995d27..4406995d27 100644 --- a/src/Java/gtPlusPlus/core/item/chemistry/OilChem.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/OilChem.java diff --git a/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java b/src/main/java/gtPlusPlus/core/item/chemistry/RocketFuels.java index 66f20e0079..c9c5ca98f6 100644 --- a/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/RocketFuels.java @@ -54,7 +54,7 @@ public class RocketFuels extends ItemPackage { public static Fluid Monomethylhydrazine_Plus_Nitric_Acid; public static Item Ammonium_Nitrate_Dust; - public static Item Formaldehyde_Catalyst; + public static Item Formaldehyde_Catalyst_Dust; public static ItemStack Formaldehyde_Catalyst_Stack; public RocketFuels() { @@ -144,6 +144,29 @@ public class RocketFuels extends ItemPackage { MaterialUtils.getVoltageForTier(2), 1); + FluidStack aBartWorksHydrogenPeroxide = FluidUtils.getWildcardFluidStack("Hydrogen Peroxide", 2000); + if (aBartWorksHydrogenPeroxide != null) { + Logger.INFO("Found BW Hydrogen Peroxide, adding compat recipe."); + CORE.RA.addChemicalPlantRecipe( + new ItemStack[] { + CI.getNumberedCircuit(22) + }, + new FluidStack[] { + aBartWorksHydrogenPeroxide, + FluidUtils.getFluidStack("ammonia", 2000), + }, + new ItemStack[] { + + }, + new FluidStack[] { + FluidUtils.getFluidStack(Hydrazine, 4000), + + }, + 20 * 30, + MaterialUtils.getVoltageForTier(2), + 1); + } + } @@ -177,7 +200,7 @@ public class RocketFuels extends ItemPackage { } private static void createLOH() { - GT_Values.RA.addVacuumFreezerRecipe(ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogen", 1), ItemUtils.getItemStackOfAmountFromOreDict("cellLiquidhydrogen", 1), 20*16); + GT_Values.RA.addVacuumFreezerRecipe(ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogen", 1), ItemUtils.getItemStackOfAmountFromOreDict("cellLiquidHydrogen", 1), 20*16); CORE.RA.addAdvancedFreezerRecipe(new ItemStack[] {}, new FluidStack[] {FluidUtils.getFluidStack("hydrogen", 300)}, new FluidStack[] {FluidUtils.getFluidStack(Liquid_Hydrogen, 300)}, new ItemStack[] {}, new int[] {}, 20*4, 540, 0); } @@ -209,7 +232,9 @@ public class RocketFuels extends ItemPackage { new ItemStack[] {CI.getNumberedCircuit(8)}, FluidUtils.getFluidStack(Hydrated_Ammonium_Nitrate_Slurry, 8*144), FluidUtils.getWater(2000), - new ItemStack[] {ItemUtils.getSimpleStack(Ammonium_Nitrate_Dust, 8)}, + new ItemStack[] { + ItemUtils.getSimpleStack(Ammonium_Nitrate_Dust, 8) + }, new int[] {10000}, 90 * 20, 480); @@ -221,7 +246,7 @@ public class RocketFuels extends ItemPackage { CORE.RA.addChemicalPlantRecipe( new ItemStack[] { CI.getNumberedAdvancedCircuit(21), - ItemUtils.getSimpleStack(Formaldehyde_Catalyst, 0), + ItemUtils.getSimpleStack(GenericChem.mFormaldehydeCatalyst, 0), }, new FluidStack[] { FluidUtils.getFluidStack("oxygen", 16000), @@ -248,7 +273,7 @@ public class RocketFuels extends ItemPackage { null, null, null, - ItemUtils.getSimpleStack(Formaldehyde_Catalyst, 4), + ItemUtils.getSimpleStack(Formaldehyde_Catalyst_Dust, 4), 160, 30); @@ -259,7 +284,7 @@ public class RocketFuels extends ItemPackage { CORE.RA.addChemicalPlantRecipe( new ItemStack[] { CI.getNumberedAdvancedCircuit(21), - ItemUtils.getSimpleStack(Formaldehyde_Catalyst, 0), + ItemUtils.getSimpleStack(GenericChem.mFormaldehydeCatalyst, 0), }, new FluidStack[] { FluidUtils.getFluidStack("fluid.hydrazine", 2000), @@ -292,7 +317,7 @@ public class RocketFuels extends ItemPackage { new FluidStack[] {}, 0, 0, - 256)); //Fuel Value + 512)); //Fuel Value mRocketFuels.put(1, new GTPP_Recipe( true, @@ -304,7 +329,7 @@ public class RocketFuels extends ItemPackage { new FluidStack[] {}, 0, 0, - 512)); //Fuel Value + 1024)); //Fuel Value mRocketFuels.put(2, new GTPP_Recipe( true, @@ -316,7 +341,7 @@ public class RocketFuels extends ItemPackage { new FluidStack[] {}, 0, 0, - 768)); //Fuel Value + 2048)); //Fuel Value mRocketFuels.put(3, new GTPP_Recipe( true, @@ -328,7 +353,7 @@ public class RocketFuels extends ItemPackage { new FluidStack[] {}, 0, 0, - 1024)); //Fuel Value + 4196)); //Fuel Value //Add in default Diesel for the Buggy @@ -467,8 +492,8 @@ public class RocketFuels extends ItemPackage { @Override public void items() { - Formaldehyde_Catalyst = ItemUtils.generateSpecialUseDusts("FormaldehydeCatalyst", "Formaldehyde Catalyst", "Fe16V1", Utils.rgbtoHexValue(25, 5, 25))[0]; - Formaldehyde_Catalyst_Stack = ItemUtils.getSimpleStack(Formaldehyde_Catalyst); + Formaldehyde_Catalyst_Dust = ItemUtils.generateSpecialUseDusts("FormaldehydeCatalyst", "Formaldehyde Catalyst", "Fe16V1", Utils.rgbtoHexValue(25, 5, 25))[0]; + Formaldehyde_Catalyst_Stack = ItemUtils.getSimpleStack(Formaldehyde_Catalyst_Dust); } @Override diff --git a/src/Java/gtPlusPlus/core/item/chemistry/StandardBaseParticles.java b/src/main/java/gtPlusPlus/core/item/chemistry/StandardBaseParticles.java index 10eaaf0da9..10eaaf0da9 100644 --- a/src/Java/gtPlusPlus/core/item/chemistry/StandardBaseParticles.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/StandardBaseParticles.java diff --git a/src/Java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java b/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java index 9a00b49342..c763a1a434 100644 --- a/src/Java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java @@ -23,7 +23,7 @@ public class ItemGenericChemBase extends Item { final protected IIcon base[]; - final private int aMetaSize = 13; + final private int aMetaSize = 14; /* * 0 - Red Metal Catalyst //FeCu @@ -39,6 +39,7 @@ public class ItemGenericChemBase extends Item { * 10 - Sodium Ethyl Xanthate //CH3CH2ONa + CS2 → CH3CH2OCS2Na * 11 - Potassium Ethyl Xanthate //CH3CH2OH + CS2 + KOH → CH3CH2OCS2K + H2O * 12 - Potassium Hydroxide // KOH + * 13 - Formaldehyde Catalyst //Fe16V1 */ public ItemGenericChemBase() { diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemNuclearChemBase.java b/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemNuclearChemBase.java new file mode 100644 index 0000000000..cfd3fd6259 --- /dev/null +++ b/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemNuclearChemBase.java @@ -0,0 +1,152 @@ +package gtPlusPlus.core.item.chemistry.general; + +import java.util.List; + +import cpw.mods.fml.common.registry.GameRegistry; +import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.util.minecraft.ItemUtils; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.EnumRarity; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; + +public class ItemNuclearChemBase extends Item { + + final protected IIcon base[]; + + final private int aMetaSize = 4; + + /* + * 0 - Uranium Residue + * 1 - Plutonium Residue + * 2 - Fluoride Reside + * 3 - Noble Gas Residue + */ + + public ItemNuclearChemBase() { + this.setHasSubtypes(true); + this.setNoRepair(); + this.setMaxStackSize(64); + this.setMaxDamage(0); + base = new IIcon[aMetaSize]; + this.setUnlocalizedName("BasicNuclearChemItem"); + GameRegistry.registerItem(this, this.getUnlocalizedName()); + } + + @Override + public int getItemStackLimit(ItemStack stack) { + return super.getItemStackLimit(stack); + } + + @Override + public boolean isDamageable() { + return false; + } + + @Override + public boolean shouldRotateAroundWhenRendering() { + return super.shouldRotateAroundWhenRendering(); + } + + @Override + public void onUpdate(ItemStack p_77663_1_, World p_77663_2_, Entity p_77663_3_, int p_77663_4_, boolean p_77663_5_) { + super.onUpdate(p_77663_1_, p_77663_2_, p_77663_3_, p_77663_4_, p_77663_5_); + } + + @Override + public String getItemStackDisplayName(ItemStack aStack) { + return super.getItemStackDisplayName(aStack); + } + + @Override + public EnumRarity getRarity(ItemStack p_77613_1_) { + return EnumRarity.common; + } + + @Override + public boolean requiresMultipleRenderPasses() { + return false; + } + + @Override + public void getSubItems(Item aItem, CreativeTabs p_150895_2_, List aList) { + for (int i=0;i<aMetaSize;i++) { + aList.add(ItemUtils.simpleMetaStack(aItem, i, 1)); + } + } + + @Override + public boolean getIsRepairable(ItemStack p_82789_1_, ItemStack p_82789_2_) { + return false; + } + + @Override + public boolean isRepairable() { + return false; + } + + @Override + public boolean isBookEnchantable(ItemStack stack, ItemStack book) { + return false; + } + + @Override + public int getDisplayDamage(ItemStack stack) { + return stack.getItemDamage(); + } + + @Override + public int getItemEnchantability() { + return 0; + } + + @Override + public int getItemEnchantability(ItemStack stack) { + return 0; + } + + @Override + public void registerIcons(final IIconRegister u) { + for (int i=0;i<this.aMetaSize;i++) { + String aPath = CORE.MODID + ":" + "science/nuclear/MetaItem1/"+i; + this.base[i] = u.registerIcon(aPath); + } + } + + + @Override + public IIcon getIconFromDamageForRenderPass(final int damage, final int pass) { + return this.base[damage]; + } + + @Override + public IIcon getIconFromDamage(int damage) { + return this.base[damage]; + } + + @Override + public IIcon getIcon(ItemStack stack, int renderPass, EntityPlayer player, ItemStack usingItem, int useRemaining) { + return this.base[stack.getItemDamage()]; + } + + @Override + public IIcon getIcon(ItemStack stack, int pass) { + return this.base[stack.getItemDamage()]; + } + + @Override + public String getUnlocalizedName(ItemStack stack) { + return super.getUnlocalizedName() + "." + stack.getItemDamage(); + } + + @Override + public void addInformation(ItemStack aStack, EntityPlayer player, List list, boolean bool) { + super.addInformation(aStack, player, list, bool); + } + +} diff --git a/src/Java/gtPlusPlus/core/item/circuit/ItemAdvancedChip.java b/src/main/java/gtPlusPlus/core/item/circuit/ItemAdvancedChip.java index 17321a0c45..17321a0c45 100644 --- a/src/Java/gtPlusPlus/core/item/circuit/ItemAdvancedChip.java +++ b/src/main/java/gtPlusPlus/core/item/circuit/ItemAdvancedChip.java diff --git a/src/Java/gtPlusPlus/core/item/crafting/ItemDummyResearch.java b/src/main/java/gtPlusPlus/core/item/crafting/ItemDummyResearch.java index 3f8e31d8d2..d8ddb26675 100644 --- a/src/Java/gtPlusPlus/core/item/crafting/ItemDummyResearch.java +++ b/src/main/java/gtPlusPlus/core/item/crafting/ItemDummyResearch.java @@ -28,7 +28,8 @@ public class ItemDummyResearch extends ItemGenericToken { RESEARCH_6_BASIC_METALLURGY("Basic Metallurgy", "Information about material smelting"), RESEARCH_7_ADV_METALLURGY("Advanced Metallurgy", "Advanced Material Sciences!"), RESEARCH_8_TURBINE_AUTOMATION("Turbine Automation", "You really don't want to share this with anyone!"), - RESEARCH_9_CLOAKING("Cloaking Technologies", "Sneaking around like a mouse"); + RESEARCH_9_CLOAKING("Cloaking Technologies", "Sneaking around like a mouse"), + RESEARCH_10_SPARGING("Gas Sparging", "Blowing gas for results"); diff --git a/src/Java/gtPlusPlus/core/item/effects/RarityEffect.java b/src/main/java/gtPlusPlus/core/item/effects/RarityEffect.java index 7cfd64a2e7..7cfd64a2e7 100644 --- a/src/Java/gtPlusPlus/core/item/effects/RarityEffect.java +++ b/src/main/java/gtPlusPlus/core/item/effects/RarityEffect.java diff --git a/src/Java/gtPlusPlus/core/item/effects/RarityEpic.java b/src/main/java/gtPlusPlus/core/item/effects/RarityEpic.java index 74ee5ab12c..74ee5ab12c 100644 --- a/src/Java/gtPlusPlus/core/item/effects/RarityEpic.java +++ b/src/main/java/gtPlusPlus/core/item/effects/RarityEpic.java diff --git a/src/Java/gtPlusPlus/core/item/effects/RarityRare.java b/src/main/java/gtPlusPlus/core/item/effects/RarityRare.java index 60d5a681b9..60d5a681b9 100644 --- a/src/Java/gtPlusPlus/core/item/effects/RarityRare.java +++ b/src/main/java/gtPlusPlus/core/item/effects/RarityRare.java diff --git a/src/Java/gtPlusPlus/core/item/effects/RarityUncommon.java b/src/main/java/gtPlusPlus/core/item/effects/RarityUncommon.java index 1ce8eec5d8..1ce8eec5d8 100644 --- a/src/Java/gtPlusPlus/core/item/effects/RarityUncommon.java +++ b/src/main/java/gtPlusPlus/core/item/effects/RarityUncommon.java diff --git a/src/Java/gtPlusPlus/core/item/food/BaseItemMetaFood.java b/src/main/java/gtPlusPlus/core/item/food/BaseItemMetaFood.java index 94d5a8e80f..94d5a8e80f 100644 --- a/src/Java/gtPlusPlus/core/item/food/BaseItemMetaFood.java +++ b/src/main/java/gtPlusPlus/core/item/food/BaseItemMetaFood.java diff --git a/src/Java/gtPlusPlus/core/item/general/BaseItemGrindle.java b/src/main/java/gtPlusPlus/core/item/general/BaseItemGrindle.java index 0ff922d853..0ff922d853 100644 --- a/src/Java/gtPlusPlus/core/item/general/BaseItemGrindle.java +++ b/src/main/java/gtPlusPlus/core/item/general/BaseItemGrindle.java diff --git a/src/Java/gtPlusPlus/core/item/general/BedLocator_Base.java b/src/main/java/gtPlusPlus/core/item/general/BedLocator_Base.java index 5aa2e4ae9e..5aa2e4ae9e 100644 --- a/src/Java/gtPlusPlus/core/item/general/BedLocator_Base.java +++ b/src/main/java/gtPlusPlus/core/item/general/BedLocator_Base.java diff --git a/src/Java/gtPlusPlus/core/item/general/BufferCore.java b/src/main/java/gtPlusPlus/core/item/general/BufferCore.java index 9b00d3d034..9b00d3d034 100644 --- a/src/Java/gtPlusPlus/core/item/general/BufferCore.java +++ b/src/main/java/gtPlusPlus/core/item/general/BufferCore.java diff --git a/src/Java/gtPlusPlus/core/item/general/ItemAirFilter.java b/src/main/java/gtPlusPlus/core/item/general/ItemAirFilter.java index a354e63fe3..a354e63fe3 100644 --- a/src/Java/gtPlusPlus/core/item/general/ItemAirFilter.java +++ b/src/main/java/gtPlusPlus/core/item/general/ItemAirFilter.java diff --git a/src/Java/gtPlusPlus/core/item/general/ItemAreaClear.java b/src/main/java/gtPlusPlus/core/item/general/ItemAreaClear.java index 5be184b3db..5be184b3db 100644 --- a/src/Java/gtPlusPlus/core/item/general/ItemAreaClear.java +++ b/src/main/java/gtPlusPlus/core/item/general/ItemAreaClear.java diff --git a/src/Java/gtPlusPlus/core/item/general/ItemBasicFirestarter.java b/src/main/java/gtPlusPlus/core/item/general/ItemBasicFirestarter.java index ca6c5e8c8c..ca6c5e8c8c 100644 --- a/src/Java/gtPlusPlus/core/item/general/ItemBasicFirestarter.java +++ b/src/main/java/gtPlusPlus/core/item/general/ItemBasicFirestarter.java diff --git a/src/Java/gtPlusPlus/core/item/general/ItemBasicScrubberTurbine.java b/src/main/java/gtPlusPlus/core/item/general/ItemBasicScrubberTurbine.java index bd8159eb01..2b7b98640e 100644 --- a/src/Java/gtPlusPlus/core/item/general/ItemBasicScrubberTurbine.java +++ b/src/main/java/gtPlusPlus/core/item/general/ItemBasicScrubberTurbine.java @@ -42,7 +42,7 @@ public class ItemBasicScrubberTurbine extends Item { @Override public void getSubItems(Item item, CreativeTabs tab, List list) { - for (int i = 0; i < 2; i ++) { + for (int i = 0; i < 3; i ++) { list.add(new ItemStack(item, 1, i)); } } @@ -69,6 +69,9 @@ public class ItemBasicScrubberTurbine extends Item { if (meta == 1){ HEX_OxFFFFFF = Utils.rgbtoHexValue(255,128,0); } + if (meta == 2){ + HEX_OxFFFFFF = Utils.rgbtoHexValue(128,128,128); + } return HEX_OxFFFFFF; } @@ -111,10 +114,13 @@ public class ItemBasicScrubberTurbine extends Item { if (aStack != null) { int aMeta = aStack.getItemDamage(); if (aMeta == 0) { - return 2500; + return 2000; } if (aMeta == 1) { - return 5000; + return 4000; + } + if (aMeta == 2) { + return 6000; } } return 0; diff --git a/src/Java/gtPlusPlus/core/item/general/ItemBlueprint.java b/src/main/java/gtPlusPlus/core/item/general/ItemBlueprint.java index eded4e2585..eded4e2585 100644 --- a/src/Java/gtPlusPlus/core/item/general/ItemBlueprint.java +++ b/src/main/java/gtPlusPlus/core/item/general/ItemBlueprint.java diff --git a/src/Java/gtPlusPlus/core/item/general/ItemCloakingDevice.java b/src/main/java/gtPlusPlus/core/item/general/ItemCloakingDevice.java index b54fc56563..b54fc56563 100644 --- a/src/Java/gtPlusPlus/core/item/general/ItemCloakingDevice.java +++ b/src/main/java/gtPlusPlus/core/item/general/ItemCloakingDevice.java diff --git a/src/Java/gtPlusPlus/core/item/general/ItemControlCore.java b/src/main/java/gtPlusPlus/core/item/general/ItemControlCore.java index b74b7972be..b74b7972be 100644 --- a/src/Java/gtPlusPlus/core/item/general/ItemControlCore.java +++ b/src/main/java/gtPlusPlus/core/item/general/ItemControlCore.java diff --git a/src/Java/gtPlusPlus/core/item/general/ItemCreativeTab.java b/src/main/java/gtPlusPlus/core/item/general/ItemCreativeTab.java index c1a2655a03..c1a2655a03 100644 --- a/src/Java/gtPlusPlus/core/item/general/ItemCreativeTab.java +++ b/src/main/java/gtPlusPlus/core/item/general/ItemCreativeTab.java diff --git a/src/Java/gtPlusPlus/core/item/general/ItemEmpty.java b/src/main/java/gtPlusPlus/core/item/general/ItemEmpty.java index c832d28bbd..c832d28bbd 100644 --- a/src/Java/gtPlusPlus/core/item/general/ItemEmpty.java +++ b/src/main/java/gtPlusPlus/core/item/general/ItemEmpty.java diff --git a/src/Java/gtPlusPlus/core/item/general/ItemGemShards.java b/src/main/java/gtPlusPlus/core/item/general/ItemGemShards.java index 5181a32bc7..5181a32bc7 100644 --- a/src/Java/gtPlusPlus/core/item/general/ItemGemShards.java +++ b/src/main/java/gtPlusPlus/core/item/general/ItemGemShards.java diff --git a/src/Java/gtPlusPlus/core/item/general/ItemGenericToken.java b/src/main/java/gtPlusPlus/core/item/general/ItemGenericToken.java index 21d2c6e120..21d2c6e120 100644 --- a/src/Java/gtPlusPlus/core/item/general/ItemGenericToken.java +++ b/src/main/java/gtPlusPlus/core/item/general/ItemGenericToken.java diff --git a/src/Java/gtPlusPlus/core/item/general/ItemGiantEgg.java b/src/main/java/gtPlusPlus/core/item/general/ItemGiantEgg.java index b3338bb681..b3338bb681 100644 --- a/src/Java/gtPlusPlus/core/item/general/ItemGiantEgg.java +++ b/src/main/java/gtPlusPlus/core/item/general/ItemGiantEgg.java diff --git a/src/Java/gtPlusPlus/core/item/general/ItemHalfCompleteCasings.java b/src/main/java/gtPlusPlus/core/item/general/ItemHalfCompleteCasings.java index ad9abc8ab2..ad9abc8ab2 100644 --- a/src/Java/gtPlusPlus/core/item/general/ItemHalfCompleteCasings.java +++ b/src/main/java/gtPlusPlus/core/item/general/ItemHalfCompleteCasings.java diff --git a/src/Java/gtPlusPlus/core/item/general/ItemHealingDevice.java b/src/main/java/gtPlusPlus/core/item/general/ItemHealingDevice.java index 82bb29b5bf..db06af8297 100644 --- a/src/Java/gtPlusPlus/core/item/general/ItemHealingDevice.java +++ b/src/main/java/gtPlusPlus/core/item/general/ItemHealingDevice.java @@ -144,7 +144,7 @@ public class ItemHealingDevice extends Item implements IElectricItem, IElectricI list.add(EnumChatFormatting.GOLD + aEuInfo + EnumChatFormatting.GRAY); list.add(EnumChatFormatting.GRAY + aTier+": [" + EnumChatFormatting.YELLOW + this.getTier(stack) + EnumChatFormatting.GRAY + "] "+aInputLimit+": [" + EnumChatFormatting.YELLOW - + this.getTransferLimit(stack) + EnumChatFormatting.GRAY + aEUT); + + this.getTransferLimit(stack) + EnumChatFormatting.GRAY + aEUT+"]"); list.add(EnumChatFormatting.GRAY + aCurrentPower +": [" + EnumChatFormatting.YELLOW + (long) this.getCharge(stack) + EnumChatFormatting.GRAY + aEU +"] [" + EnumChatFormatting.YELLOW + MathUtils.findPercentage(this.getCharge(stack), this.getMaxCharge(stack)) + EnumChatFormatting.GRAY diff --git a/src/Java/gtPlusPlus/core/item/general/ItemLavaFilter.java b/src/main/java/gtPlusPlus/core/item/general/ItemLavaFilter.java index c34ad9e8d3..c34ad9e8d3 100644 --- a/src/Java/gtPlusPlus/core/item/general/ItemLavaFilter.java +++ b/src/main/java/gtPlusPlus/core/item/general/ItemLavaFilter.java diff --git a/src/Java/gtPlusPlus/core/item/general/ItemSlowBuildingRing.java b/src/main/java/gtPlusPlus/core/item/general/ItemSlowBuildingRing.java index fa008bf1a3..fa008bf1a3 100644 --- a/src/Java/gtPlusPlus/core/item/general/ItemSlowBuildingRing.java +++ b/src/main/java/gtPlusPlus/core/item/general/ItemSlowBuildingRing.java diff --git a/src/Java/gtPlusPlus/core/item/general/NuclearFuelRodBase.java b/src/main/java/gtPlusPlus/core/item/general/NuclearFuelRodBase.java index 9feea3c91a..9feea3c91a 100644 --- a/src/Java/gtPlusPlus/core/item/general/NuclearFuelRodBase.java +++ b/src/main/java/gtPlusPlus/core/item/general/NuclearFuelRodBase.java diff --git a/src/Java/gtPlusPlus/core/item/general/RF2EU_Battery.java b/src/main/java/gtPlusPlus/core/item/general/RF2EU_Battery.java index 5ff5b5a62b..5ff5b5a62b 100644 --- a/src/Java/gtPlusPlus/core/item/general/RF2EU_Battery.java +++ b/src/main/java/gtPlusPlus/core/item/general/RF2EU_Battery.java diff --git a/src/Java/gtPlusPlus/core/item/general/books/ItemBaseBook.java b/src/main/java/gtPlusPlus/core/item/general/books/ItemBaseBook.java index 9ac09b92e4..9ac09b92e4 100644 --- a/src/Java/gtPlusPlus/core/item/general/books/ItemBaseBook.java +++ b/src/main/java/gtPlusPlus/core/item/general/books/ItemBaseBook.java diff --git a/src/Java/gtPlusPlus/core/item/general/capture/ItemEntityCatcher.java b/src/main/java/gtPlusPlus/core/item/general/capture/ItemEntityCatcher.java index a95fab4b6c..a95fab4b6c 100644 --- a/src/Java/gtPlusPlus/core/item/general/capture/ItemEntityCatcher.java +++ b/src/main/java/gtPlusPlus/core/item/general/capture/ItemEntityCatcher.java diff --git a/src/Java/gtPlusPlus/core/item/general/chassis/ItemBoilerChassis.java b/src/main/java/gtPlusPlus/core/item/general/chassis/ItemBoilerChassis.java index 86c52cc048..86c52cc048 100644 --- a/src/Java/gtPlusPlus/core/item/general/chassis/ItemBoilerChassis.java +++ b/src/main/java/gtPlusPlus/core/item/general/chassis/ItemBoilerChassis.java diff --git a/src/Java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoil.java b/src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoil.java index be1fdfc491..be1fdfc491 100644 --- a/src/Java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoil.java +++ b/src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoil.java diff --git a/src/Java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoilWire.java b/src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoilWire.java index 99d4a139dd..99d4a139dd 100644 --- a/src/Java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoilWire.java +++ b/src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoilWire.java diff --git a/src/Java/gtPlusPlus/core/item/general/fuelrods/FuelRod_Base.java b/src/main/java/gtPlusPlus/core/item/general/fuelrods/FuelRod_Base.java index 628fba9291..628fba9291 100644 --- a/src/Java/gtPlusPlus/core/item/general/fuelrods/FuelRod_Base.java +++ b/src/main/java/gtPlusPlus/core/item/general/fuelrods/FuelRod_Base.java diff --git a/src/Java/gtPlusPlus/core/item/general/fuelrods/FuelRod_Thorium.java b/src/main/java/gtPlusPlus/core/item/general/fuelrods/FuelRod_Thorium.java index dbf1209b50..dbf1209b50 100644 --- a/src/Java/gtPlusPlus/core/item/general/fuelrods/FuelRod_Thorium.java +++ b/src/main/java/gtPlusPlus/core/item/general/fuelrods/FuelRod_Thorium.java diff --git a/src/Java/gtPlusPlus/core/item/general/rfchargingpack/ChargingPackBase.java b/src/main/java/gtPlusPlus/core/item/general/rfchargingpack/ChargingPackBase.java index 238e765384..238e765384 100644 --- a/src/Java/gtPlusPlus/core/item/general/rfchargingpack/ChargingPackBase.java +++ b/src/main/java/gtPlusPlus/core/item/general/rfchargingpack/ChargingPackBase.java diff --git a/src/Java/gtPlusPlus/core/item/general/spawn/ItemCustomSpawnEgg.java b/src/main/java/gtPlusPlus/core/item/general/spawn/ItemCustomSpawnEgg.java index 727b933fa7..727b933fa7 100644 --- a/src/Java/gtPlusPlus/core/item/general/spawn/ItemCustomSpawnEgg.java +++ b/src/main/java/gtPlusPlus/core/item/general/spawn/ItemCustomSpawnEgg.java diff --git a/src/Java/gtPlusPlus/core/item/general/throwables/ItemHydrofluoricAcidPotion.java b/src/main/java/gtPlusPlus/core/item/general/throwables/ItemHydrofluoricAcidPotion.java index 57cf8986fa..57cf8986fa 100644 --- a/src/Java/gtPlusPlus/core/item/general/throwables/ItemHydrofluoricAcidPotion.java +++ b/src/main/java/gtPlusPlus/core/item/general/throwables/ItemHydrofluoricAcidPotion.java diff --git a/src/Java/gtPlusPlus/core/item/general/throwables/ItemSulfuricAcidPotion.java b/src/main/java/gtPlusPlus/core/item/general/throwables/ItemSulfuricAcidPotion.java index 27b35e48d1..27b35e48d1 100644 --- a/src/Java/gtPlusPlus/core/item/general/throwables/ItemSulfuricAcidPotion.java +++ b/src/main/java/gtPlusPlus/core/item/general/throwables/ItemSulfuricAcidPotion.java diff --git a/src/Java/gtPlusPlus/core/item/general/throwables/ItemThrowableBomb.java b/src/main/java/gtPlusPlus/core/item/general/throwables/ItemThrowableBomb.java index e8f76ce64c..e8f76ce64c 100644 --- a/src/Java/gtPlusPlus/core/item/general/throwables/ItemThrowableBomb.java +++ b/src/main/java/gtPlusPlus/core/item/general/throwables/ItemThrowableBomb.java diff --git a/src/Java/gtPlusPlus/core/item/init/ItemsFoods.java b/src/main/java/gtPlusPlus/core/item/init/ItemsFoods.java index e5c403c503..e5c403c503 100644 --- a/src/Java/gtPlusPlus/core/item/init/ItemsFoods.java +++ b/src/main/java/gtPlusPlus/core/item/init/ItemsFoods.java diff --git a/src/Java/gtPlusPlus/core/item/init/ItemsMultiTools.java b/src/main/java/gtPlusPlus/core/item/init/ItemsMultiTools.java index 9f87408b56..9f87408b56 100644 --- a/src/Java/gtPlusPlus/core/item/init/ItemsMultiTools.java +++ b/src/main/java/gtPlusPlus/core/item/init/ItemsMultiTools.java diff --git a/src/Java/gtPlusPlus/core/item/materials/DustDecayable.java b/src/main/java/gtPlusPlus/core/item/materials/DustDecayable.java index d42ac85012..d42ac85012 100644 --- a/src/Java/gtPlusPlus/core/item/materials/DustDecayable.java +++ b/src/main/java/gtPlusPlus/core/item/materials/DustDecayable.java diff --git a/src/Java/gtPlusPlus/core/item/materials/MaterialHandler.java b/src/main/java/gtPlusPlus/core/item/materials/MaterialHandler.java index 40fc6539e6..40fc6539e6 100644 --- a/src/Java/gtPlusPlus/core/item/materials/MaterialHandler.java +++ b/src/main/java/gtPlusPlus/core/item/materials/MaterialHandler.java diff --git a/src/Java/gtPlusPlus/core/item/tool/misc/ConnectedBlockFinder.java b/src/main/java/gtPlusPlus/core/item/tool/misc/ConnectedBlockFinder.java index 555635741e..555635741e 100644 --- a/src/Java/gtPlusPlus/core/item/tool/misc/ConnectedBlockFinder.java +++ b/src/main/java/gtPlusPlus/core/item/tool/misc/ConnectedBlockFinder.java diff --git a/src/Java/gtPlusPlus/core/item/tool/misc/DebugScanner.java b/src/main/java/gtPlusPlus/core/item/tool/misc/DebugScanner.java index 0170df0dc7..0170df0dc7 100644 --- a/src/Java/gtPlusPlus/core/item/tool/misc/DebugScanner.java +++ b/src/main/java/gtPlusPlus/core/item/tool/misc/DebugScanner.java diff --git a/src/Java/gtPlusPlus/core/item/tool/misc/FakeGregtechTool.java b/src/main/java/gtPlusPlus/core/item/tool/misc/FakeGregtechTool.java index 47856b44c0..47856b44c0 100644 --- a/src/Java/gtPlusPlus/core/item/tool/misc/FakeGregtechTool.java +++ b/src/main/java/gtPlusPlus/core/item/tool/misc/FakeGregtechTool.java diff --git a/src/Java/gtPlusPlus/core/item/tool/misc/GregtechPump.java b/src/main/java/gtPlusPlus/core/item/tool/misc/GregtechPump.java index e43dc8546b..e43dc8546b 100644 --- a/src/Java/gtPlusPlus/core/item/tool/misc/GregtechPump.java +++ b/src/main/java/gtPlusPlus/core/item/tool/misc/GregtechPump.java diff --git a/src/Java/gtPlusPlus/core/item/tool/misc/SandstoneHammer.java b/src/main/java/gtPlusPlus/core/item/tool/misc/SandstoneHammer.java index 555fc0f23f..555fc0f23f 100644 --- a/src/Java/gtPlusPlus/core/item/tool/misc/SandstoneHammer.java +++ b/src/main/java/gtPlusPlus/core/item/tool/misc/SandstoneHammer.java diff --git a/src/Java/gtPlusPlus/core/item/tool/misc/box/AutoLunchBox.java b/src/main/java/gtPlusPlus/core/item/tool/misc/box/AutoLunchBox.java index baed16db03..baed16db03 100644 --- a/src/Java/gtPlusPlus/core/item/tool/misc/box/AutoLunchBox.java +++ b/src/main/java/gtPlusPlus/core/item/tool/misc/box/AutoLunchBox.java diff --git a/src/Java/gtPlusPlus/core/item/tool/misc/box/BaseBoxItem.java b/src/main/java/gtPlusPlus/core/item/tool/misc/box/BaseBoxItem.java index 10a3ae5804..10a3ae5804 100644 --- a/src/Java/gtPlusPlus/core/item/tool/misc/box/BaseBoxItem.java +++ b/src/main/java/gtPlusPlus/core/item/tool/misc/box/BaseBoxItem.java diff --git a/src/Java/gtPlusPlus/core/item/tool/misc/box/ContainerBoxBase.java b/src/main/java/gtPlusPlus/core/item/tool/misc/box/ContainerBoxBase.java index 035859c388..035859c388 100644 --- a/src/Java/gtPlusPlus/core/item/tool/misc/box/ContainerBoxBase.java +++ b/src/main/java/gtPlusPlus/core/item/tool/misc/box/ContainerBoxBase.java diff --git a/src/Java/gtPlusPlus/core/item/tool/misc/box/CustomBoxInventory.java b/src/main/java/gtPlusPlus/core/item/tool/misc/box/CustomBoxInventory.java index 0737e463d8..0737e463d8 100644 --- a/src/Java/gtPlusPlus/core/item/tool/misc/box/CustomBoxInventory.java +++ b/src/main/java/gtPlusPlus/core/item/tool/misc/box/CustomBoxInventory.java diff --git a/src/Java/gtPlusPlus/core/item/tool/misc/box/MagicToolBag.java b/src/main/java/gtPlusPlus/core/item/tool/misc/box/MagicToolBag.java index 65b884bd51..65b884bd51 100644 --- a/src/Java/gtPlusPlus/core/item/tool/misc/box/MagicToolBag.java +++ b/src/main/java/gtPlusPlus/core/item/tool/misc/box/MagicToolBag.java diff --git a/src/Java/gtPlusPlus/core/item/tool/misc/box/UniversalToolBox.java b/src/main/java/gtPlusPlus/core/item/tool/misc/box/UniversalToolBox.java index 92b1382e01..92b1382e01 100644 --- a/src/Java/gtPlusPlus/core/item/tool/misc/box/UniversalToolBox.java +++ b/src/main/java/gtPlusPlus/core/item/tool/misc/box/UniversalToolBox.java diff --git a/src/Java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java b/src/main/java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java index 2c2441064b..2c2441064b 100644 --- a/src/Java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java +++ b/src/main/java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java diff --git a/src/Java/gtPlusPlus/core/item/tool/staballoy/MultiSpadeBase.java b/src/main/java/gtPlusPlus/core/item/tool/staballoy/MultiSpadeBase.java index d01b400fab..d01b400fab 100644 --- a/src/Java/gtPlusPlus/core/item/tool/staballoy/MultiSpadeBase.java +++ b/src/main/java/gtPlusPlus/core/item/tool/staballoy/MultiSpadeBase.java diff --git a/src/Java/gtPlusPlus/core/item/tool/staballoy/StaballoyAxe.java b/src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoyAxe.java index 153a417d7b..153a417d7b 100644 --- a/src/Java/gtPlusPlus/core/item/tool/staballoy/StaballoyAxe.java +++ b/src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoyAxe.java diff --git a/src/Java/gtPlusPlus/core/item/tool/staballoy/StaballoyPickaxe.java b/src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoyPickaxe.java index 830c4994ba..830c4994ba 100644 --- a/src/Java/gtPlusPlus/core/item/tool/staballoy/StaballoyPickaxe.java +++ b/src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoyPickaxe.java diff --git a/src/Java/gtPlusPlus/core/item/tool/staballoy/StaballoySpade.java b/src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoySpade.java index 6265c9f0a3..6265c9f0a3 100644 --- a/src/Java/gtPlusPlus/core/item/tool/staballoy/StaballoySpade.java +++ b/src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoySpade.java diff --git a/src/Java/gtPlusPlus/core/item/wearable/WearableLoader.java b/src/main/java/gtPlusPlus/core/item/wearable/WearableLoader.java index 6912b4e771..6912b4e771 100644 --- a/src/Java/gtPlusPlus/core/item/wearable/WearableLoader.java +++ b/src/main/java/gtPlusPlus/core/item/wearable/WearableLoader.java diff --git a/src/Java/gtPlusPlus/core/item/wearable/armour/ArmourLoader.java b/src/main/java/gtPlusPlus/core/item/wearable/armour/ArmourLoader.java index 6918f2b048..6918f2b048 100644 --- a/src/Java/gtPlusPlus/core/item/wearable/armour/ArmourLoader.java +++ b/src/main/java/gtPlusPlus/core/item/wearable/armour/ArmourLoader.java diff --git a/src/Java/gtPlusPlus/core/item/wearable/armour/base/BaseArmour.java b/src/main/java/gtPlusPlus/core/item/wearable/armour/base/BaseArmour.java index 0c6a547d34..0c6a547d34 100644 --- a/src/Java/gtPlusPlus/core/item/wearable/armour/base/BaseArmour.java +++ b/src/main/java/gtPlusPlus/core/item/wearable/armour/base/BaseArmour.java diff --git a/src/Java/gtPlusPlus/core/item/wearable/armour/base/BaseArmourBoots.java b/src/main/java/gtPlusPlus/core/item/wearable/armour/base/BaseArmourBoots.java index 2ace8919d0..2ace8919d0 100644 --- a/src/Java/gtPlusPlus/core/item/wearable/armour/base/BaseArmourBoots.java +++ b/src/main/java/gtPlusPlus/core/item/wearable/armour/base/BaseArmourBoots.java diff --git a/src/Java/gtPlusPlus/core/item/wearable/armour/base/BaseArmourChest.java b/src/main/java/gtPlusPlus/core/item/wearable/armour/base/BaseArmourChest.java index 16899c4229..16899c4229 100644 --- a/src/Java/gtPlusPlus/core/item/wearable/armour/base/BaseArmourChest.java +++ b/src/main/java/gtPlusPlus/core/item/wearable/armour/base/BaseArmourChest.java diff --git a/src/Java/gtPlusPlus/core/item/wearable/armour/base/BaseArmourHelm.java b/src/main/java/gtPlusPlus/core/item/wearable/armour/base/BaseArmourHelm.java index c3676277eb..c3676277eb 100644 --- a/src/Java/gtPlusPlus/core/item/wearable/armour/base/BaseArmourHelm.java +++ b/src/main/java/gtPlusPlus/core/item/wearable/armour/base/BaseArmourHelm.java diff --git a/src/Java/gtPlusPlus/core/item/wearable/armour/base/BaseArmourLegs.java b/src/main/java/gtPlusPlus/core/item/wearable/armour/base/BaseArmourLegs.java index 9794a713ac..9794a713ac 100644 --- a/src/Java/gtPlusPlus/core/item/wearable/armour/base/BaseArmourLegs.java +++ b/src/main/java/gtPlusPlus/core/item/wearable/armour/base/BaseArmourLegs.java diff --git a/src/Java/gtPlusPlus/core/item/wearable/armour/hazmat/ArmourHazmat.java b/src/main/java/gtPlusPlus/core/item/wearable/armour/hazmat/ArmourHazmat.java index 9fd7bf7020..9fd7bf7020 100644 --- a/src/Java/gtPlusPlus/core/item/wearable/armour/hazmat/ArmourHazmat.java +++ b/src/main/java/gtPlusPlus/core/item/wearable/armour/hazmat/ArmourHazmat.java diff --git a/src/Java/gtPlusPlus/core/item/wearable/armour/tinfoil/ArmourTinFoilHat.java b/src/main/java/gtPlusPlus/core/item/wearable/armour/tinfoil/ArmourTinFoilHat.java index c1fe96efb5..c1fe96efb5 100644 --- a/src/Java/gtPlusPlus/core/item/wearable/armour/tinfoil/ArmourTinFoilHat.java +++ b/src/main/java/gtPlusPlus/core/item/wearable/armour/tinfoil/ArmourTinFoilHat.java diff --git a/src/Java/gtPlusPlus/core/item/wearable/base/BaseItemWearable.java b/src/main/java/gtPlusPlus/core/item/wearable/base/BaseItemWearable.java index f23079bc8b..f23079bc8b 100644 --- a/src/Java/gtPlusPlus/core/item/wearable/base/BaseItemWearable.java +++ b/src/main/java/gtPlusPlus/core/item/wearable/base/BaseItemWearable.java diff --git a/src/Java/gtPlusPlus/core/item/wearable/hazmat/ItemArmorHazmatEx.java b/src/main/java/gtPlusPlus/core/item/wearable/hazmat/ItemArmorHazmatEx.java index 1f8009e54a..1f8009e54a 100644 --- a/src/Java/gtPlusPlus/core/item/wearable/hazmat/ItemArmorHazmatEx.java +++ b/src/main/java/gtPlusPlus/core/item/wearable/hazmat/ItemArmorHazmatEx.java diff --git a/src/Java/gtPlusPlus/core/lib/CORE.java b/src/main/java/gtPlusPlus/core/lib/CORE.java index 5003eaab7f..7508b9fc8f 100644 --- a/src/Java/gtPlusPlus/core/lib/CORE.java +++ b/src/main/java/gtPlusPlus/core/lib/CORE.java @@ -10,7 +10,6 @@ import gregtech.api.GregTech_API; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.Pair; import gtPlusPlus.api.objects.random.XSTR; -import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.reflect.ReflectionUtils; import gtPlusPlus.preloader.CORE_Preloader; import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials; @@ -52,7 +51,7 @@ public class CORE { public static final String name = "GT++"; public static final String MODID = "miscutils"; - public static final String VERSION = "1.7.06-GTNH"; + public static final String VERSION = "GRADLETOKEN_VERSION"; //Tweakables public static int EVERGLADES_ID = 227; @@ -77,6 +76,7 @@ public class CORE { public static final WeakHashMap<World, EntityPlayerMP> fakePlayerCache = new WeakHashMap<World, EntityPlayerMP>(); //Tooltips; public static final String GT_Tooltip = "Added by: " + EnumChatFormatting.DARK_GREEN+"Alkalus "+EnumChatFormatting.GRAY+"- "+EnumChatFormatting.RED+"[GT++]"; + public static final String GT_Tooltip_Builder = "" + EnumChatFormatting.DARK_GREEN+"Alkalus "+EnumChatFormatting.GRAY+"- "+EnumChatFormatting.RED+"[GT++]"; public static final String GT_Tooltip_Radioactive = EnumChatFormatting.GRAY+"Warning: "+EnumChatFormatting.GREEN+"Radioactive! "+EnumChatFormatting.GOLD+" Avoid direct handling without hazmat protection."; public static final String noItem = ""; @@ -297,11 +297,11 @@ public class CORE { public static int pollutionPerSecondMultiGeneratorArray; public static int pollutionPerSecondMultiTreeFarm = 100; public static int pollutionPerSecondMultiFrothFlotationCell = 0; - public static int pollutionPerSecondMultiNuclearReactor_ModeBoosted = 160; - public static int pollutionPerSecondMultiNuclearReactor_ModeNormal = 80; public static int pollutionPerSecondMultiAutoCrafter = 500; public static int pollutionPerSecondMultiThermalBoiler = 700; public static int pollutionPerSecondMultiAlgaePond = 0; + public static int pollutionPerSecondMultiIndustrialRockBreaker = 100; + public static int pollutionPerSecondMultiIndustrialChisel = 50; //pollution single blocks public static int basePollutionPerSecondSemiFluidGenerator = 40; public static double[] pollutionReleasedByTierSemiFluidGenerator = new double[]{0,2.0,4.0,8.0}; @@ -340,13 +340,21 @@ public class CORE { Logger.INFO("This should only happy in a development environment or when something really bad happens."); Logger.INFO("Reason: "+aReason); Logger.INFO("=========================================================="); - Logger.INFO("Called from: "+ReflectionUtils.getMethodName(0)); - Logger.INFO(ReflectionUtils.getMethodName(1)); + Logger.INFO("Called from: "+ReflectionUtils.getMethodName(1)); Logger.INFO(ReflectionUtils.getMethodName(2)); Logger.INFO(ReflectionUtils.getMethodName(3)); Logger.INFO(ReflectionUtils.getMethodName(4)); Logger.INFO(ReflectionUtils.getMethodName(5)); - Logger.INFO(ReflectionUtils.getMethodName(6)); + Logger.INFO(ReflectionUtils.getMethodName(6)); + Logger.INFO(ReflectionUtils.getMethodName(7)); + Logger.INFO(ReflectionUtils.getMethodName(8)); + Logger.INFO(ReflectionUtils.getMethodName(9)); + Logger.INFO(ReflectionUtils.getMethodName(10)); + Logger.INFO(ReflectionUtils.getMethodName(11)); + Logger.INFO(ReflectionUtils.getMethodName(12)); + Logger.INFO(ReflectionUtils.getMethodName(13)); + Logger.INFO(ReflectionUtils.getMethodName(14)); + Logger.INFO(ReflectionUtils.getMethodName(15)); FMLCommonHandler.instance().exitJava(0, true); } diff --git a/src/Java/gtPlusPlus/core/lib/LoadedMods.java b/src/main/java/gtPlusPlus/core/lib/LoadedMods.java index 1eb8351d65..4f7a10be78 100644 --- a/src/Java/gtPlusPlus/core/lib/LoadedMods.java +++ b/src/main/java/gtPlusPlus/core/lib/LoadedMods.java @@ -60,6 +60,7 @@ public class LoadedMods { public static boolean CropsPlusPlus = false; //Barts Crop Mod public static boolean Reliquary = false; public static boolean SpiceOfLife = false; + public static boolean RemoteIO = false; @@ -322,6 +323,11 @@ public class LoadedMods { Witchery = true; Logger.INFO("Components enabled for: Witchery"); totalMods++; + } + if (isModLoaded("RIO")){ + RemoteIO = true; + Logger.INFO("Components enabled for: RemoteIO"); + totalMods++; } Logger.INFO("Content found for "+totalMods+" mods"); diff --git a/src/Java/gtPlusPlus/core/lib/VanillaColours.java b/src/main/java/gtPlusPlus/core/lib/VanillaColours.java index 9a7a82cb1f..9a7a82cb1f 100644 --- a/src/Java/gtPlusPlus/core/lib/VanillaColours.java +++ b/src/main/java/gtPlusPlus/core/lib/VanillaColours.java diff --git a/src/Java/gtPlusPlus/core/material/ALLOY.java b/src/main/java/gtPlusPlus/core/material/ALLOY.java index 22ffc34205..fd7547970c 100644 --- a/src/Java/gtPlusPlus/core/material/ALLOY.java +++ b/src/main/java/gtPlusPlus/core/material/ALLOY.java @@ -635,7 +635,27 @@ public final class ALLOY { new MaterialStack(ELEMENT.getInstance().COPPER, 3), new MaterialStack(ELEMENT.getInstance().OXYGEN, 8) }); - + + + public static final Material HS188A = new Material( + "HS188-A", //Material Name + MaterialState.SOLID, //State + null, //Material Colour + 4870, //Melting Point in C + 7550, //Boiling Point in C + -1, //Protons + -1, //Neutrons + true, //Uses Blast furnace? + new MaterialStack[]{ + new MaterialStack(ELEMENT.getInstance().COBALT, 20), + new MaterialStack(ELEMENT.getInstance().HAFNIUM, 20), + new MaterialStack(TALONITE, 16), + new MaterialStack(ELEMENT.getInstance().RHENIUM, 10), + new MaterialStack(NIOBIUM_CARBIDE, 10), + new MaterialStack(HASTELLOY_X, 8), + new MaterialStack(TUNGSTENSTEEL, 8), + new MaterialStack(ZIRCONIUM_CARBIDE, 8), + }); //Material Stacks with Percentage of required elements. /** * Stargate Materials - #D2FFA9 210, 255, 170 @@ -725,6 +745,24 @@ public final class ALLOY { /* * Top Tier Alloys */ + + public static final Material HELICOPTER = new Material( + "HeLiCoPtEr", //Material Name + MaterialState.SOLID, //State + null, //Material Colour + 5763, + 8192, + -1, + -1, + true, //Uses Blast furnace? + //Material Stacks with Percentage of required elements. + new MaterialStack[]{ + new MaterialStack(ELEMENT.getInstance().HELIUM, 20), + new MaterialStack(ELEMENT.getInstance().LITHIUM, 20), + new MaterialStack(ELEMENT.getInstance().COBALT, 20), + new MaterialStack(ELEMENT.getInstance().PLATINUM, 20), + new MaterialStack(ELEMENT.getInstance().ERBIUM, 20) + }); //0lafe Compound public static final Material LAFIUM = new Material( diff --git a/src/Java/gtPlusPlus/core/material/ELEMENT.java b/src/main/java/gtPlusPlus/core/material/ELEMENT.java index 3af8b560ad..01d3fd5330 100644 --- a/src/Java/gtPlusPlus/core/material/ELEMENT.java +++ b/src/main/java/gtPlusPlus/core/material/ELEMENT.java @@ -23,7 +23,7 @@ public final class ELEMENT { public final Material NITROGEN = MaterialUtils.generateMaterialFromGtENUM(Materials.Nitrogen); public final Material OXYGEN = MaterialUtils.generateMaterialFromGtENUM(Materials.Oxygen); public final Material FLUORINE = MaterialUtils.generateMaterialFromGtENUM(Materials.Fluorine); - public final Material NEON = new Material("Neon", MaterialState.GAS, new short[]{255, 255, 255}, -248, -246, 10, 10, false, "Ne", 0);//Not a GT Inherited Material + public final Material NEON = new Material("Neon", MaterialState.PURE_GAS, new short[]{240, 180, 30}, -248, -246, 10, 10, false, "Ne", 0);//Not a GT Inherited Material public final Material SODIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Sodium); public final Material MAGNESIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Magnesium); public final Material ALUMINIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Aluminium); @@ -51,7 +51,7 @@ public final class ELEMENT { public final Material ARSENIC = MaterialUtils.generateMaterialFromGtENUM(Materials.Arsenic); public final Material SELENIUM = new Material("Selenium", MaterialState.SOLID, new short[]{190, 190, 190}, 217, 685, 34, 45, false, "Se", 0);//Not a GT Inherited Material public final Material BROMINE = new Material("Bromine", MaterialState.PURE_LIQUID, new short[]{200, 25, 25}, -7, 58, 35, 45, false, "Br", 0);//Not a GT Inherited Material - public final Material KRYPTON = new Material("Krypton", MaterialState.PURE_LIQUID, new short[]{255, 255, 255}, -157, -153, 36, 48, false, "Kr", 0);//Not a GT Inherited Material + public final Material KRYPTON = new Material("Krypton", MaterialState.PURE_GAS, new short[]{5, 200, 220}, -157, -153, 36, 48, false, "Kr", 0);//Not a GT Inherited Material public final Material RUBIDIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Rubidium); public final Material STRONTIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Strontium, new short[] {230, 210, 110}, TextureSet.SET_FLINT); public final Material YTTRIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Yttrium); @@ -69,7 +69,7 @@ public final class ELEMENT { public final Material ANTIMONY = MaterialUtils.generateMaterialFromGtENUM(Materials.Antimony); public final Material TELLURIUM = new Material("Tellurium", MaterialState.SOLID, new short[]{210, 210, 210}, 449, 989, 52, 76, false, "Te", 0);//Not a GT Inherited Material public final Material IODINE = new Material("Iodine", MaterialState.SOLID, TextureSet.SET_SHINY, new short[]{96, 96, 96}, 114, 184, 53, 74, false, "I", 0);//Not a GT Inherited Material - public final Material XENON = new Material("Xenon", MaterialState.GAS, new short[]{255, 255, 255}, -111, -108, 54, 77, false, "Xe", 0);//Not a GT Inherited Material + public final Material XENON = new Material("Xenon", MaterialState.PURE_GAS, new short[]{5, 105, 210}, -111, -108, 54, 77, false, "Xe", 0);//Not a GT Inherited Material public final Material CAESIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Caesium); public final Material BARIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Barium); public final Material LANTHANUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Lanthanum); @@ -143,7 +143,7 @@ public final class ELEMENT { public final Material LITHIUM7 = new Material("Lithium 7", MaterialState.SOLID, TextureSet.SET_SHINY, Materials.Lithium.mRGBa, Materials.Lithium.mMeltingPoint, Materials.Lithium.mBlastFurnaceTemp, Materials.Lithium.getProtons(), Materials.Lithium.getNeutrons(), Materials.Lithium.mBlastFurnaceRequired, StringUtils.superscript("7Li"), 0, false);//Not a GT Inherited Material public final Material URANIUM232 = new Material("Uranium 232", MaterialState.SOLID, TextureSets.NUCLEAR.get(), new short[]{88, 220, 103, 0}, 1132, 4131, 92, 140, false, StringUtils.superscript("232U"), 4);//Not a GT Inherited Material public final Material URANIUM233 = new Material("Uranium 233", MaterialState.SOLID, TextureSets.NUCLEAR.get(), new short[]{73, 220, 83, 0}, 1132, 4131, 92, 141, false, StringUtils.superscript("233U"), 2);//Not a GT Inherited Material - public final Material THORIUM232 = new Material("Thorium 232", MaterialState.SOLID, TextureSets.NUCLEAR.get(), new short[]{15, 60, 15, 0}, Materials.Thorium.mMeltingPoint, Materials.Thorium.mBlastFurnaceTemp, 90, 142, false, StringUtils.superscript("232Th"), 1, false);//Not a GT Inherited Material + public final Material THORIUM232 = new Material("Thorium 232", MaterialState.SOLID, TextureSets.NUCLEAR.get(), new short[]{15, 60, 15, 0}, Materials.Thorium.mMeltingPoint, Materials.Thorium.mBlastFurnaceTemp, 90, 142, false, StringUtils.superscript("232Th"), 1, true);//Not a GT Inherited Material public final Material PLUTONIUM239 = new Material("Plutonium-239", MaterialState.SOLID, TextureSets.NUCLEAR.get(), Materials.Plutonium.mDurability, Materials.Plutonium.mRGBa, Materials.Plutonium.mMeltingPoint, Materials.Plutonium.mBlastFurnaceTemp, 94, 145, false, StringUtils.superscript("239Pu"), 4, true);//Not a GT Inherited Material //RTG Fuels public final Material PLUTONIUM238 = new Material("Plutonium-238", MaterialState.SOLID, TextureSets.NUCLEAR.get(), Materials.Plutonium241.mDurability, Materials.Plutonium241.mRGBa, Materials.Plutonium241.mMeltingPoint, Materials.Plutonium241.mBlastFurnaceTemp, 94, 144, false, StringUtils.superscript("238Pu"), 2, false);//Not a GT Inherited Material @@ -236,13 +236,14 @@ public final class ELEMENT { 0, false, new MaterialStack[]{ - new MaterialStack(getInstance().OXYGEN, 30), - new MaterialStack(getInstance().IRON, 20), - new MaterialStack(getInstance().SILICONDIOXIDE, 20), - new MaterialStack(getInstance().ALUMINIUMOXIDE, 10), - new MaterialStack(getInstance().POTASSIUM, 10), - new MaterialStack(getInstance().CALCIUM, 5), - new MaterialStack(getInstance().SODIUM, 5) + new MaterialStack(getInstance().OXYGEN, 16), + new MaterialStack(getInstance().IRON, 10), + new MaterialStack(getInstance().SILICONDIOXIDE, 10), + new MaterialStack(getInstance().ALUMINIUMOXIDE, 6), + new MaterialStack(getInstance().POTASSIUM, 6), + new MaterialStack(getInstance().CALCIUM, 4), + new MaterialStack(getInstance().SODIUM, 4), + new MaterialStack(getInstance().YTTERBIUM, 2) });//Not a GT Inherited Material public static final Material RUNITE = new Material("Runite", MaterialState.SOLID, TextureSet.SET_FINE, new short[] {60, 200, 190}, 6750, 11550, 73, 87, true, "§", 0);//Not a GT Inherited Material diff --git a/src/Java/gtPlusPlus/core/material/Ion.java b/src/main/java/gtPlusPlus/core/material/Ion.java index 2b5b113b92..2b5b113b92 100644 --- a/src/Java/gtPlusPlus/core/material/Ion.java +++ b/src/main/java/gtPlusPlus/core/material/Ion.java diff --git a/src/Java/gtPlusPlus/core/material/MISC_MATERIALS.java b/src/main/java/gtPlusPlus/core/material/MISC_MATERIALS.java index 8dad69f70a..2740f49d71 100644 --- a/src/Java/gtPlusPlus/core/material/MISC_MATERIALS.java +++ b/src/main/java/gtPlusPlus/core/material/MISC_MATERIALS.java @@ -71,7 +71,7 @@ public final class MISC_MATERIALS { public static final Material HYDROGEN_CYANIDE = new Material( "Hydrogen Cyanide", - MaterialState.PURE_LIQUID, //State + MaterialState.PURE_GAS, //State null, //Material Colour 4, //Melting Point in C 26, //Boiling Point in C @@ -87,7 +87,7 @@ public final class MISC_MATERIALS { public static final Material CARBON_MONOXIDE = new Material( "Carbon Monoxide", - MaterialState.PURE_LIQUID, //State + MaterialState.PURE_GAS, //State null, //Material Colour -1, //Melting Point in C -1, //Boiling Point in C @@ -102,7 +102,7 @@ public final class MISC_MATERIALS { public static final Material CARBON_DIOXIDE = new Material( "Carbon Dioxide", - MaterialState.PURE_LIQUID, //State + MaterialState.PURE_GAS, //State null, //Material Colour -1, //Melting Point in C -1, //Boiling Point in C @@ -114,6 +114,26 @@ public final class MISC_MATERIALS { new MaterialStack(ELEMENT.getInstance().CARBON, 1), new MaterialStack(ELEMENT.getInstance().OXYGEN, 2) }); + + public static final Material WOODS_GLASS = new Material( + "Wood's Glass", //Material Name + MaterialState.SOLID, //State + TextureSets.GEM_A.get(), //Texture Set + new short[] {220, 60, 255}, //Material Colour + -1, + -1, + -1, + -1, + false, + "Si4Ba3Na2Ni", + 0, + false, + new MaterialStack[]{ + new MaterialStack(ELEMENT.getInstance().SILICON, 40), + new MaterialStack(ELEMENT.getInstance().BARIUM, 30), + new MaterialStack(ELEMENT.getInstance().SODIUM, 20), + new MaterialStack(ELEMENT.getInstance().NICKEL, 10), + }); /* @@ -134,12 +154,12 @@ public final class MISC_MATERIALS { new MaterialStack(ORES.GREENOCKITE, 1), new MaterialStack(ORES.LANTHANITE_CE, 1), new MaterialStack(ORES.AGARDITE_CD, 1), - new MaterialStack(ORES.XENOTIME, 1), + new MaterialStack(ORES.YTTRIALITE, 1), new MaterialStack(MaterialUtils.generateMaterialFromGtENUM(Materials.NetherQuartz), 1), new MaterialStack(MaterialUtils.generateMaterialFromGtENUM(Materials.Galena), 1), new MaterialStack(MaterialUtils.generateMaterialFromGtENUM(Materials.Chalcopyrite), 1), - new MaterialStack(MaterialUtils.generateMaterialFromGtENUM(Materials.Cobaltite), 1), - new MaterialStack(ELEMENT.STANDALONE.GRANITE, 1) + new MaterialStack(ORES.CRYOLITE, 1), + new MaterialStack(ELEMENT.getInstance().YTTRIUM, 1) }); public static final Material RARE_EARTH_MID = new Material( @@ -182,7 +202,7 @@ public final class MISC_MATERIALS { new MaterialStack(ORES.LAUTARITE, 1), new MaterialStack(ORES.DEMICHELEITE_BR, 1), new MaterialStack(ORES.ALBURNITE, 1), - new MaterialStack(ORES.KASHINITE, 1), + new MaterialStack(ORES.SAMARSKITE_Y, 1), new MaterialStack(ORES.AGARDITE_LA, 1), }); @@ -245,7 +265,7 @@ public final class MISC_MATERIALS { public static final Material HYDROGEN_CHLORIDE = new Material( "Hydrogen Chloride", - MaterialState.PURE_LIQUID, + MaterialState.PURE_GAS, new MaterialStack[]{ new MaterialStack(ELEMENT.getInstance().HYDROGEN, 1), new MaterialStack(ELEMENT.getInstance().CHLORINE, 1), @@ -254,7 +274,7 @@ public final class MISC_MATERIALS { public static final Material SODIUM_CHLORIDE = new Material( "Sodium Chloride", - MaterialState.PURE_LIQUID, + MaterialState.PURE_GAS, new MaterialStack[]{ new MaterialStack(ELEMENT.getInstance().SODIUM, 1), new MaterialStack(ELEMENT.getInstance().CHLORINE, 1), @@ -263,7 +283,7 @@ public final class MISC_MATERIALS { public static final Material SODIUM_HYDROXIDE = new Material( "Sodium Hydroxide", - MaterialState.PURE_LIQUID, + MaterialState.PURE_GAS, new MaterialStack[]{ new MaterialStack(ELEMENT.getInstance().SODIUM, 1), new MaterialStack(HYDROXIDE, 1), diff --git a/src/Java/gtPlusPlus/core/material/Material.java b/src/main/java/gtPlusPlus/core/material/Material.java index dee064353a..0e9eb9b376 100644 --- a/src/Java/gtPlusPlus/core/material/Material.java +++ b/src/main/java/gtPlusPlus/core/material/Material.java @@ -3,7 +3,11 @@ package gtPlusPlus.core.material; import static gregtech.api.enums.GT_Values.M; import static gtPlusPlus.core.util.math.MathUtils.safeCast_LongToInt; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; @@ -33,16 +37,19 @@ import net.minecraftforge.fluids.FluidStack; public class Material { public static final Set<Material> mMaterialMap = new HashSet<Material>(); + public static HashMap<String, Material> mMaterialCache = new HashMap<String, Material>(); public static final Map<String, Map<String, ItemStack>> mComponentMap = new HashMap<String, Map<String, ItemStack>>(); + public static HashMap<String, String> sChemicalFormula = new HashMap<String, String>(); + private String unlocalizedName; private String localizedName; private MaterialState materialState; private TextureSet textureSet; - private Fluid vMoltenFluid; + private Fluid mFluid; private Fluid vPlasma; private boolean vGenerateCells; @@ -163,6 +170,8 @@ public class Material { try { this.unlocalizedName = Utils.sanitizeString(materialName); this.localizedName = materialName; + mMaterialCache.put(getLocalizedName().toLowerCase(), this); + Logger.INFO("Stored "+getLocalizedName()+" to cache with key: "+getLocalizedName().toLowerCase()); this.materialState = defaultState; @@ -466,29 +475,28 @@ public class Material { } if (generateFluid){ - final Materials isValid = Materials.get(this.getLocalizedName()); + final Materials aGregtechMaterial = tryFindGregtechMaterialEquivalent(); FluidStack aTest = FluidUtils.getWildcardFluidStack(localizedName, 1); if (aTest != null){ - this.vMoltenFluid = aTest.getFluid(); + this.mFluid = aTest.getFluid(); + checkForCellAndGenerate(this); } else { - if (isValid == null || isValid == Materials._NULL){ - queueFluidGeneration(); + if (aGregtechMaterial != null && !MaterialUtils.isNullGregtechMaterial(aGregtechMaterial)){ + aTest = FluidUtils.getWildcardFluidStack(aGregtechMaterial, 1); } - else { - FluidStack aTest2 = FluidUtils.getWildcardFluidStack(localizedName, 1); - if (aTest2 != null){ - this.vMoltenFluid = aTest2.getFluid(); - } - else { - queueFluidGeneration(); - } + if (aTest != null){ + this.mFluid = aTest.getFluid(); + checkForCellAndGenerate(this); } + else { + mFluid = generateFluid(); + } } this.vPlasma = this.generatePlasma(); } else { - this.vMoltenFluid = null; + this.mFluid = null; this.vPlasma = null; } String ratio = ""; @@ -511,6 +519,7 @@ public class Material { } } + sChemicalFormula.put(materialName.toLowerCase(), this.vChemicalFormula); Logger.MATERIALS("Creating a Material instance for "+materialName); Logger.MATERIALS("Formula: "+this.vChemicalFormula + " Smallest Stack: "+this.smallestStackSizeWhenProcessing+" Smallest Ratio:"+ratio); Logger.MATERIALS("Protons: "+this.vProtons); @@ -525,6 +534,36 @@ public class Material { } } + private static void checkForCellAndGenerate(Material material) { + if (!material.vGenerateCells) { + return; + } + String aName = Utils.sanitizeString(material.unlocalizedName); + String aName2 = Utils.sanitizeString(material.unlocalizedName.toLowerCase()); + String aName3 = (material.localizedName == null) ? aName : material.localizedName; + ItemStack aTestCell1 = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cell"+aName, 1); + ItemStack aTestCell2 = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cell"+aName2, 1); + ItemStack aTestCell3 = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cell"+aName3, 1); + if (aTestCell1 == null && aTestCell2 == null && aTestCell3 == null) { + Logger.INFO("Generating cell for "+ material.localizedName); + new BaseItemCell(material); + } + else { + if (aTestCell1 != null) { + Logger.INFO("Registering existing cell for "+ material.localizedName+", "+aName); + material.registerComponentForMaterial(OrePrefixes.cell, aTestCell1); + } + else if (aTestCell2 != null) { + Logger.INFO("Registering existing cell for "+ material.localizedName+", "+aName2); + material.registerComponentForMaterial(OrePrefixes.cell, aTestCell2); + } + else if (aTestCell3 != null) { + Logger.INFO("Registering existing cell for "+ material.localizedName+", "+aName3); + material.registerComponentForMaterial(OrePrefixes.cell, aTestCell3); + } + } + } + public final TextureSet getTextureSet() { synchronized(this) { return textureSet; @@ -735,14 +774,26 @@ public class Material { else { // Try get a GT Material Materials Erf = MaterialUtils.getMaterial(this.unlocalizedName); - if (Erf != null && Erf != Materials._NULL) { + if (Erf != null && !MaterialUtils.isNullGregtechMaterial(Erf)) { ItemStack Erg = ItemUtils.getOrePrefixStack(aPrefix, Erf, stacksize); - if (Erg != null) { + if (Erg != null && ItemUtils.checkForInvalidItems(Erg)) { Logger.MATERIALS("Found \"" + aKey + this.unlocalizedName + "\" using backup GT Materials option."); g.put(aKey, Erg); mComponentMap.put(unlocalizedName, g); return Erg; } + else { + // Try get a molten cell + if (aPrefix == OrePrefixes.cell) { + Erg = ItemUtils.getOrePrefixStack(OrePrefixes.cellMolten, Erf, stacksize); + if (Erg != null && ItemUtils.checkForInvalidItems(Erg)) { + Logger.MATERIALS("Found \"" + OrePrefixes.cellMolten.name() + this.unlocalizedName + "\" using backup GT Materials option."); + g.put(aKey, Erg); + mComponentMap.put(unlocalizedName, g); + return Erg; + } + } + } } else { ItemStack u = ItemUtils.getItemStackOfAmountFromOreDictNoBroken(aKey + this.unlocalizedName, stacksize); if (u != null) { @@ -1082,7 +1133,6 @@ public class Material { public final static void generateQueuedFluids() { for (Material m : mMaterialMap) { if (m.isFluidQueued) { - m.vMoltenFluid = m.generateFluid(); } } } @@ -1185,8 +1235,9 @@ public class Material { 1000, this.vGenerateCells); } - else if (this.materialState == MaterialState.GAS){ - return FluidUtils.addGTFluid( + else if (this.materialState == MaterialState.GAS || this.materialState == MaterialState.PURE_GAS){ + return FluidUtils.generateGas(unlocalizedName, this.getLocalizedName(), getMeltingPointK(), getRGBA(), vGenerateCells); + /*return FluidUtils.addGTFluid( this.getUnlocalizedName(), this.getLocalizedName()+" Gas", this.RGBA, @@ -1195,7 +1246,7 @@ public class Material { aFullCell, ItemUtils.getEmptyCell(), 1000, - this.vGenerateCells); + this.vGenerateCells);*/ } else { //Plasma return this.generatePlasma(); @@ -1206,34 +1257,46 @@ public class Material { if (this.materialState == MaterialState.ORE){ return null; } - final Materials isValid = Materials.get(this.getLocalizedName()); + final Materials isValid = tryFindGregtechMaterialEquivalent(); if (!this.vGenerateCells){ return null; } - for (Materials m : invalidMaterials.values()){ - if (isValid == m){ - return (m.mPlasma != null ? m.mPlasma : null); + if (isValid != null) { + for (Materials m : invalidMaterials.values()){ + if (isValid == m){ + return null; + } + } + if (isValid.mPlasma != null){ + Logger.MATERIALS("Using a pre-defined Plasma from GT."); + return isValid.mPlasma; } } - if (isValid.mPlasma != null){ - Logger.MATERIALS("Using a pre-defined Plasma from GT."); - return isValid.mPlasma; - } - Logger.MATERIALS("Generating our own Plasma."); return FluidUtils.addGTPlasma(this); } + public Fluid getFluid() { + return mFluid; + } - final public FluidStack getFluid(final int fluidAmount) { - if (this.vMoltenFluid == null){ + final public FluidStack getFluidStack(final int fluidAmount) { + if (this.mFluid == null){ return null; } - final FluidStack moltenFluid = new FluidStack(this.vMoltenFluid, fluidAmount); + final FluidStack moltenFluid = new FluidStack(this.mFluid, fluidAmount); return moltenFluid; } + + final public boolean setFluid(Fluid aFluid) { + if (this.mFluid == null){ + this.mFluid = aFluid; + return true; + } + return false; + } final public int calculateMeltingPoint(){ @@ -1322,8 +1385,8 @@ public class Material { } private static boolean registerComponentForMaterial(Material componentMaterial, FluidStack aStack) { - if (componentMaterial != null && aStack != null && componentMaterial.vMoltenFluid == null) { - componentMaterial.vMoltenFluid = aStack.getFluid(); + if (componentMaterial != null && aStack != null && componentMaterial.mFluid == null) { + componentMaterial.mFluid = aStack.getFluid(); return true; } return false; @@ -1364,5 +1427,35 @@ public class Material { return false; } } + + public Materials tryFindGregtechMaterialEquivalent() { + return tryFindGregtechMaterialEquivalent(this); + } + + + public static Materials tryFindGregtechMaterialEquivalent(Material aMaterial) { + String aMaterialName = aMaterial.getLocalizedName(); + Materials aGregtechMaterial = Materials.get(aMaterialName); + if (aGregtechMaterial == null || MaterialUtils.isNullGregtechMaterial(aGregtechMaterial)) { + aMaterialName = aMaterialName.replace(" ", "_"); + aGregtechMaterial = Materials.get(aMaterialName); + if (aGregtechMaterial == null || MaterialUtils.isNullGregtechMaterial(aGregtechMaterial)) { + aMaterialName = aMaterialName.replace(" ", ""); + aGregtechMaterial = Materials.get(aMaterialName); + if (aGregtechMaterial == null || MaterialUtils.isNullGregtechMaterial(aGregtechMaterial)) { + return null; + } + else { + return aGregtechMaterial; + } + } + else { + return aGregtechMaterial; + } + } + else { + return aGregtechMaterial; + } + } }
\ No newline at end of file diff --git a/src/Java/gtPlusPlus/core/material/MaterialGenerator.java b/src/main/java/gtPlusPlus/core/material/MaterialGenerator.java index 20fdfd3c8c..d1ea784b81 100644 --- a/src/Java/gtPlusPlus/core/material/MaterialGenerator.java +++ b/src/main/java/gtPlusPlus/core/material/MaterialGenerator.java @@ -2,6 +2,9 @@ package gtPlusPlus.core.material; import java.util.Set; +import gregtech.api.enums.GT_Values; +import gregtech.api.enums.OrePrefixes; +import gregtech.api.util.GT_Utility; import gtPlusPlus.api.interfaces.RunnableWithInfo; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; @@ -29,7 +32,10 @@ import gtPlusPlus.core.item.base.rods.BaseItemRod; import gtPlusPlus.core.item.base.rods.BaseItemRodLong; import gtPlusPlus.core.item.base.rotors.BaseItemRotor; import gtPlusPlus.core.item.base.screws.BaseItemScrew; +import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.material.nuclear.FLUORIDES; import gtPlusPlus.core.material.state.MaterialState; +import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -40,8 +46,11 @@ import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_DustGeneration; import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_Extruder; import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_FluidCanning; import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_Fluids; +import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_Fluorite; import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_MaterialProcessing; +import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_MetalRecipe; import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_Ore; +import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_Plasma; import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_Plates; import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_Recycling; import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_ShapedCrafting; @@ -188,6 +197,10 @@ public class MaterialGenerator { temp = new BaseItemDust(matInfo); FluidUtils.generateGas(unlocalizedName, materialName, matInfo.getMeltingPointK(), C, true); } + else if (matInfo.getState() == MaterialState.PURE_GAS){ + FluidUtils.generateGas(unlocalizedName, materialName, matInfo.getMeltingPointK(), C, true); + return true; + } else if (matInfo.getState() == MaterialState.PURE_LIQUID){ FluidUtils.generateFluidNoPrefix(unlocalizedName, materialName, matInfo.getMeltingPointK(), C); return true; @@ -202,6 +215,7 @@ public class MaterialGenerator { if (generateBlastSmelterRecipes){ new RecipeGen_BlastSmelter(matInfo); } + new RecipeGen_MetalRecipe(matInfo); new RecipeGen_Extruder(matInfo); new RecipeGen_Fluids(matInfo); new RecipeGen_Plates(matInfo); @@ -210,6 +224,8 @@ public class MaterialGenerator { new RecipeGen_DustGeneration(matInfo); new RecipeGen_Recycling(matInfo); + new RecipeGen_Plasma(matInfo); + return true; } catch (final Throwable t) @@ -258,13 +274,50 @@ public class MaterialGenerator { generateNuclearMaterial(matInfo, true); } + + public static void generateNuclearDusts(final Material matInfo){ + generateNuclearDusts(matInfo, true); + } + + public static void generateNuclearDusts(final Material matInfo, boolean generateDehydratorRecipe){ + generateNuclearMaterial(matInfo, false, true, false, false, true); + if (generateDehydratorRecipe && matInfo.getFluid() != null && matInfo.getDust(0) != null) { + CORE.RA.addDehydratorRecipe( + new ItemStack[] { + CI.getNumberedAdvancedCircuit(20) + }, + matInfo.getFluidStack(144), + null, + new ItemStack[] { + matInfo.getDust(1), + }, + new int[] { 10000 }, + 10*(matInfo.vVoltageMultiplier/5), // Time in ticks + matInfo.vVoltageMultiplier); // EU + } + else { + Logger.INFO("Nuclear Dehydrator: Did not generate recipe for "+matInfo.getLocalizedName()+" | Null Fluid? "+(matInfo.getFluid() == null)+" | Null Dust? "+(matInfo.getDust(0) == null)); + } + } + public static void generateNuclearMaterial(final Material matInfo, final boolean generatePlates){ + generateNuclearMaterial(matInfo, true, true, true, generatePlates, true); + } + + public static void generateNuclearMaterial(final Material matInfo, final boolean generateBlock, + final boolean generateDusts, final boolean generateIngot, final boolean generatePlates, final boolean disableOptionalRecipes){ try { - tempBlock = new BlockBaseModular(matInfo,BlockTypes.STANDARD); - temp = new BaseItemDust(matInfo); - temp = new BaseItemIngot(matInfo); - temp = new BaseItemNugget(matInfo); + if (generateBlock) { + tempBlock = new BlockBaseModular(matInfo,BlockTypes.STANDARD); + } + if (generateDusts) { + temp = new BaseItemDust(matInfo); + } + if (generateIngot) { + temp = new BaseItemIngot(matInfo); + temp = new BaseItemNugget(matInfo); + } if (generatePlates) { temp = new BaseItemPlate(matInfo); @@ -274,11 +327,16 @@ public class MaterialGenerator { new RecipeGen_Assembler(matInfo); } - new RecipeGen_ShapedCrafting(matInfo); - new RecipeGen_Fluids(matInfo); - new RecipeGen_MaterialProcessing(matInfo); - new RecipeGen_DustGeneration(matInfo, true); - new RecipeGen_Recycling(matInfo); + if (!disableOptionalRecipes) { + new RecipeGen_ShapedCrafting(matInfo); + new RecipeGen_Fluids(matInfo); + new RecipeGen_MaterialProcessing(matInfo); + new RecipeGen_Recycling(matInfo); + } + + new RecipeGen_MetalRecipe(matInfo); + new RecipeGen_DustGeneration(matInfo, disableOptionalRecipes); + new RecipeGen_Plasma(matInfo); } catch (final Throwable t){ Logger.MATERIALS(""+matInfo.getLocalizedName()+" failed to generate."); @@ -340,13 +398,67 @@ public class MaterialGenerator { temp = new BaseItemPurifiedDust(matInfo); Logger.MATERIALS("Generated all ore components for "+matInfo.getLocalizedName()+", now generating processing recipes."); - new RecipeGen_Ore(matInfo); + + if (matInfo == FLUORIDES.FLUORITE){ + new RecipeGen_Fluorite(matInfo); + } + else { + new RecipeGen_Ore(matInfo); + } } catch (final Throwable t){ Logger.MATERIALS("[Error] "+(matInfo != null ? matInfo.getLocalizedName() : "Null Material")+" failed to generate."); t.printStackTrace(); } } + + public static boolean generateOreMaterialWithAllExcessComponents(final Material matInfo){ + try { + if (matInfo == null){ + Logger.DEBUG_MATERIALS("Invalid Material while constructing null material."); + return false; + } + final short[] C = matInfo.getRGBA(); + final Integer Colour = Utils.rgbtoHexValue(C[0], C[1], C[2]); + + tempBlock = new BlockBaseOre(matInfo, BlockTypes.ORE, Colour.intValue()); + tempBlock = new BlockBaseModular(matInfo,BlockTypes.STANDARD); + temp = new BaseItemIngot(matInfo); + temp = new BaseItemDust(matInfo); + temp = new BaseItemNugget(matInfo); + temp = new BaseItemPlate(matInfo); + temp = new BaseItemPlateDouble(matInfo); + + + temp = new BaseItemCrushedOre(matInfo); + temp = new BaseItemCentrifugedCrushedOre(matInfo); + temp = new BaseItemPurifiedCrushedOre(matInfo); + temp = new BaseItemImpureDust(matInfo); + temp = new BaseItemPurifiedDust(matInfo); + + Logger.MATERIALS("Generated all ore & base components for "+matInfo.getLocalizedName()+", now generating processing recipes."); + + new RecipeGen_Ore(matInfo, true); + new RecipeGen_AlloySmelter(matInfo); + new RecipeGen_Assembler(matInfo); + new RecipeGen_BlastSmelter(matInfo); + new RecipeGen_MetalRecipe(matInfo); + new RecipeGen_Extruder(matInfo); + new RecipeGen_Fluids(matInfo); + new RecipeGen_Plates(matInfo); + new RecipeGen_ShapedCrafting(matInfo); + new RecipeGen_MaterialProcessing(matInfo); + new RecipeGen_DustGeneration(matInfo); + new RecipeGen_Recycling(matInfo); + return true; + } + catch (final Throwable t){ + Logger.MATERIALS(""+matInfo.getLocalizedName()+" failed to generate."); + t.printStackTrace(); + return false; + } + + } } diff --git a/src/Java/gtPlusPlus/core/material/MaterialStack.java b/src/main/java/gtPlusPlus/core/material/MaterialStack.java index 63a9ccce9c..63a9ccce9c 100644 --- a/src/Java/gtPlusPlus/core/material/MaterialStack.java +++ b/src/main/java/gtPlusPlus/core/material/MaterialStack.java diff --git a/src/Java/gtPlusPlus/core/material/NONMATERIAL.java b/src/main/java/gtPlusPlus/core/material/NONMATERIAL.java index 7ab72d50bc..7ab72d50bc 100644 --- a/src/Java/gtPlusPlus/core/material/NONMATERIAL.java +++ b/src/main/java/gtPlusPlus/core/material/NONMATERIAL.java diff --git a/src/Java/gtPlusPlus/core/material/ORES.java b/src/main/java/gtPlusPlus/core/material/ORES.java index c2556b60f1..82757b2ee6 100644 --- a/src/Java/gtPlusPlus/core/material/ORES.java +++ b/src/main/java/gtPlusPlus/core/material/ORES.java @@ -6,119 +6,147 @@ import gtPlusPlus.core.material.state.MaterialState; public final class ORES { - public static final Material GEIKIELITE = new Material( - "Geikielite", //Material Name + public static final Material AGARDITE_CD = new Material( + "Agardite (Cd)", //Material Name MaterialState.ORE, //State - TextureSets.GEM_A.get(), //Texture Set - new short[]{187, 193, 204, 0}, //Material Colour + TextureSet.SET_METALLIC, //Texture Set + new short[]{170, 188, 33, 0}, //Material Colour -1, -1, -1, -1, -1, //Radiation - new MaterialStack[]{ - new MaterialStack(ELEMENT.getInstance().MAGNESIUM, 1), - new MaterialStack(ELEMENT.getInstance().TITANIUM, 1), - new MaterialStack(ELEMENT.getInstance().OXYGEN, 3) + new MaterialStack[]{// (CdCa)Cu7(AsO2)4(O2H)5·3H2O + new MaterialStack(ELEMENT.getInstance().CADMIUM, 1), + new MaterialStack(ELEMENT.getInstance().CALCIUM, 1), + new MaterialStack(ELEMENT.getInstance().COPPER, 7), + new MaterialStack(ELEMENT.getInstance().ARSENIC, 4), + new MaterialStack(ELEMENT.getInstance().OXYGEN, 21), + new MaterialStack(ELEMENT.getInstance().HYDROGEN, 11) }); - public static final Material ZIMBABWEITE = new Material( - "Zimbabweite", //Material Name + public static final Material AGARDITE_LA = new Material( + "Agardite (La)", //Material Name MaterialState.ORE, //State TextureSet.SET_FINE, //Texture Set - new short[]{193, 187, 131, 0}, //Material Colour + new short[]{206, 232, 9, 0}, //Material Colour -1, -1, -1, -1, -1, //Radiation - new MaterialStack[]{ - new MaterialStack(ELEMENT.getInstance().CALCIUM, 2), - new MaterialStack(ELEMENT.getInstance().POTASSIUM, 2), - new MaterialStack(ELEMENT.getInstance().LEAD, 1), - new MaterialStack(ELEMENT.getInstance().ARSENIC, 4), - new MaterialStack(ELEMENT.getInstance().NIOBIUM, 4), - new MaterialStack(ELEMENT.getInstance().TANTALUM, 4), - new MaterialStack(ELEMENT.getInstance().TITANIUM, 4), - new MaterialStack(ELEMENT.getInstance().OXYGEN, 18) + new MaterialStack[]{// (LaCa)Cu5(AsO6)2(OH)4·3H2O + new MaterialStack(ELEMENT.getInstance().LANTHANUM, 1), + new MaterialStack(ELEMENT.getInstance().CALCIUM, 1), + new MaterialStack(ELEMENT.getInstance().COPPER, 5), + new MaterialStack(ELEMENT.getInstance().ARSENIC, 2), + new MaterialStack(ELEMENT.getInstance().OXYGEN, 19), + new MaterialStack(ELEMENT.getInstance().HYDROGEN, 10) }); - public static final Material TITANITE = new Material( - "Titanite", //Material Name + public static final Material AGARDITE_ND = new Material( + "Agardite (Nd)", //Material Name MaterialState.ORE, //State TextureSet.SET_METALLIC, //Texture Set - new short[]{184, 198, 105, 0}, //Material Colour + new short[]{225, 244, 78, 0}, //Material Colour -1, -1, -1, -1, -1, //Radiation - new MaterialStack[]{ - new MaterialStack(ELEMENT.getInstance().CALCIUM, 2), - new MaterialStack(ELEMENT.getInstance().TITANIUM, 2), - new MaterialStack(ELEMENT.getInstance().SILICON, 2), - new MaterialStack(ELEMENT.getInstance().THORIUM, 1), - new MaterialStack(ELEMENT.getInstance().OXYGEN, 10) + new MaterialStack[]{// (NdCa)Cu6(As3O3)2(O2H)6·3H2O + new MaterialStack(ELEMENT.getInstance().NEODYMIUM, 1), + new MaterialStack(ELEMENT.getInstance().CALCIUM, 1), + new MaterialStack(ELEMENT.getInstance().COPPER, 6), + new MaterialStack(ELEMENT.getInstance().ARSENIC, 6), + new MaterialStack(ELEMENT.getInstance().OXYGEN, 21), + new MaterialStack(ELEMENT.getInstance().HYDROGEN, 12) }); - public static final Material ZIRCONILITE = new Material( - "Zirconolite", //Material Name + public static final Material AGARDITE_Y = new Material( + "Agardite (Y)", //Material Name MaterialState.ORE, //State - TextureSet.SET_FINE, //Texture Set - new short[]{45, 26, 0, 0}, //Material Colour + TextureSet.SET_METALLIC, //Texture Set + new short[]{210, 232, 44, 0}, //Material Colour -1, -1, -1, -1, -1, //Radiation - new MaterialStack[]{ - new MaterialStack(ELEMENT.getInstance().CALCIUM, 2), - new MaterialStack(ELEMENT.getInstance().ZIRCONIUM, 2), - new MaterialStack(ELEMENT.getInstance().TITANIUM, 4), - new MaterialStack(ELEMENT.getInstance().CERIUM, 1), - new MaterialStack(ELEMENT.getInstance().OXYGEN, 14) + new MaterialStack[]{// (YCa)Cu5(As2O4)3(OH)6·3H2O + new MaterialStack(ELEMENT.getInstance().YTTRIUM, 1), + new MaterialStack(ELEMENT.getInstance().CALCIUM, 1), + new MaterialStack(ELEMENT.getInstance().COPPER, 5), + new MaterialStack(ELEMENT.getInstance().ARSENIC, 6), + new MaterialStack(ELEMENT.getInstance().OXYGEN, 21), + new MaterialStack(ELEMENT.getInstance().HYDROGEN, 12) }); - public static final Material CROCROITE = new Material( - "Crocoite", //Material Name + //Alburnite + //Ag8GeTe2S4 + public static final Material ALBURNITE = new Material( + "Alburnite", //Material Name MaterialState.ORE, //State - TextureSet.SET_GEM_VERTICAL, //Texture Set - new short[]{255, 143, 84, 0}, //Material Colour + TextureSet.SET_METALLIC, //Texture Set + new short[]{16, 5, 105, 0}, //Material Colour -1, -1, -1, -1, - -1, //Radiation - new MaterialStack[]{ - new MaterialStack(ELEMENT.getInstance().LEAD, 2), - new MaterialStack(ELEMENT.getInstance().CHROMIUM, 2), - new MaterialStack(ELEMENT.getInstance().OXYGEN, 3), - new MaterialStack(ELEMENT.getInstance().CAESIUM, 1), + 0, //Radiation + new MaterialStack[]{// Na3AlF6 + new MaterialStack(ELEMENT.getInstance().GOLD, 8), + new MaterialStack(ELEMENT.getInstance().GERMANIUM, 1), + new MaterialStack(ELEMENT.getInstance().TELLURIUM, 2), + new MaterialStack(ELEMENT.getInstance().SULFUR, 4) }); - public static final Material NICHROMITE = new Material( - "Nichromite", //Material Name + public static final Material CERITE = new Material( + "Cerite", //Material Name MaterialState.ORE, //State - TextureSet.SET_METALLIC, //Texture Set - new short[]{22, 19, 19, 0}, //Material Colour + TextureSets.REFINED.get(), //Texture Set + new short[]{68, 13, 0, 0}, //Material Colour -1, -1, -1, -1, -1, //Radiation - new MaterialStack[]{ - new MaterialStack(ELEMENT.getInstance().NICKEL, 1), - new MaterialStack(ELEMENT.getInstance().COBALT, 1), + new MaterialStack[]{// (Ce,La,Ca)9(Mg,Fe+3)(SiO4)6(SiO3OH)(OH)3 + new MaterialStack(ELEMENT.getInstance().CERIUM, 9), + new MaterialStack(ELEMENT.getInstance().LANTHANUM, 9), + new MaterialStack(ELEMENT.getInstance().CALCIUM, 9), + new MaterialStack(ELEMENT.getInstance().MAGNESIUM, 3), new MaterialStack(ELEMENT.getInstance().IRON, 3), - new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 2), - new MaterialStack(ELEMENT.getInstance().CHROMIUM, 2), - new MaterialStack(ELEMENT.getInstance().OXYGEN, 8) + new MaterialStack(ELEMENT.getInstance().SILICON, 7), + new MaterialStack(ELEMENT.getInstance().OXYGEN, 20), + new MaterialStack(ELEMENT.getInstance().HYDROGEN, 4) }); - public static final Material YTTRIAITE = new Material( //TODO - "Yttriaite", //Material Name + //Comancheite + //Hg55N24(NH2,OH)4(Cl,Br)34 + public static final Material COMANCHEITE = new Material( + "Comancheite", //Material Name MaterialState.ORE, //State - TextureSet.SET_METALLIC, //Texture Set + TextureSets.REFINED.get(), //Texture Set + new short[]{65, 205, 105, 0}, //Material Colour + -1, + -1, + -1, + -1, + 0, //Radiation + new MaterialStack[]{// Na3AlF6 + new MaterialStack(ELEMENT.getInstance().MERCURY, 54/4), + new MaterialStack(ELEMENT.getInstance().NITROGEN, 28/4), + new MaterialStack(ELEMENT.getInstance().HYDROGEN, 12/4), + new MaterialStack(ELEMENT.getInstance().OXYGEN, 8/4), + new MaterialStack(ELEMENT.getInstance().CHLORINE, 34/4), + new MaterialStack(ELEMENT.getInstance().BROMINE, 34/4) + }); + + public static final Material CROCROITE = new Material( + "Crocoite", //Material Name + MaterialState.ORE, //State + TextureSet.SET_GEM_VERTICAL, //Texture Set new short[]{255, 143, 84, 0}, //Material Colour -1, -1, @@ -126,67 +154,82 @@ public final class ORES { -1, -1, //Radiation new MaterialStack[]{ - new MaterialStack(ELEMENT.getInstance().YTTRIUM, 1), //Y not YT/YB + new MaterialStack(ELEMENT.getInstance().LEAD, 2), + new MaterialStack(ELEMENT.getInstance().CHROMIUM, 2), new MaterialStack(ELEMENT.getInstance().OXYGEN, 3), - new MaterialStack(ELEMENT.getInstance().IRON, 4), - new MaterialStack(ELEMENT.getInstance().TIN, 1), - new MaterialStack(ELEMENT.getInstance().NITROGEN, 2) - }); + new MaterialStack(ELEMENT.getInstance().CAESIUM, 1), + }); - //Samarskite_Y - public static final Material SAMARSKITE_Y = new Material( - "Samarskite (Y)", //Material Name + public static final Material CRYOLITE = new Material( + "Cryolite (F)", //Material Name MaterialState.ORE, //State - TextureSets.ENRICHED.get(), //Texture Set - new short[]{65, 163, 164, 0}, //Material Colour + TextureSet.SET_SHINY, //Texture Set + new short[]{205, 205, 255, 0}, //Material Colour -1, -1, -1, -1, -1, //Radiation - new MaterialStack[]{ - new MaterialStack(ELEMENT.getInstance().YTTRIUM, 2), //Y not YT/YB - new MaterialStack(ELEMENT.getInstance().IRON, 10), - new MaterialStack(ELEMENT.getInstance().URANIUM235, 2), - new MaterialStack(ELEMENT.getInstance().THORIUM, 3), - new MaterialStack(ELEMENT.getInstance().NIOBIUM, 2), - new MaterialStack(ELEMENT.getInstance().TANTALUM, 3) + new MaterialStack[]{// Na3AlF6 + new MaterialStack(ELEMENT.getInstance().SODIUM, 3), + new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 1), + new MaterialStack(ELEMENT.getInstance().FLUORINE, 6) }); - //Samarskite_YB - public static final Material SAMARSKITE_YB = new Material( - "Samarskite (Yb)", //Material Name + //Demicheleite-(Br) + // BiSBr + public static final Material DEMICHELEITE_BR = new Material( + "Demicheleite (Br)", //Material Name MaterialState.ORE, //State - TextureSets.ENRICHED.get(), //Texture Set - new short[]{95, 193, 194, 0}, //Material Colour + TextureSet.SET_SHINY, //Texture Set + new short[]{165, 75, 75, 0}, //Material Colour -1, -1, -1, -1, -1, //Radiation - new MaterialStack[]{ - new MaterialStack(ELEMENT.getInstance().YTTERBIUM, 2), //Y not YT/YB - new MaterialStack(ELEMENT.getInstance().IRON, 9), - new MaterialStack(ELEMENT.getInstance().URANIUM235, 3), - new MaterialStack(ELEMENT.getInstance().THORIUM, 2), - new MaterialStack(ELEMENT.getInstance().NIOBIUM, 3), - new MaterialStack(ELEMENT.getInstance().TANTALUM, 2) + new MaterialStack[]{// Na3AlF6 + new MaterialStack(ELEMENT.getInstance().BISMUTH, 13), + new MaterialStack(ELEMENT.getInstance().SULFUR, 11), + new MaterialStack(ELEMENT.getInstance().BROMINE, 1) }); - public static final Material ZIRCON = new Material( - "Zircon", //Material Name + public static final Material FLORENCITE = new Material( + "Florencite", //Material Name MaterialState.ORE, //State - TextureSets.GEM_A.get(), //Texture Set - new short[]{195, 19, 19, 0}, //Material Colour + TextureSet.SET_METALLIC, //Texture Set + new short[]{249, 249, 124, 0}, //Material Colour -1, -1, -1, -1, -1, //Radiation - new MaterialStack[]{ - new MaterialStack(ELEMENT.getInstance().ZIRCONIUM, 1), - new MaterialStack(ELEMENT.getInstance().SILICON, 1), - new MaterialStack(ELEMENT.getInstance().OXYGEN, 4), + new MaterialStack[]{// SmAl3(PO4)2(OH)6 + new MaterialStack(ELEMENT.getInstance().SAMARIUM, 1), + new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 3), + new MaterialStack(ELEMENT.getInstance().PHOSPHORUS, 1), + new MaterialStack(ELEMENT.getInstance().OXYGEN, 10), + new MaterialStack(ELEMENT.getInstance().HYDROGEN, 6) + }); + + public static final Material FLUORCAPHITE = new Material( + "Fluorcaphite", //Material Name + MaterialState.ORE, //State + TextureSet.SET_FINE, //Texture Set + new short[]{255, 255, 30, 0}, //Material Colour + -1, + -1, + -1, + -1, + -1, //Radiation + new MaterialStack[]{// (Ca,Sr,Ce,Na)5(PO4)3F + new MaterialStack(ELEMENT.getInstance().CALCIUM, 5), + new MaterialStack(MISC_MATERIALS.STRONTIUM_OXIDE, 5), + new MaterialStack(ELEMENT.getInstance().CERIUM, 5), + new MaterialStack(ELEMENT.getInstance().SODIUM, 5), + new MaterialStack(ELEMENT.getInstance().PHOSPHORUS, 3), + new MaterialStack(ELEMENT.getInstance().OXYGEN, 12), + new MaterialStack(ELEMENT.getInstance().FLUORINE, 6), }); //Gadolinite_Ce @@ -202,6 +245,7 @@ public final class ORES { -1, //Radiation new MaterialStack[]{ new MaterialStack(ELEMENT.getInstance().CERIUM, 4), + new MaterialStack(ELEMENT.getInstance().ERBIUM, 2), new MaterialStack(ELEMENT.getInstance().LANTHANUM, 2), new MaterialStack(ELEMENT.getInstance().NEODYMIUM, 2), new MaterialStack(ELEMENT.getInstance().YTTRIUM, 2), @@ -224,6 +268,7 @@ public final class ORES { -1, //Radiation new MaterialStack[]{ new MaterialStack(ELEMENT.getInstance().CERIUM, 2), + new MaterialStack(ELEMENT.getInstance().ERBIUM, 2), new MaterialStack(ELEMENT.getInstance().LANTHANUM, 2), new MaterialStack(ELEMENT.getInstance().NEODYMIUM, 2), new MaterialStack(ELEMENT.getInstance().YTTRIUM, 4), @@ -233,171 +278,161 @@ public final class ORES { new MaterialStack(ELEMENT.getInstance().OXYGEN, 9), }); - public static final Material LEPERSONNITE = new Material( - "Lepersonnite", //Material Name + public static final Material GEIKIELITE = new Material( + "Geikielite", //Material Name MaterialState.ORE, //State - TextureSet.SET_EMERALD, //Texture Set - new short[]{175, 175, 20, 0}, //Material Colour + TextureSets.GEM_A.get(), //Texture Set + new short[]{187, 193, 204, 0}, //Material Colour -1, -1, -1, -1, -1, //Radiation new MaterialStack[]{ - new MaterialStack(ELEMENT.getInstance().CALCIUM, 1), - new MaterialStack(ELEMENT.getInstance().GADOLINIUM, 2), - new MaterialStack(ELEMENT.getInstance().DYSPROSIUM, 2), - new MaterialStack(ELEMENT.getInstance().URANIUM235, 2), - new MaterialStack(ELEMENT.getInstance().OXYGEN,32), - new MaterialStack(ELEMENT.getInstance().HYDROGEN, 24) + new MaterialStack(ELEMENT.getInstance().MAGNESIUM, 1), + new MaterialStack(ELEMENT.getInstance().TITANIUM, 1), + new MaterialStack(ELEMENT.getInstance().OXYGEN, 3) }); - - public static final Material XENOTIME = new Material( - "Xenotime", //Material Name + + public static final Material GREENOCKITE = new Material( + "Greenockite", //Material Name MaterialState.ORE, //State - TextureSet.SET_OPAL, //Texture Set - new short[]{235, 89, 199, 0}, //Material Colour + TextureSets.GEM_A.get(), //Texture Set + new short[]{110, 193, 25, 0}, //Material Colour -1, -1, -1, -1, -1, //Radiation new MaterialStack[]{ - new MaterialStack(ELEMENT.getInstance().YTTRIUM, 1), - new MaterialStack(ELEMENT.getInstance().YTTERBIUM, 1), - new MaterialStack(ELEMENT.getInstance().PHOSPHORUS, 1), - new MaterialStack(ELEMENT.getInstance().OXYGEN, 4) + new MaterialStack(ELEMENT.getInstance().CADMIUM, 2), + new MaterialStack(ELEMENT.getInstance().SULFUR, 2), }); - - public static final Material YTTRIALITE = new Material( - "Yttrialite", //Material Name + + public static final Material HIBONITE = new Material( + "Hibonite", //Material Name MaterialState.ORE, //State - TextureSet.SET_RUBY, //Texture Set - new short[]{35, 189, 99, 0}, //Material Colour + TextureSet.SET_METALLIC, //Texture Set + new short[]{58, 31, 0, 0}, //Material Colour -1, -1, -1, -1, -1, //Radiation - new MaterialStack[]{ - new MaterialStack(ELEMENT.getInstance().YTTRIUM, 2), - new MaterialStack(ELEMENT.getInstance().THORIUM, 2), - new MaterialStack(ELEMENT.getInstance().SILICON, 2), - new MaterialStack(ELEMENT.getInstance().OXYGEN, 7), + new MaterialStack[]{// ((Ca,Ce)(Al,Ti,Mg)12O19) + new MaterialStack(ELEMENT.getInstance().CALCIUM, 1), + new MaterialStack(ELEMENT.getInstance().CERIUM, 1), + new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 12), + new MaterialStack(ELEMENT.getInstance().TITANIUM, 12), + new MaterialStack(ELEMENT.getInstance().MAGNESIUM, 12), + new MaterialStack(ELEMENT.getInstance().OXYGEN, 19), }); - - public static final Material YTTROCERITE = new Material( - "Yttrocerite", //Material Name + + //Honeaite + //Au3TlTe2 + public static final Material HONEAITE = new Material( + "Honeaite", //Material Name MaterialState.ORE, //State - TextureSet.SET_DIAMOND, //Texture Set - new short[]{35, 19, 199, 0}, //Material Colour + TextureSet.SET_FINE, //Texture Set + new short[]{165, 165, 5, 0}, //Material Colour -1, -1, -1, -1, - -1, //Radiation - new MaterialStack[]{ - new MaterialStack(ELEMENT.getInstance().CERIUM, 1), - new MaterialStack(ELEMENT.getInstance().CALCIUM, 1), - new MaterialStack(ELEMENT.getInstance().FLUORINE, 5), - new MaterialStack(ELEMENT.getInstance().YTTRIUM, 1), + 0, //Radiation + new MaterialStack[]{// Na3AlF6 + new MaterialStack(ELEMENT.getInstance().GOLD, 3), + new MaterialStack(ELEMENT.getInstance().THALLIUM, 1), + new MaterialStack(ELEMENT.getInstance().TELLURIUM, 2) }); - public static final Material POLYCRASE = new Material( - "Polycrase", //Material Name + //Irarsite + //(Ir,Ru,Rh,Pt)AsS + public static final Material IRARSITE = new Material( + "Irarsite", //Material Name MaterialState.ORE, //State - TextureSet.SET_ROUGH, //Texture Set - new short[]{51, 0, 11, 0}, //Material Colour + TextureSets.ENRICHED.get(), //Texture Set + new short[]{125, 105, 105, 0}, //Material Colour -1, -1, -1, -1, - -1, //Radiation - new MaterialStack[]{ - new MaterialStack(ELEMENT.getInstance().YTTRIUM, 1), - new MaterialStack(ELEMENT.getInstance().CALCIUM, 1), - new MaterialStack(ELEMENT.getInstance().CERIUM, 1), - new MaterialStack(ELEMENT.getInstance().URANIUM235, 1), - new MaterialStack(ELEMENT.getInstance().THORIUM, 1), - new MaterialStack(ELEMENT.getInstance().TITANIUM, 2), - new MaterialStack(ELEMENT.getInstance().NIOBIUM, 2), - new MaterialStack(ELEMENT.getInstance().TANTALUM, 2), - new MaterialStack(ELEMENT.getInstance().OXYGEN, 6) + 0, //Radiation + new MaterialStack[]{// Na3AlF6 + new MaterialStack(ELEMENT.getInstance().IRIDIUM, 1), + new MaterialStack(ELEMENT.getInstance().RUTHENIUM, 1), + new MaterialStack(ELEMENT.getInstance().RHODIUM, 1), + new MaterialStack(ELEMENT.getInstance().PLATINUM, 1), + new MaterialStack(ELEMENT.getInstance().ARSENIC, 1), + new MaterialStack(ELEMENT.getInstance().SULFUR, 1), + new MaterialStack(ELEMENT.getInstance().OXYGEN, 1) }); - public static final Material ZIRCOPHYLLITE = new Material( - "Zircophyllite", //Material Name + //Kashinite + //(Ir,Rh)2S3 + public static final Material KASHINITE = new Material( + "Kashinite", //Material Name MaterialState.ORE, //State - TextureSets.REFINED.get(), //Texture Set - new short[]{30, 0, 6, 0}, //Material Colour + TextureSet.SET_SHINY, //Texture Set + new short[]{75, 105, 75, 0}, //Material Colour -1, -1, -1, -1, - -1, //Radiation - new MaterialStack[]{ - new MaterialStack(ELEMENT.getInstance().POTASSIUM, 3), - new MaterialStack(ELEMENT.getInstance().SODIUM, 3), - new MaterialStack(ELEMENT.getInstance().MANGANESE, 7), - new MaterialStack(ELEMENT.getInstance().IRON, 7), - new MaterialStack(ELEMENT.getInstance().ZIRCONIUM, 2), - new MaterialStack(ELEMENT.getInstance().TITANIUM, 2), - new MaterialStack(ELEMENT.getInstance().NIOBIUM, 2), - new MaterialStack(ELEMENT.getInstance().SILICON, 8), - new MaterialStack(ELEMENT.getInstance().OXYGEN, 13), - new MaterialStack(ELEMENT.getInstance().FLUORINE, 7), + 0, //Radiation + new MaterialStack[]{// Na3AlF6 + new MaterialStack(ELEMENT.getInstance().IRIDIUM, 2), + new MaterialStack(ELEMENT.getInstance().RHODIUM, 2), + new MaterialStack(ELEMENT.getInstance().SULFUR, 3) }); - public static final Material ZIRKELITE = new Material( - "Zirkelite", //Material Name + // Tl(Cl,Br) + public static final Material LAFOSSAITE = new Material( + "Lafossaite", //Material Name MaterialState.ORE, //State - TextureSets.GEM_A.get(), //Texture Set - new short[]{229, 208, 48, 0}, //Material Colour + TextureSets.REFINED.get(), //Texture Set + new short[]{165, 105, 205, 0}, //Material Colour -1, -1, -1, -1, -1, //Radiation - new MaterialStack[]{// (Ca,Th,Ce)Zr(Ti,Nb)2O7 - new MaterialStack(ELEMENT.getInstance().CALCIUM, 1), - new MaterialStack(ELEMENT.getInstance().THORIUM, 1), - new MaterialStack(ELEMENT.getInstance().CERIUM, 1), - new MaterialStack(ELEMENT.getInstance().ZIRCONIUM, 1), - new MaterialStack(ELEMENT.getInstance().TITANIUM, 2), - new MaterialStack(ELEMENT.getInstance().NIOBIUM, 2), - new MaterialStack(ELEMENT.getInstance().OXYGEN, 7) + new MaterialStack[]{// Na3AlF6 + new MaterialStack(ELEMENT.getInstance().CHLORINE, 1), + new MaterialStack(ELEMENT.getInstance().BROMINE, 1), + new MaterialStack(ELEMENT.getInstance().THALLIUM, 1) }); - public static final Material LANTHANITE_LA = new Material( - "Lanthanite (La)", //Material Name + public static final Material LANTHANITE_CE = new Material( + "Lanthanite (Ce)", //Material Name MaterialState.ORE, //State - TextureSets.REFINED.get(), //Texture Set - new short[]{219, 160, 214, 0}, //Material Colour + TextureSet.SET_METALLIC, //Texture Set + new short[]{186, 113, 179, 0}, //Material Colour -1, -1, -1, -1, -1, //Radiation - new MaterialStack[]{// (La)2(CO3)3·8(H2O) - new MaterialStack(ELEMENT.getInstance().LANTHANUM, 2), + new MaterialStack[]{// (Ce)2(CO3)3·8(H2O) + new MaterialStack(ELEMENT.getInstance().CERIUM, 2), new MaterialStack(ELEMENT.getInstance().OXYGEN, 3), new MaterialStack(ELEMENT.getInstance().CALCIUM, 3), new MaterialStack(ELEMENT.getInstance().HYDROGEN, 2), new MaterialStack(ELEMENT.getInstance().OXYGEN, 1), }); - public static final Material LANTHANITE_CE = new Material( - "Lanthanite (Ce)", //Material Name + public static final Material LANTHANITE_LA = new Material( + "Lanthanite (La)", //Material Name MaterialState.ORE, //State - TextureSet.SET_METALLIC, //Texture Set - new short[]{186, 113, 179, 0}, //Material Colour + TextureSets.REFINED.get(), //Texture Set + new short[]{219, 160, 214, 0}, //Material Colour -1, -1, -1, -1, -1, //Radiation - new MaterialStack[]{// (Ce)2(CO3)3·8(H2O) - new MaterialStack(ELEMENT.getInstance().CERIUM, 2), + new MaterialStack[]{// (La)2(CO3)3·8(H2O) + new MaterialStack(ELEMENT.getInstance().LANTHANUM, 2), new MaterialStack(ELEMENT.getInstance().OXYGEN, 3), new MaterialStack(ELEMENT.getInstance().CALCIUM, 3), new MaterialStack(ELEMENT.getInstance().HYDROGEN, 2), @@ -422,399 +457,369 @@ public final class ORES { new MaterialStack(ELEMENT.getInstance().OXYGEN, 1), }); - public static final Material HIBONITE = new Material( - "Hibonite", //Material Name + //Iodine Source + public static final Material LAUTARITE = new Material( + "Lautarite", //Material Name MaterialState.ORE, //State - TextureSet.SET_METALLIC, //Texture Set - new short[]{58, 31, 0, 0}, //Material Colour + TextureSet.SET_FINE, //Texture Set + new short[]{165, 105, 205, 0}, //Material Colour -1, -1, -1, -1, -1, //Radiation - new MaterialStack[]{// ((Ca,Ce)(Al,Ti,Mg)12O19) + new MaterialStack[]{// Na3AlF6 new MaterialStack(ELEMENT.getInstance().CALCIUM, 1), - new MaterialStack(ELEMENT.getInstance().CERIUM, 1), - new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 12), - new MaterialStack(ELEMENT.getInstance().TITANIUM, 12), - new MaterialStack(ELEMENT.getInstance().MAGNESIUM, 12), - new MaterialStack(ELEMENT.getInstance().OXYGEN, 19), + new MaterialStack(ELEMENT.getInstance().IODINE, 2), + new MaterialStack(ELEMENT.getInstance().OXYGEN, 6) }); - public static final Material CERITE = new Material( - "Cerite", //Material Name + public static final Material LEPERSONNITE = new Material( + "Lepersonnite", //Material Name MaterialState.ORE, //State - TextureSets.REFINED.get(), //Texture Set - new short[]{68, 13, 0, 0}, //Material Colour + TextureSet.SET_EMERALD, //Texture Set + new short[]{175, 175, 20, 0}, //Material Colour -1, -1, -1, -1, -1, //Radiation - new MaterialStack[]{// (Ce,La,Ca)9(Mg,Fe+3)(SiO4)6(SiO3OH)(OH)3 - new MaterialStack(ELEMENT.getInstance().CERIUM, 9), - new MaterialStack(ELEMENT.getInstance().LANTHANUM, 9), - new MaterialStack(ELEMENT.getInstance().CALCIUM, 9), - new MaterialStack(ELEMENT.getInstance().MAGNESIUM, 3), - new MaterialStack(ELEMENT.getInstance().IRON, 3), - new MaterialStack(ELEMENT.getInstance().SILICON, 7), - new MaterialStack(ELEMENT.getInstance().OXYGEN, 20), - new MaterialStack(ELEMENT.getInstance().HYDROGEN, 4) + new MaterialStack[]{ + new MaterialStack(ELEMENT.getInstance().CALCIUM, 1), + new MaterialStack(ELEMENT.getInstance().YTTERBIUM, 3), + new MaterialStack(ELEMENT.getInstance().GADOLINIUM, 2), + new MaterialStack(ELEMENT.getInstance().DYSPROSIUM, 2), + new MaterialStack(ELEMENT.getInstance().URANIUM235, 2), + new MaterialStack(ELEMENT.getInstance().OXYGEN,29), + new MaterialStack(ELEMENT.getInstance().HYDROGEN, 24) }); - public static final Material AGARDITE_Y = new Material( - "Agardite (Y)", //Material Name + //Miessiite + //Pd11Te2Se2 + public static final Material MIESSIITE = new Material( + "Miessiite", //Material Name MaterialState.ORE, //State - TextureSet.SET_METALLIC, //Texture Set - new short[]{210, 232, 44, 0}, //Material Colour + TextureSet.SET_FINE, //Texture Set + new short[]{75, 75, 75, 0}, //Material Colour -1, -1, -1, -1, - -1, //Radiation - new MaterialStack[]{// (YCa)Cu5(As2O4)3(OH)6·3H2O - new MaterialStack(ELEMENT.getInstance().YTTRIUM, 1), - new MaterialStack(ELEMENT.getInstance().CALCIUM, 1), - new MaterialStack(ELEMENT.getInstance().COPPER, 5), - new MaterialStack(ELEMENT.getInstance().ARSENIC, 6), - new MaterialStack(ELEMENT.getInstance().OXYGEN, 21), - new MaterialStack(ELEMENT.getInstance().HYDROGEN, 12) + 0, //Radiation + new MaterialStack[]{// Na3AlF6 + new MaterialStack(ELEMENT.getInstance().PALLADIUM, 11), + new MaterialStack(ELEMENT.getInstance().TELLURIUM, 2), + new MaterialStack(ELEMENT.getInstance().SELENIUM, 2) }); - public static final Material AGARDITE_CD = new Material( - "Agardite (Cd)", //Material Name + public static final Material NICHROMITE = new Material( + "Nichromite", //Material Name MaterialState.ORE, //State TextureSet.SET_METALLIC, //Texture Set - new short[]{170, 188, 33, 0}, //Material Colour + new short[]{22, 19, 19, 0}, //Material Colour -1, -1, -1, -1, -1, //Radiation - new MaterialStack[]{// (CdCa)Cu7(AsO2)4(O2H)5·3H2O - new MaterialStack(ELEMENT.getInstance().CADMIUM, 1), - new MaterialStack(ELEMENT.getInstance().CALCIUM, 1), - new MaterialStack(ELEMENT.getInstance().COPPER, 7), - new MaterialStack(ELEMENT.getInstance().ARSENIC, 4), - new MaterialStack(ELEMENT.getInstance().OXYGEN, 21), - new MaterialStack(ELEMENT.getInstance().HYDROGEN, 11) + new MaterialStack[]{ + new MaterialStack(ELEMENT.getInstance().NICKEL, 1), + new MaterialStack(ELEMENT.getInstance().COBALT, 1), + new MaterialStack(ELEMENT.getInstance().IRON, 3), + new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 2), + new MaterialStack(ELEMENT.getInstance().CHROMIUM, 2), + new MaterialStack(ELEMENT.getInstance().OXYGEN, 8) }); - public static final Material AGARDITE_LA = new Material( - "Agardite (La)", //Material Name + //Perroudite + //Hg5Ag4S5(I,Br)2Cl2 + public static final Material PERROUDITE = new Material( + "Perroudite", //Material Name MaterialState.ORE, //State - TextureSet.SET_FINE, //Texture Set - new short[]{206, 232, 9, 0}, //Material Colour + TextureSet.SET_METALLIC, //Texture Set + new short[]{77, 165, 174, 0}, //Material Colour -1, -1, -1, -1, - -1, //Radiation - new MaterialStack[]{// (LaCa)Cu5(AsO6)2(OH)4·3H2O - new MaterialStack(ELEMENT.getInstance().LANTHANUM, 1), - new MaterialStack(ELEMENT.getInstance().CALCIUM, 1), - new MaterialStack(ELEMENT.getInstance().COPPER, 5), - new MaterialStack(ELEMENT.getInstance().ARSENIC, 2), - new MaterialStack(ELEMENT.getInstance().OXYGEN, 19), - new MaterialStack(ELEMENT.getInstance().HYDROGEN, 10) + 0, //Radiation + new MaterialStack[]{ + new MaterialStack(ELEMENT.getInstance().SULFUR, 5), + new MaterialStack(ELEMENT.getInstance().SILVER, 4), + new MaterialStack(ELEMENT.getInstance().IODINE, 2), + new MaterialStack(ELEMENT.getInstance().MERCURY, 5), + new MaterialStack(ELEMENT.getInstance().BROMINE, 2), + new MaterialStack(ELEMENT.getInstance().CHLORINE, 2) }); - public static final Material AGARDITE_ND = new Material( - "Agardite (Nd)", //Material Name + public static final Material POLYCRASE = new Material( + "Polycrase", //Material Name MaterialState.ORE, //State - TextureSet.SET_METALLIC, //Texture Set - new short[]{225, 244, 78, 0}, //Material Colour + TextureSet.SET_ROUGH, //Texture Set + new short[]{51, 0, 11, 0}, //Material Colour -1, -1, -1, -1, -1, //Radiation - new MaterialStack[]{// (NdCa)Cu6(As3O3)2(O2H)6·3H2O - new MaterialStack(ELEMENT.getInstance().NEODYMIUM, 1), + new MaterialStack[]{ + new MaterialStack(ELEMENT.getInstance().YTTRIUM, 1), new MaterialStack(ELEMENT.getInstance().CALCIUM, 1), - new MaterialStack(ELEMENT.getInstance().COPPER, 6), - new MaterialStack(ELEMENT.getInstance().ARSENIC, 6), - new MaterialStack(ELEMENT.getInstance().OXYGEN, 21), - new MaterialStack(ELEMENT.getInstance().HYDROGEN, 12) + new MaterialStack(ELEMENT.getInstance().CERIUM, 1), + new MaterialStack(ELEMENT.getInstance().URANIUM235, 1), + new MaterialStack(ELEMENT.getInstance().THORIUM, 1), + new MaterialStack(ELEMENT.getInstance().TITANIUM, 2), + new MaterialStack(ELEMENT.getInstance().NIOBIUM, 2), + new MaterialStack(ELEMENT.getInstance().TANTALUM, 2), + new MaterialStack(ELEMENT.getInstance().OXYGEN, 6) }); - - public static final Material FLUORCAPHITE = new Material( - "Fluorcaphite", //Material Name + + //Radiobarite + //Radium, Barium, Barite? + public static final Material RADIOBARITE = new Material( + "Barite (Rd)", //Material Name MaterialState.ORE, //State - TextureSet.SET_FINE, //Texture Set - new short[]{255, 255, 30, 0}, //Material Colour + TextureSet.SET_FLINT, //Texture Set + new short[]{205, 205, 205, 0}, //Material Colour -1, -1, -1, -1, - -1, //Radiation - new MaterialStack[]{// (Ca,Sr,Ce,Na)5(PO4)3F - new MaterialStack(ELEMENT.getInstance().CALCIUM, 5), - new MaterialStack(MISC_MATERIALS.STRONTIUM_OXIDE, 5), - new MaterialStack(ELEMENT.getInstance().CERIUM, 5), - new MaterialStack(ELEMENT.getInstance().SODIUM, 5), - new MaterialStack(ELEMENT.getInstance().PHOSPHORUS, 3), - new MaterialStack(ELEMENT.getInstance().OXYGEN, 12), - new MaterialStack(ELEMENT.getInstance().FLUORINE, 6), - }); + 0, //Radiation + new MaterialStack[]{// Na3AlF6 + new MaterialStack(ELEMENT.getInstance().BARIUM, 32), + new MaterialStack(ELEMENT.getInstance().RADIUM, 1), + new MaterialStack(ELEMENT.getInstance().SULFUR, 16), + new MaterialStack(ELEMENT.getInstance().OXYGEN, 15) + }); - public static final Material FLORENCITE = new Material( - "Florencite", //Material Name + //Samarskite_Y + public static final Material SAMARSKITE_Y = new Material( + "Samarskite (Y)", //Material Name MaterialState.ORE, //State - TextureSet.SET_METALLIC, //Texture Set - new short[]{249, 249, 124, 0}, //Material Colour + TextureSets.ENRICHED.get(), //Texture Set + new short[]{65, 163, 164, 0}, //Material Colour -1, -1, -1, -1, -1, //Radiation - new MaterialStack[]{// SmAl3(PO4)2(OH)6 - new MaterialStack(ELEMENT.getInstance().SAMARIUM, 1), - new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 3), - new MaterialStack(ELEMENT.getInstance().PHOSPHORUS, 1), - new MaterialStack(ELEMENT.getInstance().OXYGEN, 10), - new MaterialStack(ELEMENT.getInstance().HYDROGEN, 6) + new MaterialStack[]{ + new MaterialStack(ELEMENT.getInstance().YTTRIUM, 2), //Y not YT/YB + new MaterialStack(ELEMENT.getInstance().IRON, 10), + new MaterialStack(ELEMENT.getInstance().URANIUM235, 2), + new MaterialStack(ELEMENT.getInstance().THORIUM, 3), + new MaterialStack(ELEMENT.getInstance().NIOBIUM, 2), + new MaterialStack(ELEMENT.getInstance().TANTALUM, 3) }); - public static final Material CRYOLITE = new Material( - "Cryolite", //Material Name + //Samarskite_YB + public static final Material SAMARSKITE_YB = new Material( + "Samarskite (Yb)", //Material Name MaterialState.ORE, //State - TextureSet.SET_SHINY, //Texture Set - new short[]{205, 205, 255, 0}, //Material Colour + TextureSets.ENRICHED.get(), //Texture Set + new short[]{95, 193, 194, 0}, //Material Colour -1, -1, -1, -1, -1, //Radiation - new MaterialStack[]{// Na3AlF6 - new MaterialStack(ELEMENT.getInstance().SODIUM, 3), - new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 1), - new MaterialStack(ELEMENT.getInstance().FLUORINE, 6) + new MaterialStack[]{ + new MaterialStack(ELEMENT.getInstance().YTTERBIUM, 2), //Y not YT/YB + new MaterialStack(ELEMENT.getInstance().IRON, 9), + new MaterialStack(ELEMENT.getInstance().URANIUM235, 3), + new MaterialStack(ELEMENT.getInstance().THORIUM, 2), + new MaterialStack(ELEMENT.getInstance().NIOBIUM, 3), + new MaterialStack(ELEMENT.getInstance().TANTALUM, 2) }); - - //Iodine Source - public static final Material LAUTARITE = new Material( - "Lautarite", //Material Name - MaterialState.ORE, //State - TextureSet.SET_FINE, //Texture Set - new short[]{165, 105, 205, 0}, //Material Colour - -1, - -1, - -1, - -1, - -1, //Radiation - new MaterialStack[]{// Na3AlF6 - new MaterialStack(ELEMENT.getInstance().CALCIUM, 1), - new MaterialStack(ELEMENT.getInstance().IODINE, 2), - new MaterialStack(ELEMENT.getInstance().OXYGEN, 6) - }); - // Tl(Cl,Br) - public static final Material LAFOSSAITE = new Material( - "Lafossaite", //Material Name + public static final Material TITANITE = new Material( + "Titanite", //Material Name MaterialState.ORE, //State - TextureSets.REFINED.get(), //Texture Set - new short[]{165, 105, 205, 0}, //Material Colour + TextureSet.SET_METALLIC, //Texture Set + new short[]{184, 198, 105, 0}, //Material Colour -1, -1, -1, -1, -1, //Radiation - new MaterialStack[]{// Na3AlF6 - new MaterialStack(ELEMENT.getInstance().CHLORINE, 1), - new MaterialStack(ELEMENT.getInstance().BROMINE, 1), - new MaterialStack(ELEMENT.getInstance().THALLIUM, 1) + new MaterialStack[]{ + new MaterialStack(ELEMENT.getInstance().CALCIUM, 2), + new MaterialStack(ELEMENT.getInstance().TITANIUM, 2), + new MaterialStack(ELEMENT.getInstance().SILICON, 2), + new MaterialStack(ELEMENT.getInstance().THORIUM, 1), + new MaterialStack(ELEMENT.getInstance().OXYGEN, 10) }); - //Demicheleite-(Br) - // BiSBr - public static final Material DEMICHELEITE_BR = new Material( - "Demicheleite (Br)", //Material Name + public static final Material XENOTIME = new Material( + "Xenotime", //Material Name MaterialState.ORE, //State - TextureSet.SET_SHINY, //Texture Set - new short[]{165, 75, 75, 0}, //Material Colour + TextureSet.SET_OPAL, //Texture Set + new short[]{235, 89, 199, 0}, //Material Colour -1, -1, -1, -1, -1, //Radiation - new MaterialStack[]{// Na3AlF6 - new MaterialStack(ELEMENT.getInstance().BISMUTH, 13), - new MaterialStack(ELEMENT.getInstance().SULFUR, 11), - new MaterialStack(ELEMENT.getInstance().BROMINE, 1) - }); - - //Comancheite - //Hg55N24(NH2,OH)4(Cl,Br)34 - public static final Material COMANCHEITE = new Material( - "Comancheite", //Material Name - MaterialState.ORE, //State - TextureSets.REFINED.get(), //Texture Set - new short[]{65, 205, 105, 0}, //Material Colour - -1, - -1, - -1, - -1, - 0, //Radiation - new MaterialStack[]{// Na3AlF6 - new MaterialStack(ELEMENT.getInstance().MERCURY, 54/4), - new MaterialStack(ELEMENT.getInstance().NITROGEN, 28/4), - new MaterialStack(ELEMENT.getInstance().HYDROGEN, 12/4), - new MaterialStack(ELEMENT.getInstance().OXYGEN, 8/4), - new MaterialStack(ELEMENT.getInstance().CHLORINE, 34/4), - new MaterialStack(ELEMENT.getInstance().BROMINE, 34/4) + new MaterialStack[]{ + new MaterialStack(ELEMENT.getInstance().YTTRIUM, 2), + new MaterialStack(ELEMENT.getInstance().YTTERBIUM, 2), + new MaterialStack(ELEMENT.getInstance().ERBIUM, 2), + new MaterialStack(ELEMENT.getInstance().EUROPIUM, 1), + new MaterialStack(ELEMENT.getInstance().PHOSPHORUS, 2), + new MaterialStack(ELEMENT.getInstance().OXYGEN, 8) }); - //Perroudite - //Hg5Ag4S5(I,Br)2Cl2 - public static final Material PERROUDITE = new Material( - "Perroudite", //Material Name + public static final Material YTTRIAITE = new Material( //TODO + "Yttriaite", //Material Name MaterialState.ORE, //State TextureSet.SET_METALLIC, //Texture Set - new short[]{77, 165, 174, 0}, //Material Colour + new short[]{255, 143, 84, 0}, //Material Colour -1, -1, -1, -1, - 0, //Radiation + -1, //Radiation new MaterialStack[]{ - new MaterialStack(ELEMENT.getInstance().SULFUR, 5), - new MaterialStack(ELEMENT.getInstance().SILVER, 4), - new MaterialStack(ELEMENT.getInstance().IODINE, 2), - new MaterialStack(ELEMENT.getInstance().MERCURY, 5), - new MaterialStack(ELEMENT.getInstance().BROMINE, 2), - new MaterialStack(ELEMENT.getInstance().CHLORINE, 2) + new MaterialStack(ELEMENT.getInstance().YTTRIUM, 1), //Y not YT/YB + new MaterialStack(ELEMENT.getInstance().OXYGEN, 3), + new MaterialStack(ELEMENT.getInstance().IRON, 4), + new MaterialStack(ELEMENT.getInstance().TIN, 1), + new MaterialStack(ELEMENT.getInstance().NITROGEN, 2) }); - //Honeaite - //Au3TlTe2 - public static final Material HONEAITE = new Material( - "Honeaite", //Material Name + public static final Material YTTRIALITE = new Material( + "Yttrialite", //Material Name MaterialState.ORE, //State - TextureSet.SET_FINE, //Texture Set - new short[]{165, 165, 5, 0}, //Material Colour + TextureSet.SET_RUBY, //Texture Set + new short[]{35, 189, 99, 0}, //Material Colour -1, -1, -1, -1, - 0, //Radiation - new MaterialStack[]{// Na3AlF6 - new MaterialStack(ELEMENT.getInstance().GOLD, 3), - new MaterialStack(ELEMENT.getInstance().THALLIUM, 1), - new MaterialStack(ELEMENT.getInstance().TELLURIUM, 2) + -1, //Radiation + new MaterialStack[]{ + new MaterialStack(ELEMENT.getInstance().YTTRIUM, 2), + new MaterialStack(ELEMENT.getInstance().THORIUM, 2), + new MaterialStack(ELEMENT.getInstance().SILICON, 2), + new MaterialStack(ELEMENT.getInstance().OXYGEN, 7), }); - //Alburnite - //Ag8GeTe2S4 - public static final Material ALBURNITE = new Material( - "Alburnite", //Material Name + public static final Material YTTROCERITE = new Material( + "Yttrocerite", //Material Name MaterialState.ORE, //State - TextureSet.SET_METALLIC, //Texture Set - new short[]{16, 5, 105, 0}, //Material Colour + TextureSet.SET_DIAMOND, //Texture Set + new short[]{35, 19, 199, 0}, //Material Colour -1, -1, -1, -1, - 0, //Radiation - new MaterialStack[]{// Na3AlF6 - new MaterialStack(ELEMENT.getInstance().GOLD, 8), - new MaterialStack(ELEMENT.getInstance().GERMANIUM, 1), - new MaterialStack(ELEMENT.getInstance().TELLURIUM, 2), - new MaterialStack(ELEMENT.getInstance().SULFUR, 4) + -1, //Radiation + new MaterialStack[]{ + new MaterialStack(ELEMENT.getInstance().CERIUM, 1), + new MaterialStack(ELEMENT.getInstance().CALCIUM, 1), + new MaterialStack(ELEMENT.getInstance().FLUORINE, 5), + new MaterialStack(ELEMENT.getInstance().YTTRIUM, 1), }); - //Miessiite - //Pd11Te2Se2 - public static final Material MIESSIITE = new Material( - "Miessiite", //Material Name + public static final Material ZIMBABWEITE = new Material( + "Zimbabweite", //Material Name MaterialState.ORE, //State TextureSet.SET_FINE, //Texture Set - new short[]{75, 75, 75, 0}, //Material Colour + new short[]{193, 187, 131, 0}, //Material Colour -1, -1, -1, -1, - 0, //Radiation - new MaterialStack[]{// Na3AlF6 - new MaterialStack(ELEMENT.getInstance().PALLADIUM, 11), - new MaterialStack(ELEMENT.getInstance().TELLURIUM, 2), - new MaterialStack(ELEMENT.getInstance().SELENIUM, 2) + -1, //Radiation + new MaterialStack[]{ + new MaterialStack(ELEMENT.getInstance().CALCIUM, 2), + new MaterialStack(ELEMENT.getInstance().POTASSIUM, 2), + new MaterialStack(ELEMENT.getInstance().LEAD, 1), + new MaterialStack(ELEMENT.getInstance().ARSENIC, 4), + new MaterialStack(ELEMENT.getInstance().NIOBIUM, 4), + new MaterialStack(ELEMENT.getInstance().TANTALUM, 4), + new MaterialStack(ELEMENT.getInstance().TITANIUM, 4), + new MaterialStack(ELEMENT.getInstance().OXYGEN, 18) }); - //Kashinite - //(Ir,Rh)2S3 - public static final Material KASHINITE = new Material( - "Kashinite", //Material Name + public static final Material ZIRCON = new Material( + "Zircon", //Material Name MaterialState.ORE, //State - TextureSet.SET_SHINY, //Texture Set - new short[]{75, 105, 75, 0}, //Material Colour + TextureSets.GEM_A.get(), //Texture Set + new short[]{195, 19, 19, 0}, //Material Colour -1, -1, -1, -1, - 0, //Radiation - new MaterialStack[]{// Na3AlF6 - new MaterialStack(ELEMENT.getInstance().IRIDIUM, 2), - new MaterialStack(ELEMENT.getInstance().RHODIUM, 2), - new MaterialStack(ELEMENT.getInstance().SULFUR, 3) + -1, //Radiation + new MaterialStack[]{ + new MaterialStack(ELEMENT.getInstance().ZIRCONIUM, 1), + new MaterialStack(ELEMENT.getInstance().SILICON, 1), + new MaterialStack(ELEMENT.getInstance().OXYGEN, 4), }); - //Irarsite - //(Ir,Ru,Rh,Pt)AsS - public static final Material IRARSITE = new Material( - "Irarsite", //Material Name + public static final Material ZIRCONILITE = new Material( + "Zirconolite", //Material Name MaterialState.ORE, //State - TextureSets.ENRICHED.get(), //Texture Set - new short[]{125, 105, 105, 0}, //Material Colour + TextureSet.SET_FINE, //Texture Set + new short[]{45, 26, 0, 0}, //Material Colour -1, -1, -1, -1, - 0, //Radiation - new MaterialStack[]{// Na3AlF6 - new MaterialStack(ELEMENT.getInstance().IRIDIUM, 1), - new MaterialStack(ELEMENT.getInstance().RUTHENIUM, 1), - new MaterialStack(ELEMENT.getInstance().RHODIUM, 1), - new MaterialStack(ELEMENT.getInstance().PLATINUM, 1), - new MaterialStack(ELEMENT.getInstance().ARSENIC, 1), - new MaterialStack(ELEMENT.getInstance().SULFUR, 1), - new MaterialStack(ELEMENT.getInstance().OXYGEN, 1) + -1, //Radiation + new MaterialStack[]{ + new MaterialStack(ELEMENT.getInstance().CALCIUM, 2), + new MaterialStack(ELEMENT.getInstance().ZIRCONIUM, 2), + new MaterialStack(ELEMENT.getInstance().TITANIUM, 4), + new MaterialStack(ELEMENT.getInstance().CERIUM, 1), + new MaterialStack(ELEMENT.getInstance().OXYGEN, 14) }); - - //Radiobarite - //Radium, Barium, Barite? - public static final Material RADIOBARITE = new Material( - "Barite (Rd)", //Material Name + + public static final Material ZIRCOPHYLLITE = new Material( + "Zircophyllite", //Material Name MaterialState.ORE, //State - TextureSet.SET_FLINT, //Texture Set - new short[]{205, 205, 205, 0}, //Material Colour + TextureSets.REFINED.get(), //Texture Set + new short[]{30, 0, 6, 0}, //Material Colour -1, -1, -1, -1, - 0, //Radiation - new MaterialStack[]{// Na3AlF6 - new MaterialStack(ELEMENT.getInstance().BARIUM, 32), - new MaterialStack(ELEMENT.getInstance().RADIUM, 1), - new MaterialStack(ELEMENT.getInstance().SULFUR, 16), - new MaterialStack(ELEMENT.getInstance().OXYGEN, 15) + -1, //Radiation + new MaterialStack[]{ + new MaterialStack(ELEMENT.getInstance().POTASSIUM, 3), + new MaterialStack(ELEMENT.getInstance().SODIUM, 3), + new MaterialStack(ELEMENT.getInstance().MANGANESE, 7), + new MaterialStack(ELEMENT.getInstance().IRON, 7), + new MaterialStack(ELEMENT.getInstance().ZIRCONIUM, 2), + new MaterialStack(ELEMENT.getInstance().TITANIUM, 2), + new MaterialStack(ELEMENT.getInstance().NIOBIUM, 2), + new MaterialStack(ELEMENT.getInstance().SILICON, 8), + new MaterialStack(ELEMENT.getInstance().OXYGEN, 13), + new MaterialStack(ELEMENT.getInstance().FLUORINE, 7), }); + - public static final Material GREENOCKITE = new Material( - "Greenockite", //Material Name + public static final Material ZIRKELITE = new Material( + "Zirkelite", //Material Name MaterialState.ORE, //State TextureSets.GEM_A.get(), //Texture Set - new short[]{110, 193, 25, 0}, //Material Colour + new short[]{229, 208, 48, 0}, //Material Colour -1, -1, -1, -1, -1, //Radiation - new MaterialStack[]{ - new MaterialStack(ELEMENT.getInstance().CADMIUM, 2), - new MaterialStack(ELEMENT.getInstance().SULFUR, 2), + new MaterialStack[]{// (Ca,Th,Ce)Zr(Ti,Nb)2O7 + new MaterialStack(ELEMENT.getInstance().CALCIUM, 1), + new MaterialStack(ELEMENT.getInstance().THORIUM, 1), + new MaterialStack(ELEMENT.getInstance().CERIUM, 1), + new MaterialStack(ELEMENT.getInstance().ZIRCONIUM, 1), + new MaterialStack(ELEMENT.getInstance().TITANIUM, 2), + new MaterialStack(ELEMENT.getInstance().NIOBIUM, 2), + new MaterialStack(ELEMENT.getInstance().OXYGEN, 7) }); - public static final Material DEEP_EARTH_REACTOR_FUEL_DEPOSIT = new Material( "Radioactive Mineral Mix", //Material Name diff --git a/src/Java/gtPlusPlus/core/material/Particle.java b/src/main/java/gtPlusPlus/core/material/Particle.java index e93129ec58..e93129ec58 100644 --- a/src/Java/gtPlusPlus/core/material/Particle.java +++ b/src/main/java/gtPlusPlus/core/material/Particle.java diff --git a/src/Java/gtPlusPlus/core/material/gregtech/CustomGTMaterials.java b/src/main/java/gtPlusPlus/core/material/gregtech/CustomGTMaterials.java index 20aebb80ed..20aebb80ed 100644 --- a/src/Java/gtPlusPlus/core/material/gregtech/CustomGTMaterials.java +++ b/src/main/java/gtPlusPlus/core/material/gregtech/CustomGTMaterials.java diff --git a/src/Java/gtPlusPlus/core/material/nuclear/FLUORIDES.java b/src/main/java/gtPlusPlus/core/material/nuclear/FLUORIDES.java index bfa08d3c29..d5c6e4a6bf 100644 --- a/src/Java/gtPlusPlus/core/material/nuclear/FLUORIDES.java +++ b/src/main/java/gtPlusPlus/core/material/nuclear/FLUORIDES.java @@ -1,7 +1,6 @@ package gtPlusPlus.core.material.nuclear; import gregtech.api.enums.Materials; -import gregtech.api.enums.TextureSet; import gtPlusPlus.core.material.ELEMENT; import gtPlusPlus.core.material.MISC_MATERIALS; import gtPlusPlus.core.material.Material; @@ -11,7 +10,7 @@ import gtPlusPlus.core.material.state.MaterialState; public class FLUORIDES { public static final Material FLUORITE = new Material( - "Fluorite", //Material Name + "Fluorite (F)", //Material Name MaterialState.ORE, //State null, //Material Colour Materials.Fluorine.mMeltingPoint, //Melting Point in C @@ -263,6 +262,21 @@ public class FLUORIDES { new MaterialStack(ELEMENT.getInstance().SELENIUM, 1), new MaterialStack(ELEMENT.getInstance().FLUORINE, 6) }); + + public static final Material SODIUM_FLUORIDE = new Material( + "Sodium Fluoride", //Material Name + MaterialState.PURE_LIQUID, //State + null, //Material Colour + -1, //Melting Point in C + -1, //Boiling Point in C + -1, //Protons + -1, //Neutrons + false, //Uses Blast furnace? + //Material Stacks with Percentage of required elements. + new MaterialStack[]{ + new MaterialStack(ELEMENT.getInstance().SODIUM, 1), + new MaterialStack(ELEMENT.getInstance().FLUORINE, 1) + }); private static final FLUORIDES INSTANCE = new FLUORIDES(); public static FLUORIDES getInstance(){return INSTANCE;} diff --git a/src/main/java/gtPlusPlus/core/material/nuclear/NUCLIDE.java b/src/main/java/gtPlusPlus/core/material/nuclear/NUCLIDE.java new file mode 100644 index 0000000000..9bc7459f0e --- /dev/null +++ b/src/main/java/gtPlusPlus/core/material/nuclear/NUCLIDE.java @@ -0,0 +1,376 @@ +package gtPlusPlus.core.material.nuclear; + +import gtPlusPlus.core.client.CustomTextureSet.TextureSets; +import gtPlusPlus.core.material.ELEMENT; +import gtPlusPlus.core.material.Material; +import gtPlusPlus.core.material.MaterialStack; +import gtPlusPlus.core.material.state.MaterialState; +import gtPlusPlus.core.util.data.StringUtils; + + +public final class NUCLIDE { + + public static final Material Li2BeF4 = new Material( + "Lithium Tetrafluoroberyllate", //Material Name + MaterialState.LIQUID, //State + TextureSets.NUCLEAR.get(), + null, //Material Colour + 566, //Melting Point in C + 870, //Boiling Point in C + -1, //Protons + -1, //Neutrons + false, //Uses Blast furnace? + StringUtils.subscript(StringUtils.superscript("7")+"Li2BeF4"), //Chemical Formula + 4, //Radioactivity Level + //Material Stacks with Percentage of required elements. + new MaterialStack[]{ + new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 2), + new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 1) + }); + + public static final Material LiFBeF2ThF4UF4 = new Material( + "LiFBeF2ThF4UF4", //Material Name + MaterialState.LIQUID, //State + TextureSets.NUCLEAR.get(), + null, //Material Colour + 566, //Melting Point in C + 870, //Boiling Point in C + -1, //Protons + -1, //Neutrons + false, //Uses Blast furnace? + StringUtils.subscript(StringUtils.superscript("7")+"LiFBeF2ThF4UF4"), //Chemical Formula + 5, //Radioactivity Level + //Material Stacks with Percentage of required elements. + new MaterialStack[]{ + new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 65), + new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 28), + new MaterialStack(FLUORIDES.THORIUM_TETRAFLUORIDE, 1), + new MaterialStack(FLUORIDES.URANIUM_TETRAFLUORIDE, 1) + }); + + public static final Material LiFBeF2ZrF4UF4 = new Material( + "LiFBeF2ZrF4UF4", //Material Name + MaterialState.LIQUID, //State + TextureSets.NUCLEAR.get(), + null, //Material Colour + 650, //Melting Point in C + 940, //Boiling Point in C + -1, //Protons + -1, //Neutrons + false, //Uses Blast furnace? + StringUtils.subscript(StringUtils.superscript("7")+"LiFBeF2ZrF4UF4"), //Chemical Formula + 5, //Radioactivity Level + //Material Stacks with Percentage of required elements. + new MaterialStack[]{ + new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 65), + new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 28), + new MaterialStack(FLUORIDES.ZIRCONIUM_TETRAFLUORIDE, 5), + new MaterialStack(FLUORIDES.URANIUM_TETRAFLUORIDE, 2) + }); + + public static final Material LiFBeF2ZrF4U235 = new Material( + "LiFBeF2ZrF4U235", //Material Name + MaterialState.LIQUID, //State + TextureSets.NUCLEAR.get(), + null, //Material Colour + 590, //Melting Point in C + 890, //Boiling Point in C + -1, //Protons + -1, //Neutrons + false, //Uses Blast furnace? + StringUtils.subscript(StringUtils.superscript("7")+"LiFBeF2ZrF4")+StringUtils.superscript("235U"), //Chemical Formula + 5, //Radioactivity Level + //Material Stacks with Percentage of required elements. + new MaterialStack[]{ + new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 55), + new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 25), + new MaterialStack(FLUORIDES.ZIRCONIUM_TETRAFLUORIDE, 6), + new MaterialStack(ELEMENT.getInstance().URANIUM235, 14) + }); + + // Misc + public static final Material BurntLftrFuel_MK1 = new Material( + "Burnt Reactor Fuel I", //Material Name + MaterialState.PURE_LIQUID, //State + null, //Material Colour + -1, //Melting Point in C + -1, //Boiling Point in C + -1, //Protons + -1, //Neutrons + false, //Uses Blast furnace? + StringUtils.subscript(StringUtils.superscript("7")+"LiBeF2UF4FP"), //Chemical Formula + //Material Stacks with Percentage of required elements. + new MaterialStack[]{ + new MaterialStack(ELEMENT.getInstance().LITHIUM, 1), + new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 1), + new MaterialStack(FLUORIDES.URANIUM_TETRAFLUORIDE, 1), + new MaterialStack(ELEMENT.getInstance().PROTACTINIUM, 1) + }); + + public static final Material BurntLftrFuel_MK2 = new Material( + "Burnt Reactor Fuel II", //Material Name + MaterialState.PURE_LIQUID, //State + null, //Material Colour + -1, //Melting Point in C + -1, //Boiling Point in C + -1, //Protons + -1, //Neutrons + false, //Uses Blast furnace? + StringUtils.subscript(StringUtils.superscript("7")+"LiBeF2UF4FP"), //Chemical Formula + //Material Stacks with Percentage of required elements. + new MaterialStack[]{ + new MaterialStack(ELEMENT.getInstance().LITHIUM, 1), + new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 1), + new MaterialStack(FLUORIDES.URANIUM_TETRAFLUORIDE, 1), + new MaterialStack(ELEMENT.getInstance().PROTACTINIUM, 1) + }); + + + + // LFTR Core Fluids + public static final Material LiFBeF2UF4FP = new Material( + "LiFBeF2UF4FP", //Material Name + MaterialState.PURE_LIQUID, //State + null, //Material Colour + -1, //Melting Point in C + -1, //Boiling Point in C + -1, //Protons + -1, //Neutrons + false, //Uses Blast furnace? + StringUtils.subscript(StringUtils.superscript("7")+"LiFBeF2UF4FP"), //Chemical Formula + //Material Stacks with Percentage of required elements. + new MaterialStack[]{ + new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 1), + new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 1), + new MaterialStack(FLUORIDES.URANIUM_TETRAFLUORIDE, 1), + new MaterialStack(ELEMENT.getInstance().PROTACTINIUM, 1) + }); + + public static final Material Sparged_LiFBeF2UF4FP = new Material( + "Helium Sparged LiFBeF2UF4FP", //Material Name + MaterialState.PURE_LIQUID, //State + null, //Material Colour + -1, //Melting Point in C + -1, //Boiling Point in C + -1, //Protons + -1, //Neutrons + false, //Uses Blast furnace? + StringUtils.subscript(StringUtils.superscript("7")+"LiFBeF2UF4FP"), //Chemical Formula + //Material Stacks with Percentage of required elements. + new MaterialStack[]{ + new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 1), + new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 1), + new MaterialStack(FLUORIDES.URANIUM_TETRAFLUORIDE, 1), + new MaterialStack(ELEMENT.getInstance().PROTACTINIUM, 1) + }); + + public static final Material UF6F2FP = new Material( + "UF6F2FP", //Material Name + MaterialState.PURE_LIQUID, //State + null, //Material Colour + -1, //Melting Point in C + -1, //Boiling Point in C + -1, //Protons + -1, //Neutrons + false, //Uses Blast furnace? + StringUtils.subscript("UF6F2FP"), //Chemical Formula + //Material Stacks with Percentage of required elements. + new MaterialStack[]{ + new MaterialStack(FLUORIDES.URANIUM_HEXAFLUORIDE, 1), + new MaterialStack(ELEMENT.getInstance().FLUORINE, 3), + new MaterialStack(ELEMENT.getInstance().PHOSPHORUS, 1) + }); + + public static final Material LiFBeF2 = new Material( + "LiFBeF2", //Material Name + MaterialState.PURE_LIQUID, //State + null, //Material Colour + -1, //Melting Point in C + -1, //Boiling Point in C + -1, //Protons + -1, //Neutrons + false, //Uses Blast furnace? + StringUtils.subscript(StringUtils.superscript("7")+"LiFBeF2"), //Chemical Formula + //Material Stacks with Percentage of required elements. + new MaterialStack[]{ + new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 1), + new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 1) + }); + + public static final Material LiFBeF2UF4 = new Material( + "LiFBeF2UF4", //Material Name + MaterialState.PURE_LIQUID, //State + null, //Material Colour + -1, //Melting Point in C + -1, //Boiling Point in C + -1, //Protons + -1, //Neutrons + false, //Uses Blast furnace? + StringUtils.subscript(StringUtils.superscript("7")+"LiFBeF2UF4"), //Chemical Formula + //Material Stacks with Percentage of required elements. + new MaterialStack[]{ + new MaterialStack(LiFBeF2, 1), + new MaterialStack(FLUORIDES.URANIUM_TETRAFLUORIDE, 1) + }); + + + + + + + // LFTR Blanket Fluids + + // Tier 1 Fuel blanket output + public static final Material LiFThF4 = new Material( + "LiFThF4", //Material Name + MaterialState.PURE_LIQUID, //State + null, //Material Colour + -1, //Melting Point in C + -1, //Boiling Point in C + -1, //Protons + -1, //Neutrons + false, //Uses Blast furnace? + StringUtils.subscript(StringUtils.superscript("7")+"LiFThF4"), //Chemical Formula + //Material Stacks with Percentage of required elements. + new MaterialStack[]{ + new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 1), + new MaterialStack(FLUORIDES.THORIUM_TETRAFLUORIDE, 1) + }); + + // Tier 2 Fuel blanket output + public static final Material LiFBeF2ThF4 = new Material( + "LiFBeF2ThF4", //Material Name + MaterialState.PURE_LIQUID, //State + null, //Material Colour + -1, //Melting Point in C + -1, //Boiling Point in C + -1, //Protons + -1, //Neutrons + false, //Uses Blast furnace? + StringUtils.subscript(StringUtils.superscript("7")+"LiFBeF2ThF4"), //Chemical Formula + //Material Stacks with Percentage of required elements. + new MaterialStack[]{ + new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 1), + new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 1), + new MaterialStack(FLUORIDES.THORIUM_TETRAFLUORIDE, 1) + }); + + // Tier 1 Fuel blanket output + public static final Material Sparged_LiFThF4 = new Material( + "Fluorine Sparged LiFThF4", //Material Name + MaterialState.PURE_LIQUID, //State + null, //Material Colour + -1, //Melting Point in C + -1, //Boiling Point in C + -1, //Protons + -1, //Neutrons + false, //Uses Blast furnace? + StringUtils.subscript(StringUtils.superscript("7")+"LiFThF4"), //Chemical Formula + //Material Stacks with Percentage of required elements. + new MaterialStack[]{ + new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 1), + new MaterialStack(FLUORIDES.THORIUM_TETRAFLUORIDE, 1) + }); + + // Tier 2 Fuel blanket output + public static final Material Sparged_LiFBeF2ThF4 = new Material( + "Fluorine Sparged LiFBeF2ThF4", //Material Name + MaterialState.PURE_LIQUID, //State + null, //Material Colour + -1, //Melting Point in C + -1, //Boiling Point in C + -1, //Protons + -1, //Neutrons + false, //Uses Blast furnace? + StringUtils.subscript(StringUtils.superscript("7")+"LiFBeF2ThF4"), //Chemical Formula + //Material Stacks with Percentage of required elements. + new MaterialStack[]{ + new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 1), + new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 1), + new MaterialStack(FLUORIDES.THORIUM_TETRAFLUORIDE, 1) + }); + + public static final Material UF6F2 = new Material( + "UF6F2", //Material Name + MaterialState.PURE_LIQUID, //State + null, //Material Colour + -1, //Melting Point in C + -1, //Boiling Point in C + -1, //Protons + -1, //Neutrons + false, //Uses Blast furnace? + StringUtils.subscript("UF6F2"), //Chemical Formula + //Material Stacks with Percentage of required elements. + new MaterialStack[]{ + new MaterialStack(FLUORIDES.URANIUM_HEXAFLUORIDE, 1), + new MaterialStack(ELEMENT.getInstance().FLUORINE, 2) + }); + + + + + + + + + + + + + // Secondary material is molten metal + public static final Material NAQ_FUEL_T1 = new Material( + "Naquadah Fuel", + MaterialState.PURE_LIQUID, //State + null, //Material Colour + -1, //Melting Point in C + -1, //Boiling Point in C + -1, //Protons + -1, + false, //Uses Blast furnace? + //Material Stacks with Percentage of required elements. + new MaterialStack[]{ + new MaterialStack(ELEMENT.getInstance().NAQUADAH, 2), + new MaterialStack(ELEMENT.getInstance().TANTALUM, 3) + }); + + // Secondary material is a plasma + public static final Material NAQ_FUEL_T2 = new Material( + "Enriched Naquadah Fuel", + MaterialState.PURE_LIQUID, //State + null, //Material Colour + -1, //Melting Point in C + -1, //Boiling Point in C + -1, //Protons + -1, + false, //Uses Blast furnace? + //Material Stacks with Percentage of required elements. + new MaterialStack[]{ + new MaterialStack(ELEMENT.getInstance().NAQUADAH_ENRICHED, 2), + new MaterialStack(ELEMENT.getInstance().TITANIUM, 3) + }); + + // Secondary material is a plasma + public static final Material NAQ_FUEL_T3 = new Material( + "Naquadria Fuel", + MaterialState.PURE_LIQUID, //State + null, //Material Colour + -1, //Melting Point in C + -1, //Boiling Point in C + -1, //Protons + -1, + false, //Uses Blast furnace? + //Material Stacks with Percentage of required elements. + new MaterialStack[]{ + new MaterialStack(ELEMENT.getInstance().NAQUADRIA, 2), + new MaterialStack(ELEMENT.getInstance().AMERICIUM, 3) + }); + + + + private static final NUCLIDE INSTANCE = new NUCLIDE(); + + public static NUCLIDE getInstance(){ + return INSTANCE; + } + +} diff --git a/src/Java/gtPlusPlus/core/material/state/MaterialState.java b/src/main/java/gtPlusPlus/core/material/state/MaterialState.java index 284e9582f1..460fe019dc 100644 --- a/src/Java/gtPlusPlus/core/material/state/MaterialState.java +++ b/src/main/java/gtPlusPlus/core/material/state/MaterialState.java @@ -6,7 +6,8 @@ public enum MaterialState { GAS(2), PLASMA(3), PURE_LIQUID(4), - ORE(5); + ORE(5), + PURE_GAS(6); private int STATE; private MaterialState (final int State){ this.STATE = State; diff --git a/src/Java/gtPlusPlus/core/network/handler/AbstractClientMessageHandler.java b/src/main/java/gtPlusPlus/core/network/handler/AbstractClientMessageHandler.java index b7ced2f7e9..b7ced2f7e9 100644 --- a/src/Java/gtPlusPlus/core/network/handler/AbstractClientMessageHandler.java +++ b/src/main/java/gtPlusPlus/core/network/handler/AbstractClientMessageHandler.java diff --git a/src/Java/gtPlusPlus/core/network/handler/AbstractMessageHandler.java b/src/main/java/gtPlusPlus/core/network/handler/AbstractMessageHandler.java index ca350f220f..ca350f220f 100644 --- a/src/Java/gtPlusPlus/core/network/handler/AbstractMessageHandler.java +++ b/src/main/java/gtPlusPlus/core/network/handler/AbstractMessageHandler.java diff --git a/src/Java/gtPlusPlus/core/network/handler/AbstractServerMessageHandler.java b/src/main/java/gtPlusPlus/core/network/handler/AbstractServerMessageHandler.java index d49e6cf350..d49e6cf350 100644 --- a/src/Java/gtPlusPlus/core/network/handler/AbstractServerMessageHandler.java +++ b/src/main/java/gtPlusPlus/core/network/handler/AbstractServerMessageHandler.java diff --git a/src/Java/gtPlusPlus/core/network/packet/AbstractPacket.java b/src/main/java/gtPlusPlus/core/network/packet/AbstractPacket.java index d6368e3d9e..d6368e3d9e 100644 --- a/src/Java/gtPlusPlus/core/network/packet/AbstractPacket.java +++ b/src/main/java/gtPlusPlus/core/network/packet/AbstractPacket.java diff --git a/src/Java/gtPlusPlus/core/network/packet/Packet_VolumetricFlaskGui.java b/src/main/java/gtPlusPlus/core/network/packet/Packet_VolumetricFlaskGui.java index 609ea729b7..609ea729b7 100644 --- a/src/Java/gtPlusPlus/core/network/packet/Packet_VolumetricFlaskGui.java +++ b/src/main/java/gtPlusPlus/core/network/packet/Packet_VolumetricFlaskGui.java diff --git a/src/Java/gtPlusPlus/core/network/packet/Packet_VolumetricFlaskGui2.java b/src/main/java/gtPlusPlus/core/network/packet/Packet_VolumetricFlaskGui2.java index bc6e6149d8..bc6e6149d8 100644 --- a/src/Java/gtPlusPlus/core/network/packet/Packet_VolumetricFlaskGui2.java +++ b/src/main/java/gtPlusPlus/core/network/packet/Packet_VolumetricFlaskGui2.java diff --git a/src/Java/gtPlusPlus/core/players/FakeFarmer.java b/src/main/java/gtPlusPlus/core/players/FakeFarmer.java index ef9ee3c3e7..ef9ee3c3e7 100644 --- a/src/Java/gtPlusPlus/core/players/FakeFarmer.java +++ b/src/main/java/gtPlusPlus/core/players/FakeFarmer.java diff --git a/src/Java/gtPlusPlus/core/proxy/ClientProxy.java b/src/main/java/gtPlusPlus/core/proxy/ClientProxy.java index 5a0c0f4ea3..5a0c0f4ea3 100644 --- a/src/Java/gtPlusPlus/core/proxy/ClientProxy.java +++ b/src/main/java/gtPlusPlus/core/proxy/ClientProxy.java diff --git a/src/Java/gtPlusPlus/core/proxy/ServerProxy.java b/src/main/java/gtPlusPlus/core/proxy/ServerProxy.java index 8aeeb70191..8aeeb70191 100644 --- a/src/Java/gtPlusPlus/core/proxy/ServerProxy.java +++ b/src/main/java/gtPlusPlus/core/proxy/ServerProxy.java diff --git a/src/Java/gtPlusPlus/core/recipe/Gregtech_Recipe_Adder.java b/src/main/java/gtPlusPlus/core/recipe/Gregtech_Recipe_Adder.java index b5fc9c3995..b5fc9c3995 100644 --- a/src/Java/gtPlusPlus/core/recipe/Gregtech_Recipe_Adder.java +++ b/src/main/java/gtPlusPlus/core/recipe/Gregtech_Recipe_Adder.java diff --git a/src/Java/gtPlusPlus/core/recipe/LOADER_Machine_Components.java b/src/main/java/gtPlusPlus/core/recipe/LOADER_Machine_Components.java index 460b29e802..c77db21800 100644 --- a/src/Java/gtPlusPlus/core/recipe/LOADER_Machine_Components.java +++ b/src/main/java/gtPlusPlus/core/recipe/LOADER_Machine_Components.java @@ -68,6 +68,13 @@ public class LOADER_Machine_Components { CI.sensor_HV = ItemList.Sensor_HV.get(1); CI.sensor_EV = ItemList.Sensor_EV.get(1); CI.sensor_IV = ItemList.Sensor_IV.get(1); + if(CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) { + CI.fluidRegulator_LV = ItemUtils.getValueOfItemList("FluidRegulator_LV", ItemList.Pump_LV).get(1); + CI.fluidRegulator_MV = ItemUtils.getValueOfItemList("FluidRegulator_MV", ItemList.Pump_MV).get(1); + CI.fluidRegulator_HV = ItemUtils.getValueOfItemList("FluidRegulator_HV", ItemList.Pump_HV).get(1); + CI.fluidRegulator_EV = ItemUtils.getValueOfItemList("FluidRegulator_EV", ItemList.Pump_EV).get(1); + CI.fluidRegulator_IV = ItemUtils.getValueOfItemList("FluidRegulator_IV", ItemList.Pump_IV).get(1); + } } private static void registerGTExperimentalComponents(){ @@ -96,7 +103,13 @@ public class LOADER_Machine_Components { CI.sensor_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32695, 1); CI.sensor_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32696, 1); CI.sensor_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32697, 1); - + + if(CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) { + CI.fluidRegulator_LuV = ItemUtils.getValueOfItemList("FluidRegulator_LuV", ItemList.Pump_LuV).get(1); + CI.fluidRegulator_ZPM = ItemUtils.getValueOfItemList("FluidRegulator_ZPM", ItemList.Pump_ZPM).get(1); + CI.fluidRegulator_UV = ItemUtils.getValueOfItemList("FluidRegulator_UV", ItemList.Pump_UV).get(1); + } + registerComponentsULV(); registerComponentsMAX(); } @@ -135,6 +148,12 @@ public class LOADER_Machine_Components { CI.sensor_UV = GregtechItemList.Sensor_UV.get(1); CI.sensor_MAX = GregtechItemList.Sensor_MAX.get(1); + if(CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) { + CI.fluidRegulator_LuV = ItemUtils.getValueOfItemList("FluidRegulator_LuV", ItemList.Pump_LuV).get(1); + CI.fluidRegulator_ZPM = ItemUtils.getValueOfItemList("FluidRegulator_ZPM", ItemList.Pump_ZPM).get(1); + CI.fluidRegulator_UV = ItemUtils.getValueOfItemList("FluidRegulator_UV", ItemList.Pump_UV).get(1); + } + registerComponentsULV(); } @@ -171,6 +190,12 @@ public class LOADER_Machine_Components { CI.sensor_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32695, 1); CI.sensor_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32696, 1); CI.sensor_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32697, 1); + + if(CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) { + CI.fluidRegulator_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32665, 1); + CI.fluidRegulator_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32666, 1); + CI.fluidRegulator_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32667, 1); + } // Thanks 0lafe CI.electricMotor_MAX = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32596, 1); diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Extruder.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Extruder.java index 455beb2fd0..455beb2fd0 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Extruder.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Extruder.java diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java index 7410a507c4..f8c923fc7a 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java @@ -30,7 +30,6 @@ import gtPlusPlus.core.material.MISC_MATERIALS; import gtPlusPlus.core.material.ORES; import gtPlusPlus.core.material.Particle; import gtPlusPlus.core.material.nuclear.FLUORIDES; -import gtPlusPlus.core.material.nuclear.NUCLIDE; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.EnchantingUtils; @@ -94,6 +93,7 @@ public class RECIPES_GREGTECH { fluidheaterRecipes(); chemplantRecipes(); packagerRecipes(); + alloySmelterRecipes(); /** @@ -110,7 +110,17 @@ public class RECIPES_GREGTECH { addFuels(); } + private static void alloySmelterRecipes() { + + //Wood's Glass Laser Lens + GT_Values.RA.addAlloySmelterRecipe( + MISC_MATERIALS.WOODS_GLASS.getDust(5), + ItemList.Shape_Mold_Ball.get(0), + GregtechItemList.Laser_Lens_WoodsGlass.get(1), + 20 * 300, + MaterialUtils.getVoltageForTier(3)); + } private static void packagerRecipes() { @@ -391,6 +401,28 @@ public class RECIPES_GREGTECH { 20 * 20, MaterialUtils.getVoltageForTier(aBotmiumTier-2), 6); + + + //Refine GT HF into GT++ HF + if (FluidUtils.doesHydrofluoricAcidGtExist()) { + CORE.RA.addChemicalPlantRecipe( + new ItemStack[] { + CI.getNumberedAdvancedCircuit(22), + }, + new FluidStack[] { + FluidUtils.getHydrofluoricAcid(2000), + FluidUtils.getHydrofluoricAcidGT(5000) + }, + new ItemStack[] { + + }, + new FluidStack[] { + FluidUtils.getHydrofluoricAcid(6000) + }, + 30 * 20, + 480, + 3); + } } @@ -448,17 +480,17 @@ public class RECIPES_GREGTECH { //Hypogen Creation GT_Values.RA.addFusionReactorRecipe( Materials.Neutronium.getMolten(128), - ALLOY.QUANTUM.getFluid(256), - ELEMENT.STANDALONE.HYPOGEN.getFluid(4), + ALLOY.QUANTUM.getFluidStack(256), + ELEMENT.STANDALONE.HYPOGEN.getFluidStack(4), 2048 * 4, (int) MaterialUtils.getVoltageForTier(9), 600000000 * 2); //Rhugnor GT_Values.RA.addFusionReactorRecipe( - GenericChem.TEFLON.getFluid(64), - ALLOY.PIKYONIUM.getFluid(128), - ELEMENT.STANDALONE.RHUGNOR.getFluid(8), + GenericChem.TEFLON.getFluidStack(64), + ALLOY.PIKYONIUM.getFluidStack(128), + ELEMENT.STANDALONE.RHUGNOR.getFluidStack(8), 2048 * 4, (int) MaterialUtils.getVoltageForTier(7), 150000000 * 2); @@ -483,7 +515,7 @@ public class RECIPES_GREGTECH { CORE.RA.addAssemblylineRecipe( ItemDummyResearch.getResearchStack(ASSEMBLY_LINE_RESEARCH.RESEARCH_1_CONTAINMENT, 1), 20 * 60 * 30, - new ItemStack[] { + new Object[] { ItemList.Field_Generator_IV.get(GTNH ? 32 : 16), ItemList.Electric_Motor_EV.get(GTNH ? 64 : 32), ItemList.Energy_LapotronicOrb.get(GTNH ? 32 : 16), @@ -493,18 +525,17 @@ public class RECIPES_GREGTECH { ELEMENT.getInstance().GADOLINIUM.getDust(GTNH ? 32 : 8), ELEMENT.getInstance().SAMARIUM.getDust(GTNH ? 16 : 4), ALLOY.ARCANITE.getGear(GTNH ? 8 : 2), - CI.getTieredComponent(OrePrefixes.circuit, 5, GTNH ? 64 : 32), - CI.getTieredComponent(OrePrefixes.circuit, 6, GTNH ? 32 : 16), - CI.getTieredComponent(OrePrefixes.circuit, 7, GTNH ? 16 : 8), + new Object[] {CI.getTieredCircuitOreDictName(5), 64}, + new Object[] {CI.getTieredCircuitOreDictName(6), 32}, + new Object[] {CI.getTieredCircuitOreDictName(7), 16}, GregtechItemList.Laser_Lens_Special.get(1), aCoilWire[3] }, new FluidStack[] { - ALLOY.NITINOL_60.getFluid(144 * 9 * (GTNH ? 4 : 2)), - ALLOY.ENERGYCRYSTAL.getFluid(144 * 9 * (GTNH ? 8 : 4)), - ALLOY.TUMBAGA.getFluid(144 * 9 * (GTNH ? 32 : 8)), - ALLOY.NICHROME.getFluid(144 * 1 * (GTNH ? 16 : 4)), - + ALLOY.NITINOL_60.getFluidStack(144 * 9 * (GTNH ? 4 : 2)), + ALLOY.ENERGYCRYSTAL.getFluidStack(144 * 9 * (GTNH ? 8 : 4)), + ALLOY.TUMBAGA.getFluidStack(144 * 9 * (GTNH ? 32 : 8)), + ALLOY.NICHROME.getFluidStack(144 * 1 * (GTNH ? 16 : 4)), }, ItemUtils.getSimpleStack(ModBlocks.blockCasings3Misc, 15, 32), 20 * 60 * 10 * (GTNH ? 2 : 1), @@ -565,7 +596,7 @@ public class RECIPES_GREGTECH { CORE.RA.addAssemblylineRecipe( ItemDummyResearch.getResearchStack(ASSEMBLY_LINE_RESEARCH.RESEARCH_8_TURBINE_AUTOMATION, 1), 20 * 60 * 60 * 24, - new ItemStack[] { + new Object[] { CI.getTieredMachineHull(8, 4), CI.getConveyor(8, GTNH ? 24 : 12), CI.getElectricMotor(7, GTNH ? 32 : 16), @@ -575,15 +606,15 @@ public class RECIPES_GREGTECH { CI.getTieredComponent(OrePrefixes.screw, 8, GTNH ? 48 : 24), CI.getTieredComponent(OrePrefixes.bolt, 7, GTNH ? 32 : 16), CI.getTieredComponent(OrePrefixes.rod, 6, GTNH ? 12 : 6), - CI.getTieredComponent(OrePrefixes.circuit, 7, GTNH ? 20 : 10), + new Object[] {CI.getTieredCircuitOreDictName(7), 20}, CI.getTieredComponent(OrePrefixes.rotor, 6, GTNH ? 16 : 8), }, new FluidStack[] { CI.getTieredFluid(8, 144 * 32), CI.getAlternativeTieredFluid(7, 144 * 16), CI.getTertiaryTieredFluid(7, 144 * 16), - ALLOY.BABBIT_ALLOY.getFluid(128 * 144), - ALLOY.ZERON_100.getFluid(144 * 64) + ALLOY.BABBIT_ALLOY.getFluidStack(128 * 144), + ALLOY.ZERON_100.getFluidStack(144 * 64) }, GregtechItemList.Hatch_Input_TurbineHousing.get(4), @@ -652,11 +683,11 @@ public class RECIPES_GREGTECH { CORE.RA.addAssemblylineRecipe( aExoticInputs[aCasingSlot], 20 * 60 * 60 * 5, - new ItemStack[] { + new Object[] { aGemCasings[aCasingSlot], ItemUtils.getSimpleStack(aExoticInputs[aCasingSlot], 16), CI.getTieredComponent(OrePrefixes.plate, j, 16), - CI.getTieredComponent(OrePrefixes.circuit, j, 8), + new Object[] {CI.getTieredCircuitOreDictName(j), 8}, CI.getTieredComponent(OrePrefixes.wireGt16, j+1, GTNH ? 32 : 16), CI.getTieredComponent(OrePrefixes.bolt, j, GTNH ? 8 : 4), CI.getTieredComponent(OrePrefixes.screw, j-1, GTNH ? 8 : 4), @@ -678,10 +709,10 @@ public class RECIPES_GREGTECH { CORE.RA.addAssemblylineRecipe( ItemUtils.simpleMetaStack(Items.golden_apple, 1, 1), 20 * 60 * 10, - new ItemStack[] { + new Object[] { ItemUtils.getSimpleStack(aGemCasings[2], GTNH ? 4 : 2), CI.getTieredComponent(OrePrefixes.plate, 8, GTNH ? 32 : 16), - CI.getTieredComponent(OrePrefixes.circuit, 7, GTNH ? 16 : 4), + new Object[] {CI.getTieredCircuitOreDictName(7), 16}, CI.getTieredComponent(OrePrefixes.cableGt02, 7, GTNH ? 16 : 8), CI.getTieredComponent(OrePrefixes.gearGt, 6, GTNH ? 6 : 3), CI.getTieredComponent(OrePrefixes.screw, 7, GTNH ? 16 : 8), @@ -723,12 +754,12 @@ public class RECIPES_GREGTECH { CORE.RA.addAssemblylineRecipe( aChargeResearch[aCurrSlot], 20 * 60 * 10 * (aCurrSlot + 1), - new ItemStack[] { + new Object[] { ItemUtils.getSimpleStack(aGemBatteries[aCurrSlot],2), aCoilWire[aCurrSlot], CI.getTieredComponent(OrePrefixes.plate, h, 8), - CI.getTieredComponent(OrePrefixes.circuit, h, 4), - CI.getTieredComponent(OrePrefixes.circuit, h-1, 8), + new Object[] {CI.getTieredCircuitOreDictName(h), 4}, + new Object[] {CI.getTieredCircuitOreDictName(h-1), 8}, CI.getTieredComponent(OrePrefixes.cableGt12, h-1, 16), CI.getTieredComponent(OrePrefixes.screw, h, GTNH ? 16 : 8), CI.getTieredComponent(OrePrefixes.bolt, h-2, GTNH ? 32 : 16), @@ -750,10 +781,10 @@ public class RECIPES_GREGTECH { CORE.RA.addAssemblylineRecipe( ItemDummyResearch.getResearchStack(ASSEMBLY_LINE_RESEARCH.RESEARCH_9_CLOAKING, 1), 20 * 60 * 10, - new ItemStack[] { + new Object[] { ItemUtils.getSimpleStack(aGemCasings[3], GTNH ? 4 : 2), CI.getTieredComponent(OrePrefixes.plate, 8, GTNH ? 32 : 16), - CI.getTieredComponent(OrePrefixes.circuit, 7, GTNH ? 16 : 4), + new Object[] {CI.getTieredCircuitOreDictName(7), 16}, CI.getTieredComponent(OrePrefixes.cableGt04, 8, GTNH ? 16 : 8), CI.getTieredComponent(OrePrefixes.gearGt, 7, GTNH ? 6 : 3), CI.getTieredComponent(OrePrefixes.screw, 8, GTNH ? 16 : 8), @@ -935,7 +966,7 @@ public class RECIPES_GREGTECH { ELEMENT.getInstance().CARBON.getDust(1), ELEMENT.getInstance().SILICON.getDust(4) }, - ALLOY.EGLIN_STEEL.getFluid(16 * 144), + ALLOY.EGLIN_STEEL.getFluidStack(16 * 144), 0, 20 * 45, 120); @@ -949,8 +980,8 @@ public class RECIPES_GREGTECH { ELEMENT.getInstance().CALCIUM.getDust(2), ELEMENT.getInstance().COPPER.getDust(3), }, - ELEMENT.getInstance().OXYGEN.getFluid(8000), - ALLOY.HG1223.getFluid(16 * 144), + ELEMENT.getInstance().OXYGEN.getFluidStack(8000), + ALLOY.HG1223.getFluidStack(16 * 144), new ItemStack[] { CI.emptyCells(1) }, @@ -965,7 +996,7 @@ public class RECIPES_GREGTECH { ELEMENT.getInstance().TITANIUM.getDust(3), ELEMENT.getInstance().NICKEL.getDust(2) }, - ALLOY.NITINOL_60.getFluid(5 * 144), + ALLOY.NITINOL_60.getFluidStack(5 * 144), 0, 20 * 75, 7680); @@ -982,7 +1013,7 @@ public class RECIPES_GREGTECH { ELEMENT.getInstance().CARBON.getDust(32), }, Materials.SulfuricAcid.getFluid(2000), - ELEMENT.getInstance().GERMANIUM.getFluid(288), + ELEMENT.getInstance().GERMANIUM.getFluidStack(288), 0, 20 * 300, 4000); @@ -996,7 +1027,7 @@ public class RECIPES_GREGTECH { ELEMENT.getInstance().CARBON.getDust(32), }, Materials.SulfuricAcid.getFluid(2000), - ELEMENT.getInstance().RUTHENIUM.getFluid(288), + ELEMENT.getInstance().RUTHENIUM.getFluidStack(288), 0, 20 * 300, 8000); @@ -1007,7 +1038,7 @@ public class RECIPES_GREGTECH { ELEMENT.getInstance().CARBON.getDust(32), }, Materials.SulfuricAcid.getFluid(2000), - ELEMENT.getInstance().RUTHENIUM.getFluid(288), + ELEMENT.getInstance().RUTHENIUM.getFluidStack(288), 0, 20 * 300, 8000); @@ -1018,7 +1049,7 @@ public class RECIPES_GREGTECH { ELEMENT.getInstance().CARBON.getDust(32), }, Materials.SulfuricAcid.getFluid(2000), - ELEMENT.getInstance().RUTHENIUM.getFluid(288), + ELEMENT.getInstance().RUTHENIUM.getFluidStack(288), 0, 20 * 300, 8000); @@ -1029,7 +1060,7 @@ public class RECIPES_GREGTECH { ELEMENT.getInstance().CARBON.getDust(32), }, Materials.SulfuricAcid.getFluid(8000), - ELEMENT.getInstance().RUTHENIUM.getFluid(144), + ELEMENT.getInstance().RUTHENIUM.getFluidStack(144), 0, 20 * 300, 8000); @@ -1042,7 +1073,7 @@ public class RECIPES_GREGTECH { ELEMENT.getInstance().CARBON.getDust(32), }, Materials.SulfuricAcid.getFluid(10000), - ELEMENT.getInstance().RHENIUM.getFluid(144), + ELEMENT.getInstance().RHENIUM.getFluidStack(144), 0, 20 * 300, 4000); @@ -1053,7 +1084,7 @@ public class RECIPES_GREGTECH { ELEMENT.getInstance().CARBON.getDust(32), }, Materials.SulfuricAcid.getFluid(7500), - ELEMENT.getInstance().RHENIUM.getFluid(144), + ELEMENT.getInstance().RHENIUM.getFluidStack(144), 0, 20 * 300, 4000); @@ -1064,7 +1095,7 @@ public class RECIPES_GREGTECH { ELEMENT.getInstance().CARBON.getDust(32), }, Materials.SulfuricAcid.getFluid(5000), - ELEMENT.getInstance().RHENIUM.getFluid(288), + ELEMENT.getInstance().RHENIUM.getFluidStack(288), 0, 20 * 300, 4000); @@ -1078,7 +1109,7 @@ public class RECIPES_GREGTECH { ELEMENT.getInstance().CARBON.getDust(64), }, Materials.SulfuricAcid.getFluid(5000), - ELEMENT.getInstance().THALLIUM.getFluid(288+144), + ELEMENT.getInstance().THALLIUM.getFluidStack(288+144), 0, 20 * 300, 8000); @@ -1093,7 +1124,7 @@ public class RECIPES_GREGTECH { ELEMENT.getInstance().ALUMINIUM.getDust(8), }, null, - ELEMENT.getInstance().OXYGEN.getFluid(8000), + ELEMENT.getInstance().OXYGEN.getFluidStack(8000), new ItemStack[] { ELEMENT.getInstance().ALUMINIUM.getIngot(8), ELEMENT.getInstance().STRONTIUM.getIngot(8) @@ -1102,29 +1133,6 @@ public class RECIPES_GREGTECH { 20 * 120, 480*4); - - //Wood's Glass Laser Lens - CORE.RA.addBlastSmelterRecipe( - new ItemStack[] { - ItemUtils.getGregtechCircuit(5), - ItemList.Shape_Mold_Ball.get(0), - ELEMENT.getInstance().BARIUM.getDust(1), - ELEMENT.getInstance().SODIUM.getDust(1), - ELEMENT.getInstance().SILICON.getDust(2), - ELEMENT.getInstance().NICKEL.getDust(1), - ItemUtils.getItemStackOfAmountFromOreDict("dustGlass", 5) - }, - FluidUtils.getUUM(1000), - null, - new ItemStack[] { - GregtechItemList.Laser_Lens_WoodsGlass.get(1) - }, - new int[] {10000}, - 20 * 300, - (int) GT_Values.V[3]); - - - } private static void fluidcannerRecipes() { @@ -1229,310 +1237,62 @@ public class RECIPES_GREGTECH { private static void dehydratorRecipes() { Logger.INFO("Loading Recipes for Chemical Dehydrator."); - try { - // Makes Lithium Carbonate - CORE.RA.addDehydratorRecipe(ItemUtils.getItemStackOfAmountFromOreDict("cellSulfuricLithium", 1), - FluidUtils.getFluidStack("sulfuriclithium", 440), - new ItemStack[] { - CI.emptyCells(1), - ItemUtils.getItemStackOfAmountFromOreDict("dustSulfur", 3), - ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustSodium", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustCarbon", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustLithium7", 3) - }, - 30 * 20, // Time in ticks - 30); // EU - } - catch (final NullPointerException e) { - Logger.INFO("[cellSulfuricLithium] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE"); - } - try { - - ItemStack cells = CI.emptyCells(12); - - final ItemStack[] input = { cells, ItemUtils.getItemStackOfAmountFromOreDict("dustLepidolite", 20) }; - - CORE.RA.addDehydratorRecipe(input, // Item input (Array, up to 2) - FluidUtils.getFluidStack("sulfuricacid", 10000), - FluidUtils.getFluidStack("sulfuriclithium", 10000), - new ItemStack[] { - ItemUtils.getItemStackOfAmountFromOreDict("dustPotassium", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustAluminium", 4), - ItemUtils.getItemStackOfAmountFromOreDict("cellOxygen", 10), - ItemUtils.getItemStackOfAmountFromOreDict("cellFluorine", 2), - ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumCarbonate", 3), // LithiumCarbonate - }, // Output Array of Items - Upto 9, - new int[] { 0 }, - 75 * 20, // Time in ticks - 1000); // EU - - } - catch (final NullPointerException e) { - Logger.INFO("[dustLepidolite] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE"); - } - try { - - CORE.RA.addDehydratorRecipe( - new ItemStack[] { - ItemUtils.getItemStackOfAmountFromOreDict("cellWater", 10) - }, - FluidUtils.getFluidStack("molten.uraniumtetrafluoride", 1440), - null, - new ItemStack[] { - ItemUtils.getItemStackOfAmountFromOreDict("dustUraniumTetrafluoride", 10), - CI.emptyCells(10) - }, - new int[] { 0 }, 150 * 20, // Time in ticks - 2000); // EU - - } - catch (final NullPointerException e) { - Logger.INFO("[dustUraniumTetrafluoride] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE"); - } - try { - CORE.RA.addDehydratorRecipe( - new ItemStack[] { - ItemUtils.getItemStackOfAmountFromOreDict("cellWater", 10) - }, // Item - FluidUtils.getFluidStack("molten.uraniumhexafluoride", 1440), // Fluid - null, // Fluid output (slot 2) - new ItemStack[] { - ItemUtils.getItemStackOfAmountFromOreDict("dustUraniumHexafluoride", 10), - CI.emptyCells(10) }, // Output - new int[] { 0 }, 300 * 20, // Time in ticks - 4000); // EU - - } - catch (final NullPointerException e) { - Logger.INFO("[dustUraniumHexafluoride] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE"); - } - - // Raisins from Grapes - try { - - ItemStack cropGrape = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cropGrape", 1); - ItemStack foodRaisins = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("foodRaisins", 1); - - if (cropGrape != null && foodRaisins != null) - CORE.RA.addDehydratorRecipe(new ItemStack[] { - cropGrape - }, // Item - null, // Fluid input (slot 1) - null, // Fluid output (slot 2) - new ItemStack[] { - foodRaisins - }, // Output - new int[] { 0 }, 10, // Time in ticks - 2); // EU - - } - catch (final NullPointerException e) { - Logger.INFO("[foodRaisins] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE"); - } - - // Calcium Hydroxide - if ((ItemUtils.checkForInvalidItems(ItemUtils.getItemStackOfAmountFromOreDict("dustQuicklime", 1))) || LoadedMods.IHL) { - try { - - CORE.RA.addDehydratorRecipe( - new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustQuicklime", 10) }, // Item - FluidUtils.getFluidStack("water", 10000), // Fluid input - // (slot 1) - null, // Fluid output (slot 2) - new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumHydroxide", 20) }, // Output - new int[] { 0 }, 120 * 20, // Time in ticks - 120); // EU - - } - catch (final NullPointerException e) { - Logger.INFO("[dustCalciumHydroxide] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE"); - } - - } + ItemStack cropGrape = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cropGrape", 1); + ItemStack foodRaisins = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("foodRaisins", 1); - // Process Waste Water - try { - - CORE.RA.addDehydratorRecipe(null, - FluidUtils.getFluidStack("fluid.sludge", 1000), - FluidUtils.getFluidStack("nitricacid", 10), - new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustTinyIron", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustTinyCopper", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustTinyTin", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustTinyNickel", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustTinyCobalt", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustTinyAluminium", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustTinySilver", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustTinyGold", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustTinyIridium", 1) }, - new int[] { 10, 5, 5, 4, 4, 3, 2, 2, 1 }, - 2 * 20, - 500); // EU - - } - catch (final NullPointerException e) { - Logger.INFO("[sludge] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE"); - } - - - - // 2 LiOH + CaCO3 - try { - - CORE.RA.addDehydratorRecipe( - new ItemStack[] { - ItemUtils.getItemStackOfAmountFromOreDict("dustLi2CO3CaOH2", 5) - }, // Item - null, // Fluid input (slot 1) - null, // Fluid output (slot 2) - new ItemStack[] { - ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroxide", 2), - ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumCarbonate", 3) - }, // Output - new int[] { 0 }, 120 * 20, // Time in ticks - 1000); // EU - - } - catch (final NullPointerException e) { - Logger.INFO("[dustLi2CO3CaOH2] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE"); - } - - // LiOH Liquid to Dust - try { - - CORE.RA.addDehydratorRecipe(new ItemStack[] { - ItemUtils.getGregtechCircuit(0) + if (cropGrape != null && foodRaisins != null) + CORE.RA.addDehydratorRecipe(new ItemStack[] { + CI.getNumberedBioCircuit(20), + cropGrape }, // Item - FluidUtils.getFluidStack("lithiumhydroxide", 144), // Fluid + null, // Fluid input (slot 1) null, // Fluid output (slot 2) new ItemStack[] { - ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroxide", 1) + foodRaisins }, // Output - new int[] { 0 }, - 1 * 20, // Time in ticks - 64); // EU + new int[] { 10000 }, + 10, // Time in ticks + 2); // EU - } - catch (final NullPointerException e) { - Logger.INFO("[dustLithiumHydroxide] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE"); - } - - // Zirconium Chloride -> TetraFluoride - try { - - CORE.RA.addDehydratorRecipe( - new ItemStack[] { - ItemUtils.getItemStackOfAmountFromOreDict("dustCookedZrCl4", 9), - CI.emptyCells(9) - }, // Item - FluidUtils.getFluidStack("hydrofluoricacid", 9 * 144), - null, - new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogenChloride", 9), - FLUORIDES.ZIRCONIUM_TETRAFLUORIDE.getDust(9) - }, - new int[] { 0 }, 120 * 20, // Time in ticks - 500); // EU - - - if (Utils.getGregtechVersionAsInt() >= 50929) { - CORE.RA.addDehydratorRecipe( - new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustCookedZrCl4", 9), - CI.emptyCells(9) }, - FluidUtils.getFluidStack("hydrofluoricacid_gt5u", 18 * 144), - null, - new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogenChloride", 9), - FLUORIDES.ZIRCONIUM_TETRAFLUORIDE.getDust(9) }, - new int[] { 0 }, - 120 * 20, // Time in ticks - 500); // EU - } - } - catch (final NullPointerException e) { - Logger.INFO("[dustZrF4] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE"); - } - - // CaF2 + H2SO4 → CaSO4(solid) + 2 HF - try { - - CORE.RA.addDehydratorRecipe( - new ItemStack[] { - ItemUtils.getItemStackOfAmountFromOreDict("dustFluorite", 37), - CI.emptyCells(16) - }, - FluidUtils.getFluidStack("sulfuricacid", 56 * 144), - null, // Fluid output (slot 2) - new ItemStack[] { - ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumSulfate", 30), - ItemUtils.getItemStackOfAmountFromOreDict("cellHydrofluoricAcid", 16), - ItemUtils.getItemStackOfAmountFromOreDict("dustSilver", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustGold", 2), - ItemUtils.getItemStackOfAmountFromOreDict("dustTin", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 2) - }, - new int[] { 0, 0, 100, 100, 300, 200 }, - 10 * 60 * 20, - 230); // EU - - } - catch (final NullPointerException e) { - Logger.INFO("[dustFluorite] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE"); - } - - // Be(OH)2 + 2 (NH4)HF2 → (NH4)2BeF4 + 2 H2O - try { - CORE.RA.addDehydratorRecipe( - new ItemStack[] { - ItemUtils.getItemStackOfAmountFromOreDict("cellBerylliumHydroxide", 2), - ItemUtils.getItemStackOfAmountFromOreDict("cellAmmoniumBifluoride", 4) - }, - null, // Fluid input (slot 1) - FluidUtils.getFluidStack("ammoniumtetrafluoroberyllate", 6000), - new ItemStack[] { - ItemUtils.getItemStackOfAmountFromOreDict("cellWater", 4), - CI.emptyCells(2) - }, - new int[] { 0, 0, 0 }, - 32 * 20, // Time in ticks - 64); // EU - - } - catch (final NullPointerException e) { - Logger.INFO("[ammoniumtetrafluoroberyllate] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE"); - } - - // (NH4)2BeF4 → 2 NH3 + 2 HF + BeF2 - try { - CORE.RA.addDehydratorRecipe( - new ItemStack[] { - CI.emptyCells(5) - }, - FluidUtils.getFluidStack("ammoniumtetrafluoroberyllate", 5000), - null, // Fluid output (slot 2) - new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellAmmonia", 2), - ItemUtils.getItemStackOfAmountFromOreDict("cellHydrofluoricAcid", 2), - ItemUtils.getItemStackOfAmountFromOreDict("cellBerylliumFluoride", 1) }, - new int[] { 0, 0, 0 }, - 5 * 60 * 20, // Time in ticks - 120); // EU + // Process Waste Water + CORE.RA.addDehydratorRecipe( + new ItemStack[] { + CI.getNumberedBioCircuit(21) + }, + FluidUtils.getFluidStack("fluid.sludge", 1000), + FluidUtils.getFluidStack("nitricacid", 10), + new ItemStack[] { + ItemUtils.getItemStackOfAmountFromOreDict("dustTinyIron", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustTinyCopper", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustTinyTin", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustTinyNickel", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustTinyCobalt", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustTinyAluminium", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustTinySilver", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustTinyGold", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustTinyIridium", 1) }, + new int[] { 10, 5, 5, 4, 4, 3, 2, 2, 1 }, + 2 * 20, + 500); // EU - } - catch (final NullPointerException e) { - Logger.INFO("[cellBerylliumFluoride] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE"); - } - // Makes Styrene CORE.RA.addDehydratorRecipe( - CI.emptyCells(3), // Item Input - FluidUtils.getFluidStack("fluid.ethylbenzene", 1000), // Fluid + new ItemStack[] { + CI.getNumberedAdvancedCircuit(18), + CI.emptyCells(3) + }, + FluidUtils.getFluidStack("fluid.ethylbenzene", 1000), + null, new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellStyrene", 1), - ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogen", 2) }, // Output - 3 * 20, // Time in ticks - 30); // EU + ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogen", 2) + }, + new int[] {10000, 10000}, + 3 * 20, + 30); /* * Try Add custom Recipe for drying leather @@ -1542,11 +1302,16 @@ public class RECIPES_GREGTECH { aLeather1 = ItemUtils.getCorrectStacktype("harvestcraft:hardenedleatherItem", 1); aLeather2 = ItemUtils.getCorrectStacktype("Backpack:tannedLeather", 1); CORE.RA.addDehydratorRecipe( - aLeather1, - GT_Values.NF, new ItemStack[] { - aLeather2 + CI.getNumberedAdvancedCircuit(18), + aLeather1 + }, + FluidUtils.getFluidStack("fluid.ethylbenzene", 1000), + null, + new ItemStack[] { + aLeather2 }, + new int[] {10000}, 5 * 20, 180); } @@ -1586,77 +1351,6 @@ public class RECIPES_GREGTECH { private static void fissionFuelRecipes() { try { - final String salt_LiFBeF2ThF4UF4 = "LiFBeF2ThF4UF4".toLowerCase(); - final String salt_LiFBeF2ZrF4U235 = "LiFBeF2ZrF4U235".toLowerCase(); - final String salt_LiFBeF2ZrF4UF4 = "LiFBeF2ZrF4UF4".toLowerCase(); - - final FluidStack LithiumFluoride = FluidUtils.getFluidStack("molten.lithiumfluoride", 100); // Re-usable - // FluidStacks - final FluidStack BerylliumFluoride = FluidUtils.getFluidStack("molten.berylliumfluoride", 100); // Re-usable - // FluidStacks - final FluidStack ThoriumFluoride = FluidUtils.getFluidStack("molten.thoriumtetrafluoride", 100); // Re-usable - // FluidStacks - final FluidStack ZirconiumFluoride = FluidUtils.getFluidStack("zirconiumtetrafluoride", 100); // Re-usable - // FluidStacks - final FluidStack UraniumTetraFluoride = FluidUtils.getFluidStack("molten.uraniumtetrafluoride", 100); // Re-usable - // FluidStacks - final FluidStack Uranium235 = FluidUtils.getFluidStack("molten.uranium235", 1000); // Re-usable - // FluidStacks - - final FluidStack LiFBeF2ThF4UF4 = FluidUtils.getFluidStack("molten." + salt_LiFBeF2ThF4UF4, 100); // Re-usable - // FluidStacks - final FluidStack LiFBeF2ZrF4U235 = FluidUtils.getFluidStack("molten." + salt_LiFBeF2ZrF4U235, 100); // Re-usable - // FluidStacks - final FluidStack LiFBeF2ZrF4UF4 = FluidUtils.getFluidStack("molten." + salt_LiFBeF2ZrF4UF4, 100); // Re-usable - // FluidStacks - - // 7LiF - BeF2 - ZrF4 - UF4 - 650C - CORE.RA.addFissionFuel(FluidUtils.getFluidStack(LithiumFluoride, 650), // Input - // A - FluidUtils.getFluidStack(BerylliumFluoride, 250), // Input - // B - FluidUtils.getFluidStack(ZirconiumFluoride, 80), // Input C - FluidUtils.getFluidStack(UraniumTetraFluoride, 70), // Input - // D - null, null, null, null, null, // Extra 5 inputs - FluidUtils.getFluidStack(LiFBeF2ZrF4UF4, 1000), // Output - // Fluid - // 1 - null, // Output Fluid 2 - 60 * 60 * 20, // Duration - 500); - - // 7LiF - BeF2 - ZrF4 - U235 - 590C - CORE.RA.addFissionFuel(FluidUtils.getFluidStack(LithiumFluoride, 550), // Input - // A - FluidUtils.getFluidStack(BerylliumFluoride, 150), // Input - // B - FluidUtils.getFluidStack(ZirconiumFluoride, 60), // Input C - FluidUtils.getFluidStack(Uranium235, 240), // Input D - null, null, null, null, null, // Extra 5 inputs - FluidUtils.getFluidStack(LiFBeF2ZrF4U235, 1000), // Output - // Fluid - // 1 - null, // Output Fluid 2 - 45 * 60 * 20, // Duration - 500); - - // 7liF - BeF2 - ThF4 - UF4 - 566C - CORE.RA.addFissionFuel(FluidUtils.getFluidStack(LithiumFluoride, 620), // Input - // A - FluidUtils.getFluidStack(BerylliumFluoride, 280), // Input - // B - FluidUtils.getFluidStack(ThoriumFluoride, 70), // Input C - FluidUtils.getFluidStack(UraniumTetraFluoride, 70), // Input - // D - null, null, null, null, null, // Extra 5 inputs - FluidUtils.getFluidStack(LiFBeF2ThF4UF4, 1000), // Output - // Fluid - // 1 - null, // Output Fluid 2 - 60 * 60 * 20, // Duration - 500); - } catch (final NullPointerException e) { Logger.INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE"); @@ -1703,7 +1397,7 @@ public class RECIPES_GREGTECH { T5, 1000, 128000); addAR(T5, ItemUtils.getItemStackOfAmountFromOreDict("plateDenseAmericium", 4), - FluidUtils.getFluidStack("molten.krypton", 500), + FluidUtils.getFluidStack("krypton", 500), T6, 2000, 512000); addAR(ItemUtils.getItemStackOfAmountFromOreDict( @@ -1954,19 +1648,35 @@ public class RECIPES_GREGTECH { * so if you dissolve aparite in sulphuric acid you'll get a mixture of * SO2, H2O, HF and HCl */ - final FluidStack[] apatiteOutput = { FluidUtils.getFluidStack("sulfurousacid", 3800), - FluidUtils.getFluidStack("hydrogenchloride", 1000), FluidUtils.getFluidStack("hydrofluoricacid", 400) }; - GT_Values.RA.addDistillationTowerRecipe(FluidUtils.getFluidStack("sulfuricapatite", 5200), apatiteOutput, null, - 45 * 20, 256); + final FluidStack[] apatiteOutput = { + FluidUtils.getFluidStack("sulfurousacid", 3800), + FluidUtils.getFluidStack("hydrogenchloride", 1000), + FluidUtils.getFluidStack("hydrofluoricacid", 400) }; + GT_Values.RA.addDistillationTowerRecipe( + FluidUtils.getFluidStack("sulfuricapatite", 5200), + apatiteOutput, null, + 45 * 20, + 120); - final FluidStack[] sulfurousacidOutput = { FluidUtils.getFluidStack("sulfurdioxide", 500), + final FluidStack[] sulfurousacidOutput = { + FluidUtils.getFluidStack("sulfurdioxide", 500), FluidUtils.getFluidStack("water", 500) }; - GT_Values.RA.addDistillationTowerRecipe(FluidUtils.getFluidStack("sulfurousacid", 1000), sulfurousacidOutput, - null, 10 * 20, 60); - - final FluidStack[] sulfurdioxideOutput = { FluidUtils.getFluidStack("oxygen", 144 * 2) }; - GT_Values.RA.addDistillationTowerRecipe(FluidUtils.getFluidStack("sulfurdioxide", 144 * 3), sulfurdioxideOutput, - ItemUtils.getItemStackOfAmountFromOreDict("dustSulfur", 1), 5 * 20, 30); + GT_Values.RA.addDistillationTowerRecipe( + FluidUtils.getFluidStack("sulfurousacid", 1000), + sulfurousacidOutput, + null, + 10 * 20, + 60); + + final FluidStack[] sulfurdioxideOutput = { + FluidUtils.getFluidStack("oxygen", 2000) + }; + GT_Values.RA.addDistillationTowerRecipe( + FluidUtils.getFluidStack("sulfurdioxide", 144 * 3), + sulfurdioxideOutput, + ItemUtils.getItemStackOfAmountFromOreDict("dustSulfur", 1), + 5 * 20, + 30); } private static void addFuels() { @@ -2022,160 +1732,35 @@ public class RECIPES_GREGTECH { ItemList.Battery_Hull_HV.get(4L, new Object[0])); } - private static void fluidExtractorRecipes() { - //FLiBe fuel - CORE.RA.addFluidExtractionRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustLi2BeF4", 1), - FluidUtils.getFluidStack("li2bef4", 144), 100, 500); - //LFTR Fuel 1 - CORE.RA.addFluidExtractionRecipe(NUCLIDE.LiFBeF2ZrF4U235.getDust(1), - NUCLIDE.LiFBeF2ZrF4U235.getFluid(144), 250, 1000); - CORE.RA.addFluidExtractionRecipe(NUCLIDE.LiFBeF2ZrF4UF4.getDust(1), - NUCLIDE.LiFBeF2ZrF4UF4.getFluid(144), 150, 2000); - CORE.RA.addFluidExtractionRecipe(NUCLIDE.LiFBeF2ThF4UF4.getDust(1), - NUCLIDE.LiFBeF2ThF4UF4.getFluid(144), 200, 1500); - - //ZIRCONIUM_TETRAFLUORIDE - CORE.RA.addFluidExtractionRecipe(FLUORIDES.ZIRCONIUM_TETRAFLUORIDE.getDust(1), - FluidUtils.getFluidStack(ModItems.fluidZrF4, 144), 200, 512+256); - - - - /* GT_Values.RA.addFluidExtractionRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustLiBeF2ZrF4U235", 1), null, - FluidUtils.getFluidStack("molten.libef2zrf4u235", 144), 10000, 250, 1000); - //LFTR Fuel 2 - GT_Values.RA.addFluidExtractionRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustLiBeF2ZrF4UF4", 1), null, - FluidUtils.getFluidStack("molten.libef2zrf4uf4", 144), 10000, 150, 2000); - //LFTR Fuel 2 - GT_Values.RA.addFluidExtractionRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustLiBeF2ThF4UF4", 1), null, - FluidUtils.getFluidStack("molten.libef2thf4uf4", 144), 10000, 200, 1500);*/ + private static void fluidExtractorRecipes() { + } private static void chemicalBathRecipes() { - int[] chances = {9000, 6000, 3000}; - GT_Values.RA.addChemicalBathRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustTin", 12), - FluidUtils.getFluidStack("chlorine", 2400), - ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 3), - ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 4), - ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 5), chances, 30 * 20, 480); - chances = new int[]{9000, 3000, 1000}; - GT_Values.RA.addChemicalBathRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustRutile", 5), - FluidUtils.getFluidStack("chlorine", 4000), - ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 3), - ItemUtils.getItemStackOfAmountFromOreDict("dustTitanium", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustHafnium", 1), - chances, 30 * 20, 1024); - - GT_Values.RA.addChemicalBathRecipe(FLUORIDES.FLUORITE.getCrushed(2), FluidUtils.getFluidStack("hydrogen", 2000), - FLUORIDES.FLUORITE.getCrushedPurified(8), FLUORIDES.FLUORITE.getDustImpure(4), - FLUORIDES.FLUORITE.getDustPurified(2), new int[] { 10000, 5000, 1000 }, 30 * 20, 240); - - GT_Values.RA.addChemicalBathRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumCarbonate", 10), - FluidUtils.getFluidStack("hydrofluoricacid", 10 * 144), - ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumFluoride", 10), null, null, new int[] {}, 90 * 20, - 500); - + } - private static void centrifugeRecipes() { - - //Process Used Fuel Rods for Krypton - - //Uranium - GT_Values.RA.addCentrifugeRecipe( - CI.getNumberedCircuit(20), - ItemUtils.getItemStackFromFQRN("IC2:reactorUraniumSimpledepleted", 8), - GT_Values.NF, - ELEMENT.getInstance().KRYPTON.getFluid(60), - ItemList.IC2_Fuel_Rod_Empty.get(8), - ELEMENT.getInstance().URANIUM238.getDust(2), - ELEMENT.getInstance().URANIUM232.getSmallDust(1), - ELEMENT.getInstance().URANIUM233.getSmallDust(1), - ELEMENT.getInstance().URANIUM235.getSmallDust(1), - ELEMENT.getInstance().PLUTONIUM239.getTinyDust(1), - new int[] { 0, 0, 1000, 1000, 1000, 500 }, 500 * 20, 4000); - //Mox - GT_Values.RA.addCentrifugeRecipe( - CI.getNumberedCircuit(20), - ItemUtils.getItemStackFromFQRN("IC2:reactorMOXSimpledepleted", 8), - GT_Values.NF, - ELEMENT.getInstance().KRYPTON.getFluid(90), - ItemList.IC2_Fuel_Rod_Empty.get(8), - ELEMENT.getInstance().PLUTONIUM244.getDust(2), - ELEMENT.getInstance().PLUTONIUM241.getTinyDust(1), - ELEMENT.getInstance().PLUTONIUM239.getTinyDust(1), - ELEMENT.getInstance().PLUTONIUM238.getTinyDust(1), - ELEMENT.getInstance().PLUTONIUM239.getTinyDust(1), - new int[] { 0, 0, 500, 500, 500, 500 }, 750 * 20, 4000); - - //Thorium - GT_Values.RA.addCentrifugeRecipe( - CI.getNumberedCircuit(20), - ItemList.Depleted_Thorium_1.get(8), - GT_Values.NF, - ELEMENT.getInstance().KRYPTON.getFluid(30), - ItemList.IC2_Fuel_Rod_Empty.get(8), - ELEMENT.getInstance().THORIUM.getDust(2), - ELEMENT.getInstance().THORIUM232.getDust(1), - ELEMENT.getInstance().LUTETIUM.getSmallDust(1), - ELEMENT.getInstance().POLONIUM.getSmallDust(1), - ELEMENT.getInstance().THALLIUM.getTinyDust(1), - new int[] { 0, 0, 5000, 5000, 5000, 2500 }, 250 * 20, 4000); - - - + private static void centrifugeRecipes() { + } private static void mixerRecipes() { - GT_Values.RA.addMixerRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustSulfur", 1), null, null, null, - FluidUtils.getFluidStack("oxygen", 288), FluidUtils.getFluidStack("sulfurdioxide", 432), null, 600, 60); - GT_Values.RA.addMixerRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustUranium233", 4), - ItemUtils.getItemStackOfAmountFromOreDict("dustUranium235", 1), null, null, - FluidUtils.getFluidStack("hydrofluoricacid", 144 * 5), - FluidUtils.getFluidStack("molten.uraniumtetrafluoride", 144 * 5), null, 3000, 500); - /*GT_Values.RA.addMixerRecipe( - ItemUtils.getItemStackOfAmountFromOreDict("cellMercury", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustBarium", 2), - ItemUtils.getItemStackOfAmountFromOreDict("dustCalcium", 2), - ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 3), + + GT_Values.RA.addMixerRecipe( + ItemUtils.getItemStackOfAmountFromOreDict("dustSulfur", 1), + null, + null, + null, + FluidUtils.getFluidStack("oxygen", 2000), + FluidUtils.getFluidStack("sulfurdioxide", 3000), null, - ALLOY.HG1223.getFluid(144*16), - CI.emptyCells(1), - 30 * 20, - 500);*/ + 600, + 60); + } private static void chemicalReactorRecipes() { - GT_Values.RA.addChemicalRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumCarbonate", 5), // Input - ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumHydroxide", 5), // Input - null, // Fluid Input - null, // Fluid Output - ItemUtils.getItemStackOfAmountFromOreDict("dustLi2CO3CaOH2", 10), // Output - // Stack - 600 * 20); - - GT_Values.RA.addChemicalRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroxide", 5), // Input - null, // Input Stack 2 - FluidUtils.getFluidStack("hydrofluoricacid", 5 * 144), // Fluid - // Input - FluidUtils.getFluidStack("water", 5 * 144), // Fluid Output - ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumFluoride", 5), // Output - // Stack - 600 * 20); - - GT_Values.RA.addChemicalRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustApatite", 16), null, - FluidUtils.getFluidStack("sulfuricacid", 144 * 32), - FluidUtils.getFluidStack("sulfuricapatite", 144 * 8), - ItemUtils.getItemStackOfAmountFromOreDict("dustSmallSulfur", 1), 20 * 20); - - GT_Values.RA.addChemicalRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustLithium7", 1), null, - FluidUtils.getFluidStack("sulfuricacid", 144 * 8), FluidUtils.getFluidStack("sulfuriclithium", 144 * 2), - ItemUtils.getItemStackOfAmountFromOreDict("dustSmallLithium7", 1), 20 * 20); - - GT_Values.RA.addChemicalRecipe(ItemUtils.getItemStackOfAmountFromOreDict("cellOxygen", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustLithium7", 16), FluidUtils.getFluidStack("water", 1000), - FluidUtils.getFluidStack("lithiumhydroxide", 144 * 4), - CI.emptyCells(1), 300 * 20); - + //Bombs GT_Values.RA.addChemicalRecipe( ItemUtils.getSimpleStack(ModItems.itemBombCasing, 4), @@ -2191,80 +1776,15 @@ public class RECIPES_GREGTECH { FluidUtils.getFluidStack(RocketFuels.Kerosene, 100), null, ItemUtils.getSimpleStack(ModItems.itemBomb, 4), - 10 * 20); - - - // LFTR Fuel Related Compounds - if (GTNH) { - // Hydroxide - AddGregtechRecipe.addChemicalRecipeForBasicMachineOnly( - ItemUtils.getItemStackOfAmountFromOreDict("cellOxygen", 1), - ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogen", 1), GT_Values.NF, - FluidUtils.getFluidStack("hydroxide", 2000), - CI.emptyCells(2), GT_Values.NI, 8 * 20, 30); - // Beryllium Hydroxide - GT_Values.RA.addChemicalRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustBeryllium", 7), - ItemUtils.getGregtechCircuit(3), FluidUtils.getFluidStack("hydroxide", 1000), - FluidUtils.getFluidStack("berylliumhydroxide", 2000), GT_Values.NI, 8 * 20); - // Ammonium Bifluoride - GT_Values.RA.addChemicalRecipe(ItemUtils.getItemStackOfAmountFromOreDict("cellHydrofluoricAcid", 1), - ItemUtils.getGregtechCircuit(3), FluidUtils.getFluidStack("ammonium", 1000), - FluidUtils.getFluidStack("ammoniumbifluoride", 2000), - CI.emptyCells(1), 26 * 20); - // Ammonium - AddGregtechRecipe.addChemicalRecipeForBasicMachineOnly( - ItemUtils.getItemStackOfAmountFromOreDict("cellAmmonia", 1), - ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogen", 1), GT_Values.NF, - FluidUtils.getFluidStack("ammonium", 2000), - CI.emptyCells(2), GT_Values.NI, 20 * 20, 30); - } - - if (!GTNH) { - // Hydroxide - GT_Values.RA.addChemicalRecipe(ItemUtils.getItemStackOfAmountFromOreDict("cellOxygen", 1), - ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogen", 1), GT_Values.NF, - FluidUtils.getFluidStack("hydroxide", 2000), - CI.emptyCells(2), 8 * 20); - // Ammonia (moved to GTNH core mod) - GT_Values.RA.addChemicalRecipe(ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogen", 3), - ItemUtils.getItemStackOfAmountFromOreDict("dustMagnetite", 0), - FluidUtils.getFluidStack("nitrogen", 1000), FluidUtils.getFluidStack("ammonia", 1000), - CI.emptyCells(3), 14 * 20); - // Beryllium Hydroxide - GT_Values.RA.addChemicalRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustBeryllium", 7), GT_Values.NI, - FluidUtils.getFluidStack("hydroxide", 1000), FluidUtils.getFluidStack("berylliumhydroxide", 2000), - GT_Values.NI, 8 * 20); - // Ammonium Bifluoride - GT_Values.RA.addChemicalRecipe(ItemUtils.getItemStackOfAmountFromOreDict("cellHydrofluoricAcid", 1), - GT_Values.NI, FluidUtils.getFluidStack("ammonium", 1000), - FluidUtils.getFluidStack("ammoniumbifluoride", 2000), - CI.emptyCells(1), 26 * 20); - // Ammonium - GT_Values.RA.addChemicalRecipe(ItemUtils.getItemStackOfAmountFromOreDict("cellAmmonia", 1), - ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogen", 1), GT_Values.NF, - FluidUtils.getFluidStack("ammonium", 2000), - CI.emptyCells(2), 20 * 20); - } - - ItemStack temp_GT5u_SA = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cellHydrofluoricAcid_GT5U", 5); - if (temp_GT5u_SA != null) { - //Refine GT HF into GT++ HF - GT_Values.RA.addChemicalRecipe( - ItemUtils.getItemStackOfAmountFromOreDict("cellHydrofluoricAcid", 2), - temp_GT5u_SA, - null, // Fluid Input - FluidUtils.getFluidStack("hydrofluoricacid", 6000), // Fluid Output - CI.emptyCells(7), - 2 * 20); - } - - - //Technetium - GT_Values.RA.addChemicalRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustTechnetium99", 1), null, - FluidUtils.getFluidStack("sulfuricacid", 1000), FluidUtils.getFluidStack("sulfuricacid", 144 * 2), - ItemUtils.getItemStackOfAmountFromOreDict("dustTechnetium", 1), 100 * 20); - - + 10 * 20); + + GT_Values.RA.addChemicalRecipe( + CI.getNumberedAdvancedCircuit(21), + ItemUtils.getItemStackOfAmountFromOreDict("dustApatite", 32), + FluidUtils.getFluidStack("sulfuricacid", 4000), + FluidUtils.getFluidStack("sulfuricapatite", 8000), + ItemUtils.getItemStackOfAmountFromOreDict("dustSmallSulfur", 8), + 20 * 20); } @@ -2274,20 +1794,14 @@ public class RECIPES_GREGTECH { //ItemStack aInput1, ItemStack aInput2, //FluidStack aFluidInput, FluidStack aFluidOutput, //ItemStack aOutput1, ItemStack aOutput2, - //int aDuration, int aEUt, int aLevel) - - GT_Values.RA.addBlastRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumFluoride", 2), - ItemUtils.getItemStackOfAmountFromOreDict("dustBerylliumFluoride", 1), GT_Values.NF, GT_Values.NF, - ItemUtils.getItemStackOfAmountFromOreDict("dustLi2BeF4", 3), null, 60 * 20, 2000, 3000); - GT_Values.RA.addBlastRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustZrCl4", 1), null, GT_Values.NF, - GT_Values.NF, ItemUtils.getItemStackOfAmountFromOreDict("dustCookedZrCl4", 1), null, 60 * 20, 340, 300); + //int aDuration, int aEUt, int aLevel) //Synthetic Graphite GT_Values.RA.addBlastRecipe( CI.getNumberedCircuit(22), ALLOY.SILICON_CARBIDE.getDust(16), - ELEMENT.getInstance().NITROGEN.getFluid(4000), + ELEMENT.getInstance().NITROGEN.getFluidStack(4000), GT_Values.NF, ItemUtils.getItemStackOfAmountFromOreDict("dustGraphite", 8), ItemUtils.getItemStackOfAmountFromOreDict("dustSmallSilicon", 8), @@ -2299,7 +1813,7 @@ public class RECIPES_GREGTECH { GT_Values.RA.addBlastRecipe( GregtechItemList.Bomb_Cast.get(4), ALLOY.STEEL.getDust(16), - ELEMENT.getInstance().OXYGEN.getFluid(2000), + ELEMENT.getInstance().OXYGEN.getFluidStack(2000), GT_Values.NF, GregtechItemList.Bomb_Cast_Molten.get(4), null, @@ -2324,9 +1838,7 @@ public class RECIPES_GREGTECH { } private static void autoclaveRecipes() { - GT_Values.RA.addAutoclaveRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 9), - FluidUtils.getFluidStack("chlorine", 9 * 4 * 144), - ItemUtils.getItemStackOfAmountFromOreDict("pelletZirconium", 9), 0, 120 * 20, 30); + } private static void benderRecipes() { @@ -2349,9 +1861,7 @@ public class RECIPES_GREGTECH { } private static void macerationRecipes() { - GT_ModHandler.addPulverisationRecipe(ItemUtils.getItemStackOfAmountFromOreDict("pelletZirconium", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustZrCl4", 1)); - + GT_ModHandler.addPulverisationRecipe(ItemUtils.getItemStackOfAmountFromOreDict("blockMeatRaw", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustMeatRaw", 9)); @@ -2690,91 +2200,12 @@ public class RECIPES_GREGTECH { } - private static void sifterRecipes() { - - // Zirconium - GT_Values.RA.addSifterRecipe(ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedIlmenite", 1), - new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustIron", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustTinyWroughtIron", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustHafnium", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustHafnium", 1) }, - new int[] { 5000, 2500, 1000, 1000, 300, 300 }, 20 * 30, 500); - - // Zirconium - GT_Values.RA.addSifterRecipe(ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedTin", 1), - new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustTin", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustTinyZinc", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1) }, - new int[] { 10000, 5000, 1500, 1000, 500, 500 }, 20 * 30, 500); - - // Zirconium - GT_Values.RA.addSifterRecipe(ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedCassiterite", 1), - new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustCassiterite", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustTinyTin", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1) }, - new int[] { 10000, 5000, 1500, 1000, 500, 500 }, 20 * 30, 500); - - // Radium - GT_Values.RA.addSifterRecipe(ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedUranium", 1), - new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustUranium", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustTinyLead", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1) }, - new int[] { 10000, 5000, 1000, 500, 500, 500 }, 20 * 30, 500); - // Radium - GT_Values.RA.addSifterRecipe(ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedUraninite", 1), - new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustUraninite", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustTinyUranium", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1) }, - new int[] { 10000, 5000, 500, 250, 250, 250 }, 20 * 30, 500); - // Radium - GT_Values.RA.addSifterRecipe(ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedPitchblende", 1), - new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustPitchblende", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustTinyLead", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1) }, - new int[] { 10000, 5000, 500, 250, 250, 250 }, 20 * 30, 500); + private static void sifterRecipes() { + } private static void electroMagneticSeperatorRecipes() { - // Zirconium - GT_Values.RA.addElectromagneticSeparatorRecipe( - ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedBauxite", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustBauxite", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustSmallRutile", 1), - ItemUtils.getItemStackOfAmountFromOreDict("nuggetZirconium", 1), new int[] { 10000, 2500, 4000 }, - 20 * 20, 24); - // Zircon - GT_Values.RA.addElectromagneticSeparatorRecipe( - ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedMagnetite", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustMagnetite", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustSmallZircon", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustTinyZircon", 1), new int[] { 10000, 1250, 2500 }, - 20 * 20, 24); - GT_Values.RA.addElectromagneticSeparatorRecipe( - ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedCassiterite", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustCassiterite", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustSmallZircon", 1), - ItemUtils.getItemStackOfAmountFromOreDict("dustTinyZircon", 1), new int[] { 10000, 1250, 2500 }, - 20 * 20, 24); - - - + if (!GTNH) { // Trinium GT_Values.RA.addElectromagneticSeparatorRecipe( @@ -2801,9 +2232,6 @@ public class RECIPES_GREGTECH { 20 * 20, 24); } - - - } private static void advancedMixerRecipes() { diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java index 08d8dda039..d47b65391c 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java @@ -194,6 +194,12 @@ public class RECIPES_General { "stickBronze", "plateBronze", CI.craftingToolHammer_Hard, ItemUtils.simpleMetaStack(ModItems.itemBasicTurbine, 1, 1) ); + RecipeUtils.addShapedRecipe( + CI.craftingToolFile, "plateSteel", "stickSteel", + "plateSteel", "ringSteel", "plateSteel", + "stickSteel", "plateSteel", CI.craftingToolHammer_Hard, + ItemUtils.simpleMetaStack(ModItems.itemBasicTurbine, 2, 1) + ); } if (Meta_GT_Proxy.sDoesVolumetricFlaskExist) { @@ -433,12 +439,6 @@ public class RECIPES_General { generatePipeRecipes(e.mDefaultLocalName, e.getMass(), tVoltageMultiplier); } - RecipeUtils.addShapedGregtechRecipe( - CI.component_Plate[4], "rotorGtStainlessSteel", CI.component_Plate[4], - CI.getTieredCircuitOreDictName(3), CI.machineHull_HV, CI.getTieredCircuitOreDictName(3), - CI.component_Plate[4], CI.electricPump_HV, CI.component_Plate[4], - GregtechItemList.Hatch_Air_Intake.get(1L, new Object[0])); - RecipeUtils.addShapedGregtechRecipe(CI.component_Plate[6], ALLOY.MARAGING250.getGear(1), CI.component_Plate[6], CI.getTieredCircuitOreDictName(4), GregtechItemList.Casing_AdvancedVacuum.get(1), CI.getTieredCircuitOreDictName(4), CI.component_Plate[5], ItemList.Hatch_Input_IV.get(1), diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java index 76182e61d9..76182e61d9 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_MTWRAPPER.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_MTWRAPPER.java index 0d377f74de..0d377f74de 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_MTWRAPPER.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_MTWRAPPER.java diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java index 71b4c4ef48..71b4c4ef48 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java index 0a4e760a17..cd8d9311c0 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java @@ -10,6 +10,8 @@ import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.item.ModItems; import gtPlusPlus.core.item.chemistry.AgriculturalChem; +import gtPlusPlus.core.item.crafting.ItemDummyResearch; +import gtPlusPlus.core.item.crafting.ItemDummyResearch.ASSEMBLY_LINE_RESEARCH; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.material.ALLOY; @@ -99,6 +101,14 @@ public class RECIPES_Machines { public static ItemStack RECIPE_LFTROuterCasing; public static ItemStack RECIPE_LFTRInnerCasing; + //Milling + public static ItemStack RECIPE_ISAMill_Controller; + public static ItemStack RECIPE_ISAMill_Gearbox; + public static ItemStack RECIPE_ISAMill_Casing; + public static ItemStack RECIPE_ISAMill_Hatch; + public static ItemStack RECIPE_Flotation_Controller; + public static ItemStack RECIPE_Flotation_Casing; + //Cyclotron public static ItemStack RECIPE_CyclotronController; public static ItemStack RECIPE_CyclotronOuterCasing; @@ -242,6 +252,10 @@ public class RECIPES_Machines { algaeFarm(); chemPlant(); zyngen(); + milling(); + sparging(); + chisels(); + rockBreaker(); } @@ -263,6 +277,35 @@ public class RECIPES_Machines { } private static void chemPlant() { + + + GT_ModHandler.addCraftingRecipe( + GregtechItemList.Casing_Machine_Custom_1.get(2L, new Object[0]), + CI.bits, + new Object[]{ + "PhP", + "PFP", + "PwP", + 'P', + OrePrefixes.plate.get(Materials.Bronze), + 'F', + OrePrefixes.frameGt.get(Materials.Bronze) + } + ); + + GT_ModHandler.addCraftingRecipe( + GregtechItemList.Casing_Machine_Custom_2.get(2L, new Object[0]), + CI.bits, + new Object[]{ + "PhP", + "PFP", + "PwP", + 'P', + OrePrefixes.plate.get(Materials.Aluminium), + 'F', + OrePrefixes.frameGt.get(Materials.Aluminium) + } + ); CORE.RA.addSixSlotAssemblingRecipe( new ItemStack[] { @@ -273,7 +316,7 @@ public class RECIPES_Machines { CI.getTieredComponentOfMaterial(Materials.CobaltBrass, OrePrefixes.dust, 16), CI.getTieredComponent(OrePrefixes.frameGt, 2, 4), }, - ALLOY.STEEL.getFluid(2 * (144 * 4)), + ALLOY.STEEL.getFluidStack(2 * (144 * 4)), GregtechItemList.ChemicalPlant_Controller.get(1), 120 * 20, MaterialUtils.getVoltageForTier(2)); @@ -288,7 +331,7 @@ public class RECIPES_Machines { CI.getTieredComponentOfMaterial(Materials.Lead, OrePrefixes.plate, 48), CI.getTieredComponentOfMaterial(Materials.SolderingAlloy, OrePrefixes.wireFine, 16), }, - ALLOY.BRONZE.getFluid(2 * (144 * 4)), + ALLOY.BRONZE.getFluidStack(2 * (144 * 4)), GregtechItemList.Bus_Catalysts.get(1), 60 * 20, MaterialUtils.getVoltageForTier(2)); @@ -316,7 +359,7 @@ public class RECIPES_Machines { CI.getTieredComponentOfMaterial(Materials.Bronze, OrePrefixes.bolt, 16), CI.getTieredComponentOfMaterial(Materials.Redstone, OrePrefixes.dust, 32), }, - ALLOY.POTIN.getFluid(2 * (144 * 4)), + ALLOY.POTIN.getFluidStack(2 * (144 * 4)), GregtechItemList.AlgaeFarm_Controller.get(1), 60 * 20, MaterialUtils.getVoltageForTier(1)); @@ -334,10 +377,10 @@ public class RECIPES_Machines { CI.getTieredComponent(OrePrefixes.circuit, 6, 8) }, new FluidStack[] { - ALLOY.AQUATIC_STEEL.getFluid(144 * 32), - ALLOY.BABBIT_ALLOY.getFluid(144 * 16), - ALLOY.BRONZE.getFluid(144 * 64), - ALLOY.KANTHAL.getFluid(144 * 16), + ALLOY.AQUATIC_STEEL.getFluidStack(144 * 32), + ALLOY.BABBIT_ALLOY.getFluidStack(144 * 16), + ALLOY.BRONZE.getFluidStack(144 * 64), + ALLOY.KANTHAL.getFluidStack(144 * 16), }, new ItemStack[] { GregtechItemList.Machine_Adv_DistillationTower.get(1) @@ -374,7 +417,7 @@ public class RECIPES_Machines { CI.getTransmissionComponent(i - 1, 8), CI.getTieredComponent(OrePrefixes.cableGt08, i, 16) }, - ALLOY.EGLIN_STEEL.getFluid(i * (144 * 4)), + ALLOY.EGLIN_STEEL.getFluidStack(i * (144 * 4)), aOutputs[aIndex++].copy(), 300 * 20, MaterialUtils.getVoltageForTier(i)); @@ -514,7 +557,7 @@ public class RECIPES_Machines { CI.machineHull_IV, ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(7), 2) }, - ELEMENT.getInstance().TANTALUM.getFluid(144 * 16), + ELEMENT.getInstance().TANTALUM.getFluidStack(144 * 16), GregtechItemList.Gregtech_Computer_Cube.get(1), 60 * 20 * 3, 8000); @@ -528,7 +571,7 @@ public class RECIPES_Machines { ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(1), 2), ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(2), 2) }, - ELEMENT.getInstance().IRON.getFluid(144 * 4), + ELEMENT.getInstance().IRON.getFluidStack(144 * 4), ItemUtils.getSimpleStack(ModBlocks.blockCircuitProgrammer), 60 * 10 * 1, 30); @@ -541,7 +584,7 @@ public class RECIPES_Machines { ItemUtils.getItemStackOfAmountFromOreDict("plateDenseLead", 9), ItemUtils.getSimpleStack(Blocks.chest) }, - ELEMENT.getInstance().LEAD.getFluid(144 * 16), + ELEMENT.getInstance().LEAD.getFluidStack(144 * 16), ItemUtils.getSimpleStack(ModBlocks.blockDecayablesChest), 60 * 10 * 3, 60); @@ -556,7 +599,7 @@ public class RECIPES_Machines { ItemUtils.getItemStackOfAmountFromOreDict("wireFinePlatinum", GTNH ? 64 : 32), ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(GTNH ? 7 : 6), GTNH ? 5 : 4) }, - ALLOY.NIOBIUM_CARBIDE.getFluid(144 * 16), + ALLOY.NIOBIUM_CARBIDE.getFluidStack(144 * 16), GregtechItemList.RTG.get(1), 60 * 20 * 10, 8000); @@ -569,7 +612,7 @@ public class RECIPES_Machines { ItemUtils.getItemStackOfAmountFromOreDict("plateTumbaga", 8), ItemUtils.getSimpleStack(Blocks.jukebox) }, - ELEMENT.getInstance().COPPER.getFluid(144 * 2), + ELEMENT.getInstance().COPPER.getFluidStack(144 * 2), ItemUtils.getSimpleStack(ModBlocks.blockCustomJukebox), 20 * 30, 30); @@ -586,7 +629,7 @@ public class RECIPES_Machines { ALLOY.EGLIN_STEEL.getPlate(GTNH ? 8 : 4), ALLOY.POTIN.getScrew(GTNH ? 12 : 6) }, - ALLOY.TUMBAGA.getFluid(144 * 4), + ALLOY.TUMBAGA.getFluidStack(144 * 4), ItemUtils.getSimpleStack(ModBlocks.blockPooCollector), 20 * 60, 30); @@ -1020,9 +1063,9 @@ public class RECIPES_Machines { CI.getGear(3, GTNH ? 4 : 2) }; FluidStack[] aSemiFluidFluidInputs = new FluidStack[] { - ALLOY.BRONZE.getFluid(144 * 8), - ALLOY.STEEL.getFluid(144 * 8), - ELEMENT.getInstance().ALUMINIUM.getFluid(144 * 8), + ALLOY.BRONZE.getFluidStack(144 * 8), + ALLOY.STEEL.getFluidStack(144 * 8), + ELEMENT.getInstance().ALUMINIUM.getFluidStack(144 * 8), }; //ItemUtils.simpleMetaStack("IC2:blockGenerator:7", 7, 1); @@ -1363,14 +1406,24 @@ public class RECIPES_Machines { } //Air Intake Hatch - ItemList FluidRegulator_IV = ItemUtils.getValueOfItemList("FluidRegulator_IV", ItemList.Pump_IV); - ItemStack aTieredFluidRegulator = CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK ? FluidRegulator_IV.get(1) : ItemList.Pump_IV.get(1); RecipeUtils.addShapedGregtechRecipe( CI.component_Plate[6], ItemList.Casing_Grate.get(1), CI.component_Plate[6], - CI.component_Plate[6], aTieredFluidRegulator, CI.component_Plate[6], - CI.getTieredCircuit(4), ItemList.Hatch_Input_IV.get(1), CI.getTieredCircuit(4), + CI.component_Plate[6], CI.getFluidRegulator(5, 1), CI.component_Plate[6], + CI.getTieredCircuit(5), ItemList.Hatch_Input_IV.get(1), CI.getTieredCircuit(5), GregtechItemList.Hatch_Air_Intake.get(1)); - + + + RecipeUtils.addShapedGregtechRecipe( + CI.getPlate(6, 1), ItemList.Casing_Gearbox_Titanium.get(1), CI.getPlate(6, 1), + CI.getPlate(6, 1), CI.getFluidRegulator(5, 1), CI.getPlate(6, 1), + CI.getTieredCircuit(6), ItemList.Hatch_Input_IV.get(1), CI.getTieredCircuit(6), + GregtechItemList.Hatch_Reservoir.get(1)); + + RecipeUtils.addShapedGregtechRecipe( + CI.getPlate(7, 1), GregtechItemList.Hatch_Air_Intake.get(1), CI.getPlate(7, 1), + CI.getPlate(7, 1), CI.getFluidRegulator(7, 1), CI.getPlate(7, 1), + CI.getTieredCircuit(7), ItemList.Hatch_Input_ZPM.get(1), CI.getTieredCircuit(7), + GregtechItemList.Hatch_Air_Intake_Extreme.get(1)); if (CORE.ConfigSwitches.enableMultiblock_LiquidFluorideThoriumReactor){ //Thorium Reactor @@ -1383,18 +1436,18 @@ public class RECIPES_Machines { RecipeUtils.addShapedGregtechRecipe( controlCircuit, "cableGt12NaquadahAlloy", controlCircuit, "plateDoubleHastelloyN", GregtechItemList.Gregtech_Computer_Cube.get(1), "plateDoubleHastelloyN", - "plateThorium232", CI.machineHull_UV, "plateThorium232", + "plateThorium232", CI.machineHull_EV, "plateThorium232", RECIPE_LFTRController); } else { RecipeUtils.addShapedGregtechRecipe( controlCircuit, "cableGt12NaquadahAlloy", controlCircuit, "plateDoubleHastelloyN", GregtechItemList.Gregtech_Computer_Cube.get(1), "plateDoubleHastelloyN", - "plateThorium232", CI.machineHull_LuV, "plateThorium232", + "plateThorium232", CI.machineHull_IV, "plateThorium232", RECIPE_LFTRController); } RecipeUtils.addShapedGregtechRecipe( "plateDoubleZeron100", CI.craftingToolScrewdriver, "plateDoubleZeron100", - "gearGtTalonite", CI.fieldGenerator_ULV, "gearGtTalonite", + "gearGtTalonite", CI.fieldGenerator_MV, "gearGtTalonite", "plateDoubleZeron100", CI.craftingToolHammer_Hard, "plateDoubleZeron100", RECIPE_LFTRInnerCasing); @@ -1412,9 +1465,9 @@ public class RECIPES_Machines { //Fission Fuel Plant RecipeUtils.addShapedGregtechRecipe( - CI.getTieredCircuit(5), CI.craftingToolSolderingIron, CI.getTieredCircuit(5), + CI.getTieredCircuitOreDictName(5), CI.craftingToolSolderingIron, CI.getTieredCircuitOreDictName(5), "plateDenseTungstenSteel", GregtechItemList.Gregtech_Computer_Cube.get(1), "plateDenseTungstenSteel", - "gearGtStellite", CI.machineHull_LuV, "gearGtStellite", + "gearGtStellite", CI.machineHull_IV, "gearGtStellite", GregtechItemList.Industrial_FuelRefinery.get(1)); ItemStack mInnerTank; @@ -1445,7 +1498,30 @@ public class RECIPES_Machines { "ringInconel792", "gearGtHastelloyX", CI.component_Plate[5], CI.craftingToolHammer_Hard, "frameGtHastelloyC276", CI.craftingToolWrench, CI.component_Plate[5], CI.getTieredMachineCasing(4), "ringInconel792", - GregtechItemList.Casing_Refinery_Structural.get(Casing_Amount)); + GregtechItemList.Casing_Refinery_Structural.get(Casing_Amount)); + + RecipeUtils.addShapedGregtechRecipe( + CI.getPlate(5, 1), ALLOY.HASTELLOY_X.getPlateDouble(1), CI.getPlate(5, 1), + CI.getPlate(5, 1), CI.getTieredMachineCasing(5), CI.getPlate(5, 1), + CI.getRobotArm(5, 1), ItemList.Casing_FrostProof.get(1), CI.getRobotArm(5, 1), + GregtechItemList.ColdTrap_IV.get(1)); + RecipeUtils.addShapedGregtechRecipe( + CI.getPlate(7, 1), ALLOY.HS188A.getPlateDouble(1), CI.getPlate(7, 1), + CI.getPlate(7, 1), GregtechItemList.ColdTrap_IV.get(1), CI.getPlate(7, 1), + CI.getRobotArm(7, 1), ItemList.Casing_FrostProof.get(1), CI.getRobotArm(7, 1), + GregtechItemList.ColdTrap_ZPM.get(1)); + + RecipeUtils.addShapedGregtechRecipe( + CI.getFieldGenerator(3, 1), CI.getRobotArm(5, 1), CI.getPlate(5, 1), + ALLOY.HASTELLOY_N.getPlateDouble(1), ItemList.Machine_IV_ChemicalReactor.get(1), ALLOY.HASTELLOY_N.getPlateDouble(1), + CI.getPlate(5, 1), ALLOY.HASTELLOY_N.getPlateDouble(1), CI.getFieldGenerator(3, 1), + GregtechItemList.ReactorProcessingUnit_IV.get(1)); + RecipeUtils.addShapedGregtechRecipe( + CI.getFieldGenerator(5, 1), CI.getRobotArm(7, 1), CI.getPlate(7, 1), + ALLOY.HS188A.getPlateDouble(1), GregtechItemList.ReactorProcessingUnit_IV.get(1), ALLOY.HS188A.getPlateDouble(1), + CI.getPlate(7, 1), ALLOY.HS188A.getPlateDouble(1), CI.getFieldGenerator(5, 1), + GregtechItemList.ReactorProcessingUnit_ZPM.get(1)); + } //Shelves @@ -1478,7 +1554,7 @@ public class RECIPES_Machines { ALLOY.EGLIN_STEEL.getLongRod(GTNH ? 16 : 4), CI.getElectricPiston(3, GTNH ? 4 : 2) }, - ALLOY.ZIRCONIUM_CARBIDE.getFluid(144 * 8), //Input Fluid + ALLOY.ZIRCONIUM_CARBIDE.getFluidStack(144 * 8), //Input Fluid RECIPE_CyclotronOuterCasing, 30 * 20 * 2, MaterialUtils.getVoltageForTier(4)); @@ -1494,7 +1570,7 @@ public class RECIPES_Machines { ALLOY.INCOLOY_020.getScrew(GTNH ? 64 : 32), CI.getFieldGenerator(4, GTNH ? 2 : 1) }, - ALLOY.HG1223.getFluid(144 * 5), //Input Fluid + ALLOY.HG1223.getFluidStack(144 * 5), //Input Fluid RECIPE_CyclotronInnerCoil, 60 * 20 * 2, MaterialUtils.getVoltageForTier(5)); @@ -1510,7 +1586,7 @@ public class RECIPES_Machines { ALLOY.INCOLOY_MA956.getScrew(GTNH ? 64 : 16), ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(GTNH ? 6 : 5), GTNH ? 8 : 16) }, - ALLOY.INCOLOY_020.getFluid(144 * 9), //Input Fluid + ALLOY.INCOLOY_020.getFluidStack(144 * 9), //Input Fluid RECIPE_CyclotronController, 60 * 20 * 5, MaterialUtils.getVoltageForTier(5)); @@ -1806,9 +1882,9 @@ public class RECIPES_Machines { CORE.RA.addAssemblylineRecipe( ItemList.FusionComputer_UV.get(1), (int) GT_Values.V[5], - new ItemStack[] { - ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(9), 4 * (GTNH ? 2 : 1)), - ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(7), 32 * (GTNH ? 2 : 1)), + new Object[] { + new Object[] {CI.getTieredCircuitOreDictName(9), 4 * (GTNH ? 2 : 1)}, + new Object[] {CI.getTieredCircuitOreDictName(7), 32 * (GTNH ? 2 : 1)}, ItemUtils.getItemStackOfAmountFromOreDict("wireGt16Superconductor", 8 * (GTNH ? 4 : 2)), ItemUtils.getItemStackOfAmountFromOreDict("plateDenseNeutronium", 2 * (GTNH ? 4 : 1)), ItemUtils.getSimpleStack((GTNH ? CI.fieldGenerator_MAX : CI.fieldGenerator_ZPM), 5), @@ -1817,8 +1893,8 @@ public class RECIPES_Machines { GregtechItemList.Casing_Fusion_Internal.get(1) }, new FluidStack[] { - ALLOY.PIKYONIUM.getFluid(32 * 144 * (GTNH ? 2 : 1)), - ALLOY.HG1223.getFluid(64 * 144) + ALLOY.PIKYONIUM.getFluidStack(32 * 144 * (GTNH ? 2 : 1)), + ALLOY.HG1223.getFluidStack(64 * 144) }, GregtechItemList.FusionComputer_UV2.get(1), (int) GT_Values.V[6], @@ -1828,9 +1904,9 @@ public class RECIPES_Machines { CORE.RA.addAssemblylineRecipe( ItemList.Casing_Fusion2.get(1), (int) GT_Values.V[4], - new ItemStack[] { - ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(5), 8 * (GTNH ? 2 : 1)), - ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(4), 16 * (GTNH ? 2 : 1)), + new Object[] { + new Object[] {CI.getTieredCircuitOreDictName(5), 8 * (GTNH ? 2 : 1)}, + new Object[] {CI.getTieredCircuitOreDictName(4), 16 * (GTNH ? 2 : 1)}, ItemUtils.getItemStackOfAmountFromOreDict("blockTungstenCarbide", 4 * (GTNH ? 2 : 1)), ItemUtils.getItemStackOfAmountFromOreDict("plateNeutronium", 2 * (GTNH ? 2 : 1)), ItemUtils.getSimpleStack((GTNH ? CI.electricMotor_MAX : CI.electricMotor_ZPM), 3 * (GTNH ? 2 : 1)), @@ -1840,7 +1916,7 @@ public class RECIPES_Machines { }, new FluidStack[] { Materials.NaquadahAlloy.getMolten(576 * (GTNH ? 2 : 1)), - ALLOY.ZERON_100.getFluid(16 * 144) + ALLOY.ZERON_100.getFluidStack(16 * 144) }, GregtechItemList.Casing_Fusion_External.get(1), (int) GT_Values.V[5], @@ -1850,20 +1926,20 @@ public class RECIPES_Machines { CORE.RA.addAssemblylineRecipe( ItemList.Casing_Fusion_Coil.get(1), (int) GT_Values.V[4], - new ItemStack[] { - ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(8), 4 * (GTNH ? 2 : 1)), - ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(6), 8 * (GTNH ? 2 : 1)), + new Object[] { + new Object[] {CI.getTieredCircuitOreDictName(8), 4 * (GTNH ? 2 : 1)}, + new Object[] {CI.getTieredCircuitOreDictName(6), 8 * (GTNH ? 2 : 1)}, ItemUtils.getItemStackOfAmountFromOreDict("plateNeutronium", 2 * (GTNH ? 3 : 1)), ItemUtils.getSimpleStack((GTNH ? CI.emitter_MAX : CI.emitter_ZPM), 2 * (GTNH ? 2 : 1)), ItemUtils.getSimpleStack((GTNH ? CI.sensor_MAX : CI.sensor_ZPM), 2 * (GTNH ? 2 : 1)), ItemUtils.getSimpleStack((GTNH ? CI.fieldGenerator_MAX : CI.fieldGenerator_LuV), 2 * (GTNH ? 2 : 1)), - ItemUtils.getSimpleStack((GTNH ? ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(8), 8) : CI.getDataOrb()), 8 * (GTNH ? 2 : 1)), + new Object[] {CI.getTieredCircuitOreDictName(8), 8}, ItemList.Energy_LapotronicOrb2.get(2 * (GTNH ? 16 : 1)), ItemList.Casing_Fusion_Coil.get(1) }, new FluidStack[] { - ALLOY.CINOBITE.getFluid(16 * 144 * (GTNH ? 2 : 1)), - ALLOY.ABYSSAL.getFluid(64 * 144) + ALLOY.CINOBITE.getFluidStack(16 * 144 * (GTNH ? 2 : 1)), + ALLOY.ABYSSAL.getFluidStack(64 * 144) }, GregtechItemList.Casing_Fusion_Internal.get(1), (int) GT_Values.V[5], @@ -1897,7 +1973,7 @@ public class RECIPES_Machines { ALLOY.TRINIUM_REINFORCED_STEEL.getPlateDouble(4 * (GTNH ? 2 : 1)), ItemUtils.getSimpleStack((GTNH ? CI.machineHull_UV : CI.machineHull_LuV), 1 * (GTNH ? 2 : 1)), }, - ALLOY.MARAGING350.getFluid(144 * 16 * (GTNH ? 2 : 1)), + ALLOY.MARAGING350.getFluidStack(144 * 16 * (GTNH ? 2 : 1)), GregtechItemList.Casing_BedrockMiner.get(1), (int) GT_Values.V[4], (int) GT_Values.V[6]); @@ -2046,7 +2122,7 @@ public class RECIPES_Machines { ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore"+(GTNH ? "2" : "1"), GTNH ? 4 : 2), ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(GTNH ? 3 : 2), GTNH ? 10 : 5) }, - aMat_B[3].getFluid(144 * 8), //Input Fluid + aMat_B[3].getFluidStack(144 * 8), //Input Fluid GregtechItemList.Hatch_Control_Core.get(1), 60 * 20 * 5, MaterialUtils.getVoltageForTier(3)); @@ -2367,6 +2443,284 @@ public class RECIPES_Machines { 60 * 20 * 12, MaterialUtils.getVoltageForTier(7)); } + + private static void milling() { + + + /*public static ItemStack RECIPE_ISAMill_Controller; + public static ItemStack RECIPE_ISAMill_Gearbox; + public static ItemStack RECIPE_ISAMill_Casing; + public static ItemStack RECIPE_ISAMill_Hatch; + public static ItemStack RECIPE_Flotation_Controller; + public static ItemStack RECIPE_Flotation_Casing;*/ + + // Isa Mill Controller + CORE.RA.addAssemblylineRecipe( + ItemList.Machine_IV_Macerator.get(1), + 20 * 60 * 20, + new Object[] { + GregtechItemList.Casing_IsaMill_Gearbox.get(4), + CI.getTieredGTPPMachineCasing(6, 4), + ItemList.Component_Grinder_Tungsten.get(16), + new Object[] {CI.getTieredCircuitOreDictName(6), 8}, + ALLOY.INCONEL_625.getGear(8), + ALLOY.INCONEL_625.getPlate(32), + ALLOY.ZERON_100.getPlateDouble(8), + ALLOY.ZERON_100.getPlateDouble(8), + ALLOY.ZERON_100.getScrew(64), + CI.getTieredComponentOfMaterial(Materials.NiobiumTitanium, OrePrefixes.wireFine, 32), + CI.getTieredComponentOfMaterial(Materials.NiobiumTitanium, OrePrefixes.wireFine, 32), + CI.getTieredComponentOfMaterial(Materials.Titanium, OrePrefixes.foil, 16), + CI.getTieredComponentOfMaterial(Materials.Titanium, OrePrefixes.foil, 16), + + }, + new FluidStack[] { + CI.getTieredFluid(6, 16 * 144), + CI.getAlternativeTieredFluid(6, 32 * 144), + CI.getTertiaryTieredFluid(6, 32 * 144) + }, + GregtechItemList.Controller_IsaMill.get(1), + 20 * 60 * 10, + MaterialUtils.getVoltageForTier(6)); + + // Isa Mill Gearbox + CORE.RA.addSixSlotAssemblingRecipe( + new ItemStack[] { + CI.getNumberedAdvancedCircuit(7), + ItemList.Casing_Gearbox_Titanium.get(2), + ALLOY.INCONEL_625.getGear(4), + CI.getTieredComponentOfMaterial(Materials.HSSE, OrePrefixes.gearGtSmall, 8), + ALLOY.INCONEL_625.getPlate(16), + ALLOY.ZERON_100.getBolt(16), + }, + ALLOY.TUNGSTENSTEEL.getFluidStack(8 * 144), + GregtechItemList.Casing_IsaMill_Gearbox.get(1), + 60 * 20 * 2, + MaterialUtils.getVoltageForTier(6)); + + // Isa Mill Casing + CORE.RA.addSixSlotAssemblingRecipe( + new ItemStack[] { + CI.getNumberedAdvancedCircuit(7), + CI.getTieredGTPPMachineCasing(5, 1), + ALLOY.INCONEL_625.getPlate(8), + ALLOY.ZERON_100.getRod(4), + CI.getTieredComponentOfMaterial(Materials.HSSG, OrePrefixes.gearGtSmall, 4), + ALLOY.ZERON_100.getScrew(8), + }, + ELEMENT.getInstance().TITANIUM.getFluidStack(4 * 144), + GregtechItemList.Casing_IsaMill_Casing.get(1), + 60 * 20 * 2, + MaterialUtils.getVoltageForTier(6)); + + // Isa Mill Pipe + CORE.RA.addSixSlotAssemblingRecipe( + new ItemStack[] { + CI.getNumberedAdvancedCircuit(7), + CI.getTieredGTPPMachineCasing(4, 2), + ALLOY.INCONEL_625.getPlateDouble(4), + ALLOY.INCOLOY_MA956.getRing(8), + CI.getTieredComponentOfMaterial(Materials.HSSE, OrePrefixes.plate, 8), + ALLOY.INCOLOY_MA956.getBolt(16), + }, + ELEMENT.getInstance().ALUMINIUM.getFluidStack(8 * 144), + GregtechItemList.Casing_IsaMill_Pipe.get(1), + 60 * 20 * 8, + MaterialUtils.getVoltageForTier(4)); + + // Flotation Cell Controller + CORE.RA.addAssemblylineRecipe( + ItemList.Distillation_Tower.get(1), + 20 * 60 * 20, + new Object[] { + GregtechItemList.Casing_Flotation_Cell.get(4), + CI.getTieredGTPPMachineCasing(5, 4), + ItemList.Machine_IV_Distillery.get(1), + new Object[] {CI.getTieredCircuitOreDictName(6), 8}, + ALLOY.STELLITE.getGear(8), + ALLOY.STELLITE.getPlate(32), + ALLOY.HASTELLOY_N.getPlateDouble(8), + ALLOY.HASTELLOY_N.getPlateDouble(8), + ALLOY.HASTELLOY_N.getScrew(64), + CI.getTieredComponentOfMaterial(Materials.YttriumBariumCuprate, OrePrefixes.wireFine, 64), + CI.getTieredComponentOfMaterial(Materials.YttriumBariumCuprate, OrePrefixes.wireFine, 64), + CI.getTieredComponentOfMaterial(Materials.Platinum, OrePrefixes.foil, 32), + CI.getTieredComponentOfMaterial(Materials.Platinum, OrePrefixes.foil, 32), + + }, + new FluidStack[] { + CI.getTieredFluid(5, 16 * 144), + CI.getAlternativeTieredFluid(4, 32 * 144), + CI.getTertiaryTieredFluid(4, 32 * 144) + }, + GregtechItemList.Controller_Flotation_Cell.get(1), + 20 * 60 * 10, + MaterialUtils.getVoltageForTier(6)); + + // Flotation Cell Casing + CORE.RA.addSixSlotAssemblingRecipe( + new ItemStack[] { + CI.getNumberedAdvancedCircuit(7), + CI.getTieredGTPPMachineCasing(4, 1), + ALLOY.AQUATIC_STEEL.getPlate(8), + ALLOY.STELLITE.getRing(8), + CI.getTieredComponentOfMaterial(Materials.HSSG, OrePrefixes.plateDouble, 4), + ALLOY.HASTELLOY_N.getScrew(8), + }, + ALLOY.STAINLESS_STEEL.getFluidStack(8 * 144), + GregtechItemList.Casing_Flotation_Cell.get(1), + 60 * 20 * 2, + MaterialUtils.getVoltageForTier(6)); + + // Milling Bus + CORE.RA.addSixSlotAssemblingRecipe( + new ItemStack[] { + CI.getNumberedAdvancedCircuit(7), + CI.getTieredGTPPMachineCasing(5, 1), + ItemList.Hatch_Input_Bus_EV.get(1), + CI.getTieredComponentOfMaterial(Materials.Titanium, OrePrefixes.gearGt, 8), + CI.getTieredComponentOfMaterial(Materials.TungstenSteel, OrePrefixes.plate, 32), + CI.getTieredComponentOfMaterial(Materials.SolderingAlloy, OrePrefixes.wireFine, 16), + }, + ELEMENT.getInstance().TUNGSTEN.getFluidStack(8 * 144), + GregtechItemList.Bus_Milling_Balls.get(1), + 60 * 20 * 4, + MaterialUtils.getVoltageForTier(5)); + + } + + private static void sparging() { + + // Sparge Tower Research + CORE.RA.addSixSlotAssemblingRecipe( + new ItemStack[] { + CI.getNumberedAdvancedCircuit(8), + ELEMENT.getInstance().HELIUM.getCell(8), + ELEMENT.getInstance().FLUORINE.getCell(8), + ALLOY.HS188A.getIngot(8), + ItemList.Distillation_Tower.get(1) + }, + null, + ItemDummyResearch.getResearchStack(ASSEMBLY_LINE_RESEARCH.RESEARCH_10_SPARGING, 1), + 60 * 20 * 5, + MaterialUtils.getVoltageForTier(5)); + + // Sparge Tower Controller + CORE.RA.addAssemblylineRecipe( + ItemDummyResearch.getResearchStack(ASSEMBLY_LINE_RESEARCH.RESEARCH_10_SPARGING, 1), + 20 * 60 * 20, + new Object[] { + GregtechItemList.Casing_Sparge_Tower_Exterior.get(4), + CI.getTieredGTPPMachineCasing(4, 4), + ItemList.Machine_IV_Distillery.get(1), + new Object[] {CI.getTieredCircuitOreDictName(5), 8}, + ALLOY.HS188A.getGear(8), + ALLOY.HS188A.getPlate(32), + ALLOY.HASTELLOY_N.getPlateDouble(8), + ALLOY.HASTELLOY_N.getPlateDouble(8), + ALLOY.HASTELLOY_N.getScrew(64), + CI.getTieredComponentOfMaterial(Materials.YttriumBariumCuprate, OrePrefixes.wireFine, 64), + CI.getTieredComponentOfMaterial(Materials.YttriumBariumCuprate, OrePrefixes.wireFine, 64), + CI.getTieredComponentOfMaterial(Materials.Platinum, OrePrefixes.foil, 32), + CI.getTieredComponentOfMaterial(Materials.Platinum, OrePrefixes.foil, 32), + + }, + new FluidStack[] { + CI.getTieredFluid(4, 16 * 144), + CI.getAlternativeTieredFluid(3, 32 * 144), + CI.getTertiaryTieredFluid(3, 32 * 144) + }, + GregtechItemList.Controller_Sparge_Tower.get(1), + 20 * 60 * 10, + MaterialUtils.getVoltageForTier(6)); + + // Sparge Tower Casing + CORE.RA.addSixSlotAssemblingRecipe( + new ItemStack[] { + CI.getNumberedAdvancedCircuit(8), + CI.getTieredGTPPMachineCasing(3, 1), + ALLOY.HS188A.getPlate(8), + ALLOY.HASTELLOY_N.getRing(4), + CI.getTieredComponentOfMaterial(Materials.TungstenSteel, OrePrefixes.plateDouble, 4), + ALLOY.HASTELLOY_N.getScrew(4), + }, + ALLOY.STAINLESS_STEEL.getFluidStack(8 * 144), + GregtechItemList.Casing_Sparge_Tower_Exterior.get(1), + 60 * 20 * 2, + MaterialUtils.getVoltageForTier(5)); + } + + private static void chisels() { + ItemStack[] aChisels = new ItemStack[] { + GregtechItemList.GT_Chisel_LV.get(1), + GregtechItemList.GT_Chisel_MV.get(1), + GregtechItemList.GT_Chisel_HV.get(1), + }; + for (int i=1;i<4;i++) { + CORE.RA.addSixSlotAssemblingRecipe( + new ItemStack[] { + CI.getNumberedBioCircuit(10+i), + CI.getTieredMachineCasing(i), + CI.getPlate(i, 4), + CI.getElectricMotor(i, 2), + CI.getConveyor(i, 2), + CI.getRobotArm(i, 1) + }, + CI.getTieredFluid(i, 144 * 4), + aChisels[i-1], + 20 * 20, + MaterialUtils.getVoltageForTier(i)); + } + + CORE.RA.addSixSlotAssemblingRecipe( + new ItemStack[] { + CI.getNumberedBioCircuit(14), + aChisels[2], + CI.getPlate(4, 8), + CI.getElectricMotor(4, 8), + CI.getConveyor(4, 8), + CI.getRobotArm(4, 4) + }, + CI.getTieredFluid(4, 144 * 8), + GregtechItemList.Controller_IndustrialAutoChisel.get(1), + 20 * 20, + MaterialUtils.getVoltageForTier(4)); + + CORE.RA.addSixSlotAssemblingRecipe( + new ItemStack[] { + CI.getNumberedBioCircuit(14), + ItemList.Casing_SolidSteel.get(2), + CI.getPlate(4, 2), + CI.getTieredComponent(OrePrefixes.plate, 3, 4), + CI.getTieredComponent(OrePrefixes.ring, 3, 8), + CI.getTieredComponent(OrePrefixes.rod, 2, 4), + }, + CI.getTieredFluid(2, 144 * 2), + GregtechItemList.Casing_IndustrialAutoChisel.get(1), + 20 * 20, + MaterialUtils.getVoltageForTier(3)); + + + + } + + private static void rockBreaker() { + + CORE.RA.addSixSlotAssemblingRecipe( + new ItemStack[] { + CI.getNumberedAdvancedCircuit(12), + ItemList.Machine_EV_RockBreaker.get(1), + ALLOY.STAINLESS_STEEL.getPlate(8), + ALLOY.STAINLESS_STEEL.getRing(4), + CI.getTieredComponentOfMaterial(Materials.Aluminium, OrePrefixes.plateDouble, 8), + ALLOY.EGLIN_STEEL.getScrew(8), + }, + ELEMENT.getInstance().ALUMINIUM.getFluidStack(144 * 8), + GregtechItemList.Controller_IndustrialRockBreaker.get(1), + 60 * 20 * 2, + MaterialUtils.getVoltageForTier(4)); + + } private static void fakeMachineCasingCovers() { GregtechItemList[] mMachineCasingCovers = new GregtechItemList[] { @@ -2410,11 +2764,11 @@ public class RECIPES_Machines { return; } Class ModBlocksClass = ReflectionUtils.getClass("com.riciJak.Ztones.init.ModBlocks"); - Block agon = (Block) ReflectionUtils.getFieldValue( ReflectionUtils.getField(ModBlocksClass, "agonBlock")); - Block korp = (Block) ReflectionUtils.getFieldValue( ReflectionUtils.getField(ModBlocksClass, "korpBlock")); - Block jelt = (Block) ReflectionUtils.getFieldValue( ReflectionUtils.getField(ModBlocksClass, "jeltBlock")); - Block bitt = (Block) ReflectionUtils.getFieldValue( ReflectionUtils.getField(ModBlocksClass, "bittBlock")); - Block iszm = (Block) ReflectionUtils.getFieldValue( ReflectionUtils.getField(ModBlocksClass, "iszmBlock")); + Block agon = ReflectionUtils.getFieldValue( ReflectionUtils.getField(ModBlocksClass, "agonBlock")); + Block korp = ReflectionUtils.getFieldValue( ReflectionUtils.getField(ModBlocksClass, "korpBlock")); + Block jelt = ReflectionUtils.getFieldValue( ReflectionUtils.getField(ModBlocksClass, "jeltBlock")); + Block bitt = ReflectionUtils.getFieldValue( ReflectionUtils.getField(ModBlocksClass, "bittBlock")); + Block iszm = ReflectionUtils.getFieldValue( ReflectionUtils.getField(ModBlocksClass, "iszmBlock")); // "agon", "iszm", "korp", "jelt", "bitt" diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Old_Circuits.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Old_Circuits.java index 3ed2f5f168..3ed2f5f168 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Old_Circuits.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Old_Circuits.java diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_RareEarthProcessing.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_RareEarthProcessing.java index d3c0b4c093..860a87deae 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_RareEarthProcessing.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_RareEarthProcessing.java @@ -13,6 +13,7 @@ import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_OreDictUnificator; +import gtPlusPlus.core.item.ModItems; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.material.ELEMENT; import gtPlusPlus.core.material.MISC_MATERIALS; @@ -51,7 +52,7 @@ public class RECIPES_RareEarthProcessing { if (mSaltWater == null) { Fluid f = SALT_WATER.generateFluid(); SALT_WATER.registerComponentForMaterial(FluidUtils.getFluidStack(f, 1000)); - mSaltWater = SALT_WATER.getFluid(1000); + mSaltWater = SALT_WATER.getFluidStack(1000); } else { SALT_WATER.registerComponentForMaterial(FluidUtils.getFluidStack(mSaltWater, 1000)); @@ -62,7 +63,7 @@ public class RECIPES_RareEarthProcessing { if (mBrine == null) { Fluid f = BRINE.generateFluid(); BRINE.registerComponentForMaterial(FluidUtils.getFluidStack(f, 1000)); - mBrine = BRINE.getFluid(1000); + mBrine = BRINE.getFluidStack(1000); } else { BRINE.registerComponentForMaterial(FluidUtils.getFluidStack(mBrine, 1000)); @@ -88,7 +89,7 @@ public class RECIPES_RareEarthProcessing { mHydrogenChloride = FluidUtils.getFluidStack("hydrogenchloride", 1000); if (mHydrogenChloride == null) { HYDROGEN_CHLORIDE.generateFluid(); - mHydrogenChloride = BRINE.getFluid(1000); + mHydrogenChloride = BRINE.getFluidStack(1000); } else { HYDROGEN_CHLORIDE.registerComponentForMaterial(FluidUtils.getFluidStack(mHydrogenChloride, 1000)); @@ -98,7 +99,7 @@ public class RECIPES_RareEarthProcessing { // Add Process for creating Brine CORE.RA.addBrewingRecipe( ItemUtils.getSimpleStack(mDustSalt, 16), - MISC_MATERIALS.SALT_WATER.getFluid(2000), + MISC_MATERIALS.SALT_WATER.getFluidStack(2000), FluidUtils.getFluidStack(mBrine, 4000), 20 * 20, 120, @@ -118,12 +119,25 @@ public class RECIPES_RareEarthProcessing { null, new int[] {10000, 10000, 10000}, 20 * 30, - (int) GT_Values.V[2]); + 120); // Generate Special Laser Recipe + CORE.RA.addMixerRecipe( + CI.getNumberedBioCircuit(2), + ItemUtils.getItemStackOfAmountFromOreDict("cellChlorine", 1), + ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogen", 1), + null, + null, + null, + ItemUtils.getSimpleStack(ModItems.cellHydrogenChlorideMix, 2), + null, + null, + null, + 20 * 10, + 480); + CORE.RA.addUvLaserRecipe( - ELEMENT.getInstance().CHLORINE.getCell(2), - ELEMENT.getInstance().HYDROGEN.getCell(2), + ItemUtils.getSimpleStack(ModItems.cellHydrogenChlorideMix, 4), ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogenChloride", 4), 20 * 30, 480); @@ -168,34 +182,47 @@ public class RECIPES_RareEarthProcessing { GT_Values.RA.addChemicalBathRecipe( ItemUtils.getSimpleStack(aRareEarth, 3), FluidUtils.getFluidStack(aSulfuric, 1000), - RARE_EARTH_LOW.getCrushed(1), - RARE_EARTH_LOW.getCrushed(1), - RARE_EARTH_LOW.getCrushed(1), - new int[] {10000, 10000, 9000}, + RARE_EARTH_LOW.getCrushed(2), + RARE_EARTH_LOW.getCrushed(2), + RARE_EARTH_LOW.getCrushed(2), + new int[] {10000, 10000, 10000}, 20 * 30, - (int) GT_Values.V[1]); + MaterialUtils.getVoltageForTier(1)); // HV Rare Earth GT_Values.RA.addChemicalBathRecipe( ItemUtils.getSimpleStack(aRareEarth, 6), - FluidUtils.getFluidStack(aHydrocholric, 3000), - RARE_EARTH_MID.getCrushed(2), - RARE_EARTH_MID.getCrushed(2), - RARE_EARTH_MID.getCrushed(2), + FluidUtils.getFluidStack(aHydrocholric, 2000), + RARE_EARTH_MID.getCrushed(4), + RARE_EARTH_MID.getCrushed(4), + RARE_EARTH_MID.getCrushed(4), new int[] {10000, 9000, 8000}, - 20 * 60, - (int) GT_Values.V[3]); + 20 * 30, + MaterialUtils.getVoltageForTier(3)); // IV Rare Earth GT_Values.RA.addChemicalBathRecipe( ItemUtils.getSimpleStack(aRareEarth, 9), - FluidUtils.getFluidStack(aNitric, 6000), - RARE_EARTH_HIGH.getCrushed(3), - RARE_EARTH_HIGH.getCrushed(3), - RARE_EARTH_HIGH.getCrushed(3), - new int[] {9000, 8000, 7000}, - 20 * 90, - (int) GT_Values.V[5]); + FluidUtils.getHydrofluoricAcid(3000), + RARE_EARTH_HIGH.getCrushed(6), + RARE_EARTH_HIGH.getCrushed(6), + RARE_EARTH_HIGH.getCrushed(6), + new int[] {10000, 9000, 8000}, + 20 * 30, + MaterialUtils.getVoltageForTier(5)); + + if (FluidUtils.doesHydrofluoricAcidGtExist()) { + // IV Rare Earth + GT_Values.RA.addChemicalBathRecipe( + ItemUtils.getSimpleStack(aRareEarth, 9), + FluidUtils.getHydrofluoricAcidGT(6000), + RARE_EARTH_HIGH.getCrushed(6), + RARE_EARTH_HIGH.getCrushed(6), + RARE_EARTH_HIGH.getCrushed(6), + new int[] {9000, 8000, 7000}, + 20 * 30, + MaterialUtils.getVoltageForTier(5)); + } } diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_SeleniumProcessing.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_SeleniumProcessing.java new file mode 100644 index 0000000000..9a2ea8bad0 --- /dev/null +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_SeleniumProcessing.java @@ -0,0 +1,222 @@ +package gtPlusPlus.core.recipe; + +import gregtech.api.enums.Materials; +import gregtech.api.enums.OrePrefixes; +import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.material.ELEMENT; +import gtPlusPlus.core.material.MISC_MATERIALS; +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.reflect.AddGregtechRecipe; +import net.minecraft.item.ItemStack; + +public class RECIPES_SeleniumProcessing { + + public static void init() { + + //We need this + MaterialUtils.generateSpecialDustAndAssignToAMaterial(MISC_MATERIALS.SELENIUM_DIOXIDE, false); + + // Makes Selenium Dioxide + processCopperRecipes(); + + //Liquify the Dried Dioxide + AddGregtechRecipe.addCokeAndPyrolyseRecipes(MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1), 13, FluidUtils.getSteam(500), null, MISC_MATERIALS.SELENIUM_DIOXIDE.getFluidStack(1000), 20, 1024); + + // Produce Selenious Acid + AddGregtechRecipe.addCokeAndPyrolyseRecipes(MISC_MATERIALS.SELENIUM_DIOXIDE.getCell(1), 14, FluidUtils.getHotWater(4000), CI.emptyCells(1), MISC_MATERIALS.SELENIOUS_ACID.getFluidStack(1000), 20, 2048); + + // Make Selenium + CORE.RA.addBlastSmelterRecipe( + new ItemStack[] { + ItemUtils.getGregtechCircuit(14), + ItemUtils.getItemStackOfAmountFromOreDict("cellSulfuricAcid", 8), + ELEMENT.getInstance().CARBON.getDust(16), + }, + MISC_MATERIALS.SELENIOUS_ACID.getFluidStack(750), + ELEMENT.getInstance().SELENIUM.getFluidStack(144 * 1), + new ItemStack[] { + CI.emptyCells(8), + ELEMENT.getInstance().SELENIUM.getIngot(1), + ELEMENT.getInstance().SELENIUM.getIngot(1), + }, + new int[] {10000, 2000, 2000}, + 20 * 300, + 7200); + + + /*// Old recipes for Selenium Roasting + CORE.RA.addBlastSmelterRecipe( + new ItemStack[] { + ItemUtils.getGregtechCircuit(16), + ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedPyrite", 8), + ELEMENT.getInstance().CARBON.getDust(32), + }, + Materials.SulfuricAcid.getFluid(4000), + ELEMENT.getInstance().SELENIUM.getFluid(144), + 0, + 20 * 300, + 2000); + CORE.RA.addBlastSmelterRecipe( + new ItemStack[] { + ItemUtils.getGregtechCircuit(17), + ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedChalcopyrite", 8), + ELEMENT.getInstance().CARBON.getDust(32), + }, + Materials.SulfuricAcid.getFluid(4000), + ELEMENT.getInstance().SELENIUM.getFluid(144), + 0, + 20 * 300, + 2000); + CORE.RA.addBlastSmelterRecipe( + new ItemStack[] { + ItemUtils.getGregtechCircuit(18), + ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedGalena", 8), + ELEMENT.getInstance().CARBON.getDust(32), + }, + Materials.SulfuricAcid.getFluid(4000), + ELEMENT.getInstance().SELENIUM.getFluid(144), + 0, + 20 * 300, + 2000);*/ + } + + + public static void processCopperRecipes() { + + //Copper + CORE.RA.addDehydratorRecipe( + new ItemStack[]{ + CI.getNumberedAdvancedCircuit(23), + ItemUtils.getOrePrefixStack(OrePrefixes.crushedPurified, Materials.Copper, 1), // Item Input + }, + FluidUtils.getHotWater(1000), // Fluid + MISC_MATERIALS.SELENIUM_DIOXIDE.getFluidStack(20), // Fluid + new ItemStack[] { + ItemUtils.getOrePrefixStack(OrePrefixes.crushedCentrifuged, Materials.Copper, 1), + MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1), + MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1), + MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1), + MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1), + MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1), + MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1), + MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1), + MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1), + }, // Output + new int[] { + 10000, + 100, + 100, + 500, + 500, + 500, + 1000, + 1000, + 1000 + }, + 40 * 20, // Time in ticks + 1024); // EU + + //Tetra + CORE.RA.addDehydratorRecipe( + new ItemStack[]{ + CI.getNumberedAdvancedCircuit(23), + ItemUtils.getOrePrefixStack(OrePrefixes.crushedPurified, Materials.Tetrahedrite, 1), // Item Input + }, + FluidUtils.getHotWater(1000), // Fluid + MISC_MATERIALS.SELENIUM_DIOXIDE.getFluidStack(10), // Fluid + new ItemStack[] { + ItemUtils.getOrePrefixStack(OrePrefixes.crushedCentrifuged, Materials.Tetrahedrite, 1), + MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1), + MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1), + MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1), + MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1), + MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1), + MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1), + MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1), + MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1), + }, // Output + new int[] { + 10000, + 100, + 100, + 300, + 300, + 300, + 800, + 800, + 800 + }, + 40 * 20, // Time in ticks + 1024); // EU + + //Chalco + CORE.RA.addDehydratorRecipe( + new ItemStack[]{ + CI.getNumberedAdvancedCircuit(23), + ItemUtils.getOrePrefixStack(OrePrefixes.crushedPurified, Materials.Chalcopyrite, 1), // Item Input + }, + FluidUtils.getHotWater(1000), // Fluid + MISC_MATERIALS.SELENIUM_DIOXIDE.getFluidStack(10), // Fluid + new ItemStack[] { + ItemUtils.getOrePrefixStack(OrePrefixes.crushedCentrifuged, Materials.Chalcopyrite, 1), + MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1), + MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1), + MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1), + MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1), + MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1), + MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1), + MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1), + MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1), + }, // Output + new int[] { + 10000, + 100, + 100, + 300, + 300, + 300, + 800, + 800, + 800 + }, + 40 * 20, // Time in ticks + 1024); // EU + + //Malachite + CORE.RA.addDehydratorRecipe( + new ItemStack[]{ + CI.getNumberedAdvancedCircuit(23), + ItemUtils.getOrePrefixStack(OrePrefixes.crushedPurified, Materials.Malachite, 1), // Item Input + }, + FluidUtils.getHotWater(1000), // Fluid + MISC_MATERIALS.SELENIUM_DIOXIDE.getFluidStack(10), // Fluid + new ItemStack[] { + ItemUtils.getOrePrefixStack(OrePrefixes.crushedCentrifuged, Materials.Malachite, 1), + MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1), + MISC_MATERIALS.SELENIUM_DIOXIDE.getDust(1), + MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1), + MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1), + MISC_MATERIALS.SELENIUM_DIOXIDE.getSmallDust(1), + MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1), + MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1), + MISC_MATERIALS.SELENIUM_DIOXIDE.getTinyDust(1), + }, // Output + new int[] { + 10000, + 100, + 100, + 300, + 300, + 300, + 800, + 800, + 800 + }, + 40 * 20, // Time in ticks + 1024); // EU + } + +} diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Shapeless.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Shapeless.java index 7ffdcf295b..7ffdcf295b 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Shapeless.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Shapeless.java diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Tools.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Tools.java index 42448e6b74..42448e6b74 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Tools.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Tools.java diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPE_Batteries.java b/src/main/java/gtPlusPlus/core/recipe/RECIPE_Batteries.java index 5476ef0e8d..5476ef0e8d 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPE_Batteries.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPE_Batteries.java diff --git a/src/Java/gtPlusPlus/core/recipe/ShapedRecipeObject.java b/src/main/java/gtPlusPlus/core/recipe/ShapedRecipeObject.java index 0d25d2bec9..0d25d2bec9 100644 --- a/src/Java/gtPlusPlus/core/recipe/ShapedRecipeObject.java +++ b/src/main/java/gtPlusPlus/core/recipe/ShapedRecipeObject.java diff --git a/src/Java/gtPlusPlus/core/recipe/common/CI.java b/src/main/java/gtPlusPlus/core/recipe/common/CI.java index 9379ac139a..f6af91a040 100644 --- a/src/Java/gtPlusPlus/core/recipe/common/CI.java +++ b/src/main/java/gtPlusPlus/core/recipe/common/CI.java @@ -128,6 +128,15 @@ public class CI { public static ItemStack sensor_ZPM; public static ItemStack sensor_UV; public static ItemStack sensor_MAX; + + public static ItemStack fluidRegulator_LV; + public static ItemStack fluidRegulator_MV; + public static ItemStack fluidRegulator_HV; + public static ItemStack fluidRegulator_EV; + public static ItemStack fluidRegulator_IV; + public static ItemStack fluidRegulator_LuV; + public static ItemStack fluidRegulator_ZPM; + public static ItemStack fluidRegulator_UV; //Machine Casings public static ItemStack machineCasing_ULV; @@ -626,7 +635,7 @@ public class CI { }*/ // Modern Handling - FluidStack a = aMaster[aType][aTier].getFluid(aAmount); + FluidStack a = aMaster[aType][aTier].getFluidStack(aAmount); if (a == null) { ItemStack aCell = getTieredComponent(OrePrefixes.liquid, aTier, 1); if (aCell != null) { @@ -881,6 +890,48 @@ public class CI { } return ItemUtils.getSimpleStack(aType, aSize); } + + public static ItemStack getFluidRegulator(int aTier, int aSize) { + if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) { + return CI.getElectricPump(aTier, aSize); + } + ItemStack aType; + int aLazyTier = 0; + if (aTier == aLazyTier++) { + aType = CI.fluidRegulator_LV; + } + else if (aTier == aLazyTier++) { + aType = CI.fluidRegulator_LV; + } + else if (aTier == aLazyTier++) { + aType = CI.fluidRegulator_MV; + } + else if (aTier == aLazyTier++) { + aType = CI.fluidRegulator_HV; + } + else if (aTier == aLazyTier++) { + aType = CI.fluidRegulator_EV; + } + else if (aTier == aLazyTier++) { + aType = CI.fluidRegulator_IV; + } + else if (aTier == aLazyTier++) { + aType = CI.fluidRegulator_LuV; + } + else if (aTier == aLazyTier++) { + aType = CI.fluidRegulator_ZPM; + } + else if (aTier == aLazyTier++) { + aType = CI.fluidRegulator_UV; + } + else if (aTier == aLazyTier++) { + aType = CI.fluidRegulator_UV; + } + else { + aType = CI.fluidRegulator_LV; + } + return ItemUtils.getSimpleStack(aType, aSize); + } public static ItemStack getElectricPiston(int aTier, int aSize) { ItemStack aType; diff --git a/src/Java/gtPlusPlus/core/slots/SlotAirFilter.java b/src/main/java/gtPlusPlus/core/slots/SlotAirFilter.java index 92e9bebe21..92e9bebe21 100644 --- a/src/Java/gtPlusPlus/core/slots/SlotAirFilter.java +++ b/src/main/java/gtPlusPlus/core/slots/SlotAirFilter.java diff --git a/src/Java/gtPlusPlus/core/slots/SlotBlueprint.java b/src/main/java/gtPlusPlus/core/slots/SlotBlueprint.java index 532f2f0822..532f2f0822 100644 --- a/src/Java/gtPlusPlus/core/slots/SlotBlueprint.java +++ b/src/main/java/gtPlusPlus/core/slots/SlotBlueprint.java diff --git a/src/Java/gtPlusPlus/core/slots/SlotBuzzSaw.java b/src/main/java/gtPlusPlus/core/slots/SlotBuzzSaw.java index 94b0b9ecc7..94b0b9ecc7 100644 --- a/src/Java/gtPlusPlus/core/slots/SlotBuzzSaw.java +++ b/src/main/java/gtPlusPlus/core/slots/SlotBuzzSaw.java diff --git a/src/Java/gtPlusPlus/core/slots/SlotChemicalPlantInput.java b/src/main/java/gtPlusPlus/core/slots/SlotChemicalPlantInput.java index 4b9cda0b9b..1029d37a78 100644 --- a/src/Java/gtPlusPlus/core/slots/SlotChemicalPlantInput.java +++ b/src/main/java/gtPlusPlus/core/slots/SlotChemicalPlantInput.java @@ -1,7 +1,7 @@ package gtPlusPlus.core.slots; -import gregtech.api.util.GTPP_Recipe; import gregtech.api.util.GTPP_Recipe.GTPP_Recipe_Map; +import gregtech.api.util.GT_Recipe; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; @@ -22,7 +22,7 @@ public class SlotChemicalPlantInput extends Slot { public static boolean isItemValidForChemicalPlantSlot(ItemStack aStack) { boolean validItem = GTPP_Recipe_Map.sChemicalPlantRecipes.containsInput(aStack); if (!validItem) { - for (GTPP_Recipe f : GTPP_Recipe_Map.sChemicalPlantRecipes.mRecipeList) { + for (GT_Recipe f : GTPP_Recipe_Map.sChemicalPlantRecipes.mRecipeList) { if (f.mFluidInputs.length > 0) { for (FluidStack g : f.mFluidInputs) { if (g != null) { diff --git a/src/Java/gtPlusPlus/core/slots/SlotCrafting.java b/src/main/java/gtPlusPlus/core/slots/SlotCrafting.java index 42b7b585e2..42b7b585e2 100644 --- a/src/Java/gtPlusPlus/core/slots/SlotCrafting.java +++ b/src/main/java/gtPlusPlus/core/slots/SlotCrafting.java diff --git a/src/Java/gtPlusPlus/core/slots/SlotCraftingNoCollect.java b/src/main/java/gtPlusPlus/core/slots/SlotCraftingNoCollect.java index 3608c3724c..3608c3724c 100644 --- a/src/Java/gtPlusPlus/core/slots/SlotCraftingNoCollect.java +++ b/src/main/java/gtPlusPlus/core/slots/SlotCraftingNoCollect.java diff --git a/src/Java/gtPlusPlus/core/slots/SlotDataStick.java b/src/main/java/gtPlusPlus/core/slots/SlotDataStick.java index ce97a2fdbf..ce97a2fdbf 100644 --- a/src/Java/gtPlusPlus/core/slots/SlotDataStick.java +++ b/src/main/java/gtPlusPlus/core/slots/SlotDataStick.java diff --git a/src/Java/gtPlusPlus/core/slots/SlotElectric.java b/src/main/java/gtPlusPlus/core/slots/SlotElectric.java index a747432a74..a747432a74 100644 --- a/src/Java/gtPlusPlus/core/slots/SlotElectric.java +++ b/src/main/java/gtPlusPlus/core/slots/SlotElectric.java diff --git a/src/Java/gtPlusPlus/core/slots/SlotFrame.java b/src/main/java/gtPlusPlus/core/slots/SlotFrame.java index 4168ded5bc..4168ded5bc 100644 --- a/src/Java/gtPlusPlus/core/slots/SlotFrame.java +++ b/src/main/java/gtPlusPlus/core/slots/SlotFrame.java diff --git a/src/Java/gtPlusPlus/core/slots/SlotFuelRod.java b/src/main/java/gtPlusPlus/core/slots/SlotFuelRod.java index b50b679665..b50b679665 100644 --- a/src/Java/gtPlusPlus/core/slots/SlotFuelRod.java +++ b/src/main/java/gtPlusPlus/core/slots/SlotFuelRod.java diff --git a/src/Java/gtPlusPlus/core/slots/SlotGeneric.java b/src/main/java/gtPlusPlus/core/slots/SlotGeneric.java index 533539d914..533539d914 100644 --- a/src/Java/gtPlusPlus/core/slots/SlotGeneric.java +++ b/src/main/java/gtPlusPlus/core/slots/SlotGeneric.java diff --git a/src/Java/gtPlusPlus/core/slots/SlotGtTool.java b/src/main/java/gtPlusPlus/core/slots/SlotGtTool.java index 54e25362db..54e25362db 100644 --- a/src/Java/gtPlusPlus/core/slots/SlotGtTool.java +++ b/src/main/java/gtPlusPlus/core/slots/SlotGtTool.java diff --git a/src/Java/gtPlusPlus/core/slots/SlotGtToolElectric.java b/src/main/java/gtPlusPlus/core/slots/SlotGtToolElectric.java index c0e3340769..c0e3340769 100644 --- a/src/Java/gtPlusPlus/core/slots/SlotGtToolElectric.java +++ b/src/main/java/gtPlusPlus/core/slots/SlotGtToolElectric.java diff --git a/src/Java/gtPlusPlus/core/slots/SlotIntegratedCircuit.java b/src/main/java/gtPlusPlus/core/slots/SlotIntegratedCircuit.java index 19795a41e4..8c8a118abb 100644 --- a/src/Java/gtPlusPlus/core/slots/SlotIntegratedCircuit.java +++ b/src/main/java/gtPlusPlus/core/slots/SlotIntegratedCircuit.java @@ -82,7 +82,7 @@ public class SlotIntegratedCircuit extends Slot { } if (mCircuitItem != null && mCircuitItem2 != null && mCircuitItem3 != null) { if (itemstack != null) { - if (itemstack.getItem() == mCircuitItem || itemstack.getItem() == mCircuitItem2) { + if (itemstack.getItem() == mCircuitItem || itemstack.getItem() == mCircuitItem2 || itemstack.getItem() == mCircuitItem3) { if (itemstack.getItem() == mCircuitItem) { return 0; } diff --git a/src/Java/gtPlusPlus/core/slots/SlotItemBackpackInv.java b/src/main/java/gtPlusPlus/core/slots/SlotItemBackpackInv.java index 3aa551f966..3aa551f966 100644 --- a/src/Java/gtPlusPlus/core/slots/SlotItemBackpackInv.java +++ b/src/main/java/gtPlusPlus/core/slots/SlotItemBackpackInv.java diff --git a/src/Java/gtPlusPlus/core/slots/SlotJukebox.java b/src/main/java/gtPlusPlus/core/slots/SlotJukebox.java index 0f8af988a1..0f8af988a1 100644 --- a/src/Java/gtPlusPlus/core/slots/SlotJukebox.java +++ b/src/main/java/gtPlusPlus/core/slots/SlotJukebox.java diff --git a/src/Java/gtPlusPlus/core/slots/SlotLockedInput.java b/src/main/java/gtPlusPlus/core/slots/SlotLockedInput.java index c67f8acfeb..c67f8acfeb 100644 --- a/src/Java/gtPlusPlus/core/slots/SlotLockedInput.java +++ b/src/main/java/gtPlusPlus/core/slots/SlotLockedInput.java diff --git a/src/Java/gtPlusPlus/core/slots/SlotLunchBox.java b/src/main/java/gtPlusPlus/core/slots/SlotLunchBox.java index bb82a28936..bb82a28936 100644 --- a/src/Java/gtPlusPlus/core/slots/SlotLunchBox.java +++ b/src/main/java/gtPlusPlus/core/slots/SlotLunchBox.java diff --git a/src/Java/gtPlusPlus/core/slots/SlotMagicToolBag.java b/src/main/java/gtPlusPlus/core/slots/SlotMagicToolBag.java index d555f10a44..d555f10a44 100644 --- a/src/Java/gtPlusPlus/core/slots/SlotMagicToolBag.java +++ b/src/main/java/gtPlusPlus/core/slots/SlotMagicToolBag.java diff --git a/src/Java/gtPlusPlus/core/slots/SlotModularBauble.java b/src/main/java/gtPlusPlus/core/slots/SlotModularBauble.java index 4aef5bc877..4aef5bc877 100644 --- a/src/Java/gtPlusPlus/core/slots/SlotModularBauble.java +++ b/src/main/java/gtPlusPlus/core/slots/SlotModularBauble.java diff --git a/src/Java/gtPlusPlus/core/slots/SlotModularBaubleUpgrades.java b/src/main/java/gtPlusPlus/core/slots/SlotModularBaubleUpgrades.java index dae62f0415..dae62f0415 100644 --- a/src/Java/gtPlusPlus/core/slots/SlotModularBaubleUpgrades.java +++ b/src/main/java/gtPlusPlus/core/slots/SlotModularBaubleUpgrades.java diff --git a/src/Java/gtPlusPlus/core/slots/SlotNoInput.java b/src/main/java/gtPlusPlus/core/slots/SlotNoInput.java index 1a1cf62e2b..1a1cf62e2b 100644 --- a/src/Java/gtPlusPlus/core/slots/SlotNoInput.java +++ b/src/main/java/gtPlusPlus/core/slots/SlotNoInput.java diff --git a/src/Java/gtPlusPlus/core/slots/SlotNoInputLogging.java b/src/main/java/gtPlusPlus/core/slots/SlotNoInputLogging.java index 762714ac94..762714ac94 100644 --- a/src/Java/gtPlusPlus/core/slots/SlotNoInputLogging.java +++ b/src/main/java/gtPlusPlus/core/slots/SlotNoInputLogging.java diff --git a/src/Java/gtPlusPlus/core/slots/SlotOutput.java b/src/main/java/gtPlusPlus/core/slots/SlotOutput.java index f22e0645f5..f22e0645f5 100644 --- a/src/Java/gtPlusPlus/core/slots/SlotOutput.java +++ b/src/main/java/gtPlusPlus/core/slots/SlotOutput.java diff --git a/src/Java/gtPlusPlus/core/slots/SlotPollutionScrubber.java b/src/main/java/gtPlusPlus/core/slots/SlotPollutionScrubber.java index 6dd3745d09..6dd3745d09 100644 --- a/src/Java/gtPlusPlus/core/slots/SlotPollutionScrubber.java +++ b/src/main/java/gtPlusPlus/core/slots/SlotPollutionScrubber.java diff --git a/src/Java/gtPlusPlus/core/slots/SlotRTG.java b/src/main/java/gtPlusPlus/core/slots/SlotRTG.java index 181052cc57..181052cc57 100644 --- a/src/Java/gtPlusPlus/core/slots/SlotRTG.java +++ b/src/main/java/gtPlusPlus/core/slots/SlotRTG.java diff --git a/src/Java/gtPlusPlus/core/slots/SlotToolBox.java b/src/main/java/gtPlusPlus/core/slots/SlotToolBox.java index 87967b75b5..87967b75b5 100644 --- a/src/Java/gtPlusPlus/core/slots/SlotToolBox.java +++ b/src/main/java/gtPlusPlus/core/slots/SlotToolBox.java diff --git a/src/Java/gtPlusPlus/core/slots/SlotVolumetricFlask.java b/src/main/java/gtPlusPlus/core/slots/SlotVolumetricFlask.java index b8955f6dc8..b8955f6dc8 100644 --- a/src/Java/gtPlusPlus/core/slots/SlotVolumetricFlask.java +++ b/src/main/java/gtPlusPlus/core/slots/SlotVolumetricFlask.java diff --git a/src/Java/gtPlusPlus/core/tileentities/ModTileEntities.java b/src/main/java/gtPlusPlus/core/tileentities/ModTileEntities.java index 62b545c5c8..62b545c5c8 100644 --- a/src/Java/gtPlusPlus/core/tileentities/ModTileEntities.java +++ b/src/main/java/gtPlusPlus/core/tileentities/ModTileEntities.java diff --git a/src/Java/gtPlusPlus/core/tileentities/base/TILE_ENTITY_BASE.java b/src/main/java/gtPlusPlus/core/tileentities/base/TILE_ENTITY_BASE.java index 839bcc353a..839bcc353a 100644 --- a/src/Java/gtPlusPlus/core/tileentities/base/TILE_ENTITY_BASE.java +++ b/src/main/java/gtPlusPlus/core/tileentities/base/TILE_ENTITY_BASE.java diff --git a/src/Java/gtPlusPlus/core/tileentities/base/TileBasicTank.java b/src/main/java/gtPlusPlus/core/tileentities/base/TileBasicTank.java index 671a49fca5..671a49fca5 100644 --- a/src/Java/gtPlusPlus/core/tileentities/base/TileBasicTank.java +++ b/src/main/java/gtPlusPlus/core/tileentities/base/TileBasicTank.java diff --git a/src/Java/gtPlusPlus/core/tileentities/base/TileEntityBase.java b/src/main/java/gtPlusPlus/core/tileentities/base/TileEntityBase.java index dba96c6ebc..dba96c6ebc 100644 --- a/src/Java/gtPlusPlus/core/tileentities/base/TileEntityBase.java +++ b/src/main/java/gtPlusPlus/core/tileentities/base/TileEntityBase.java diff --git a/src/Java/gtPlusPlus/core/tileentities/base/TilePoweredGT.java b/src/main/java/gtPlusPlus/core/tileentities/base/TilePoweredGT.java index fb599b0bae..fb599b0bae 100644 --- a/src/Java/gtPlusPlus/core/tileentities/base/TilePoweredGT.java +++ b/src/main/java/gtPlusPlus/core/tileentities/base/TilePoweredGT.java diff --git a/src/Java/gtPlusPlus/core/tileentities/general/TileEntityCircuitProgrammer.java b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityCircuitProgrammer.java index 835d9da2cd..835d9da2cd 100644 --- a/src/Java/gtPlusPlus/core/tileentities/general/TileEntityCircuitProgrammer.java +++ b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityCircuitProgrammer.java diff --git a/src/Java/gtPlusPlus/core/tileentities/general/TileEntityDecayablesChest.java b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityDecayablesChest.java index db93e9c4fc..db93e9c4fc 100644 --- a/src/Java/gtPlusPlus/core/tileentities/general/TileEntityDecayablesChest.java +++ b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityDecayablesChest.java diff --git a/src/Java/gtPlusPlus/core/tileentities/general/TileEntityEggBox.java b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityEggBox.java index 0c428537cb..0c428537cb 100644 --- a/src/Java/gtPlusPlus/core/tileentities/general/TileEntityEggBox.java +++ b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityEggBox.java diff --git a/src/Java/gtPlusPlus/core/tileentities/general/TileEntityFirepit.java b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityFirepit.java index 49fde8ee64..49fde8ee64 100644 --- a/src/Java/gtPlusPlus/core/tileentities/general/TileEntityFirepit.java +++ b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityFirepit.java diff --git a/src/Java/gtPlusPlus/core/tileentities/general/TileEntityFishTrap.java b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityFishTrap.java index beff269428..beff269428 100644 --- a/src/Java/gtPlusPlus/core/tileentities/general/TileEntityFishTrap.java +++ b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityFishTrap.java diff --git a/src/Java/gtPlusPlus/core/tileentities/general/TileEntityHeliumGenerator.java b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityHeliumGenerator.java index 8a2d9d9f51..8a2d9d9f51 100644 --- a/src/Java/gtPlusPlus/core/tileentities/general/TileEntityHeliumGenerator.java +++ b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityHeliumGenerator.java diff --git a/src/Java/gtPlusPlus/core/tileentities/general/TileEntityInfiniteFluid.java b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityInfiniteFluid.java index 9ddf2065bc..9ddf2065bc 100644 --- a/src/Java/gtPlusPlus/core/tileentities/general/TileEntityInfiniteFluid.java +++ b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityInfiniteFluid.java diff --git a/src/Java/gtPlusPlus/core/tileentities/general/TileEntityPlayerDoorBase.java b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityPlayerDoorBase.java index 48f05fe0fd..48f05fe0fd 100644 --- a/src/Java/gtPlusPlus/core/tileentities/general/TileEntityPlayerDoorBase.java +++ b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityPlayerDoorBase.java diff --git a/src/Java/gtPlusPlus/core/tileentities/general/TileEntityReverter.java b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityReverter.java index 6e18834786..6e18834786 100644 --- a/src/Java/gtPlusPlus/core/tileentities/general/TileEntityReverter.java +++ b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityReverter.java diff --git a/src/Java/gtPlusPlus/core/tileentities/general/TileEntityVolumetricFlaskSetter.java b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityVolumetricFlaskSetter.java index 5b837397b1..bc096c0d53 100644 --- a/src/Java/gtPlusPlus/core/tileentities/general/TileEntityVolumetricFlaskSetter.java +++ b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityVolumetricFlaskSetter.java @@ -26,22 +26,22 @@ public class TileEntityVolumetricFlaskSetter extends TileEntity implements ISide public int locationY; public int locationZ; private int aCurrentMode = 0; - private short aCustomValue = 1000; + private int aCustomValue = 1000; public TileEntityVolumetricFlaskSetter() { this.inventoryContents = new Inventory_VolumetricFlaskSetter(); this.setTileLocation(); } - public short getCustomValue() { + public int getCustomValue() { //Logger.INFO("Value: "+this.aCustomValue); return this.aCustomValue; } public void setCustomValue(int aVal) { - Logger.INFO("Old Value: "+this.aCustomValue); + log("Old Value: "+this.aCustomValue); this.aCustomValue = (short) MathUtils.balance(aVal, 0, Short.MAX_VALUE); - Logger.INFO("New Value: "+this.aCustomValue); + log("New Value: "+this.aCustomValue); markDirty(); } @@ -141,7 +141,7 @@ public class TileEntityVolumetricFlaskSetter extends TileEntity implements ISide // Skip slot 7 (Custom) unless it has a value > 0 if (e == 7 && getCustomValue() <= 0) { - Logger.INFO("Skipping Custom slot as value <= 0"); + log("Skipping Custom slot as value <= 0"); continue; } if (e == Container_VolumetricFlaskSetter.SLOT_OUTPUT) { @@ -168,8 +168,8 @@ public class TileEntityVolumetricFlaskSetter extends TileEntity implements ISide // Check that the Circuit in the Output slot is not null and the same type as the circuit input. if (aTypeInCheckedSlot > 0 && (aTypeInSlot == aTypeInCheckedSlot) && f != null) { if (g.getItem() == f.getItem() && VolumetricFlaskHelper.getFlaskCapacity(f) == getCapacityForSlot(e) && ((aInputFluidStack == null && aFluidInCheckedSlot == null) || aInputFluidStack.isFluidEqual(aFluidInCheckedSlot))) { - Logger.INFO("Input Slot Flask Contains: "+(aInputFluidStack != null ? aInputFluidStack.getLocalizedName() : "Empty")); - Logger.INFO("Output Slot Flask Contains: "+(aFluidInCheckedSlot != null ? aFluidInCheckedSlot.getLocalizedName() : "Empty")); + log("Input Slot Flask Contains: "+(aInputFluidStack != null ? aInputFluidStack.getLocalizedName() : "Empty")); + log("Output Slot Flask Contains: "+(aFluidInCheckedSlot != null ? aFluidInCheckedSlot.getLocalizedName() : "Empty")); aSize = f.stackSize + g.stackSize; if (aSize > 16) { aInputStack = g.copy(); @@ -253,7 +253,7 @@ public class TileEntityVolumetricFlaskSetter extends TileEntity implements ISide final NBTTagCompound chestData = new NBTTagCompound(); this.inventoryContents.writeToNBT(chestData); nbt.setTag("ContentsChest", chestData); - nbt.setShort("aCustomValue", aCustomValue); + nbt.setInteger("aCustomValue", aCustomValue); if (this.hasCustomInventoryName()) { nbt.setString("CustomName", this.getCustomName()); } @@ -265,7 +265,7 @@ public class TileEntityVolumetricFlaskSetter extends TileEntity implements ISide super.readFromNBT(nbt); // Utils.LOG_WARNING("Trying to read NBT data from TE."); this.inventoryContents.readFromNBT(nbt.getCompoundTag("ContentsChest")); - this.aCustomValue = nbt.getShort("aCustomValue"); + this.aCustomValue = nbt.getInteger("aCustomValue"); if (nbt.hasKey("CustomName", 8)) { this.setCustomName(nbt.getString("CustomName")); } @@ -399,5 +399,9 @@ public class TileEntityVolumetricFlaskSetter extends TileEntity implements ISide return false; } } + + public void log(String aString) { + Logger.INFO("[Flask-Tile] "+aString); + } } diff --git a/src/Java/gtPlusPlus/core/tileentities/general/TileEntityXpConverter.java b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityXpConverter.java index 2816596515..2816596515 100644 --- a/src/Java/gtPlusPlus/core/tileentities/general/TileEntityXpConverter.java +++ b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityXpConverter.java diff --git a/src/Java/gtPlusPlus/core/tileentities/general/redstone/TileEntityRedstoneHandler.java b/src/main/java/gtPlusPlus/core/tileentities/general/redstone/TileEntityRedstoneHandler.java index eda0c65e46..eda0c65e46 100644 --- a/src/Java/gtPlusPlus/core/tileentities/general/redstone/TileEntityRedstoneHandler.java +++ b/src/main/java/gtPlusPlus/core/tileentities/general/redstone/TileEntityRedstoneHandler.java diff --git a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityAdvPooCollector.java b/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityAdvPooCollector.java index 6bb4c932dc..6bb4c932dc 100644 --- a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityAdvPooCollector.java +++ b/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityAdvPooCollector.java diff --git a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityBaseFluidCollector.java b/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityBaseFluidCollector.java index cdae4cf829..cdae4cf829 100644 --- a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityBaseFluidCollector.java +++ b/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityBaseFluidCollector.java diff --git a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityModularityTable.java b/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityModularityTable.java index 8ba43bb197..8ba43bb197 100644 --- a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityModularityTable.java +++ b/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityModularityTable.java diff --git a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityPestKiller.java b/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityPestKiller.java index 3ebe5be40d..012c9f4ff5 100644 --- a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityPestKiller.java +++ b/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityPestKiller.java @@ -183,7 +183,7 @@ public class TileEntityPestKiller extends TileEntity implements ISidedInventory, if (f != null) { if (f.isFluidEqual(FluidUtils.getWildcardFluidStack("formaldehyde", 1))) { return 1; - } else if (f.isFluidEqual(MISC_MATERIALS.HYDROGEN_CYANIDE.getFluid(1))) { + } else if (f.isFluidEqual(MISC_MATERIALS.HYDROGEN_CYANIDE.getFluidStack(1))) { return 2; } } @@ -443,7 +443,7 @@ public class TileEntityPestKiller extends TileEntity implements ISidedInventory, ArrayList<ItemStack> t2Cells = OreDictionary.getOres("cellHydrogenCyanide"); didFill = addFluid(t1Cells, aInput, FluidUtils.getWildcardFluidStack("formaldehyde", 1000)); if (!didFill) { - didFill = addFluid(t2Cells, aInput, MISC_MATERIALS.HYDROGEN_CYANIDE.getFluid(1000)); + didFill = addFluid(t2Cells, aInput, MISC_MATERIALS.HYDROGEN_CYANIDE.getFluidStack(1000)); } } diff --git a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityPooCollector.java b/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityPooCollector.java index 25348a31f8..25348a31f8 100644 --- a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityPooCollector.java +++ b/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityPooCollector.java diff --git a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityProjectTable.java b/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityProjectTable.java index 8c87baf6a9..8c87baf6a9 100644 --- a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityProjectTable.java +++ b/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityProjectTable.java diff --git a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityRoundRobinator.java b/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityRoundRobinator.java index a220997c84..a220997c84 100644 --- a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityRoundRobinator.java +++ b/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityRoundRobinator.java diff --git a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityTradeTable.java b/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityTradeTable.java index ad7ec3d0b3..ad7ec3d0b3 100644 --- a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityTradeTable.java +++ b/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityTradeTable.java diff --git a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityWorkbench.java b/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityWorkbench.java index a2db2326a9..a2db2326a9 100644 --- a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityWorkbench.java +++ b/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityWorkbench.java diff --git a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityWorkbenchAdvanced.java b/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityWorkbenchAdvanced.java index 264323388f..264323388f 100644 --- a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityWorkbenchAdvanced.java +++ b/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityWorkbenchAdvanced.java diff --git a/src/Java/gtPlusPlus/core/util/Utils.java b/src/main/java/gtPlusPlus/core/util/Utils.java index 81b23e0b1c..81b23e0b1c 100644 --- a/src/Java/gtPlusPlus/core/util/Utils.java +++ b/src/main/java/gtPlusPlus/core/util/Utils.java diff --git a/src/Java/gtPlusPlus/core/util/data/AES.java b/src/main/java/gtPlusPlus/core/util/data/AES.java index 1183cdd8e7..1183cdd8e7 100644 --- a/src/Java/gtPlusPlus/core/util/data/AES.java +++ b/src/main/java/gtPlusPlus/core/util/data/AES.java diff --git a/src/Java/gtPlusPlus/core/util/data/ArrayUtils.java b/src/main/java/gtPlusPlus/core/util/data/ArrayUtils.java index c9c8d26744..62f703f5f5 100644 --- a/src/Java/gtPlusPlus/core/util/data/ArrayUtils.java +++ b/src/main/java/gtPlusPlus/core/util/data/ArrayUtils.java @@ -26,6 +26,18 @@ public class ArrayUtils { return series; } + public static <V> V[] insertElementAtIndex(V[] aArray, int aIndex, V aObjectToInsert) { + V[] newArray = Arrays.copyOf(aArray, aArray.length + 1); + for (int i=0;i<aIndex;i++) { + newArray[i] = aArray[i]; + } + newArray[aIndex] = aObjectToInsert; + for (int i=(aIndex+1);i<newArray.length;i++) { + newArray[i] = aArray[i-1]; + } + return newArray; + } + /*public static <V> Object getMostCommonElement(List<V> list) { Optional r = list.stream().map(V::getTextureSet).collect(Collectors.groupingBy(Function.identity(), Collectors.counting())).entrySet().stream().max(Map.Entry.comparingByValue()).map(Map.Entry::getKey); return r.get(); diff --git a/src/Java/gtPlusPlus/core/util/data/EnumUtils.java b/src/main/java/gtPlusPlus/core/util/data/EnumUtils.java index edcc071b54..edcc071b54 100644 --- a/src/Java/gtPlusPlus/core/util/data/EnumUtils.java +++ b/src/main/java/gtPlusPlus/core/util/data/EnumUtils.java diff --git a/src/Java/gtPlusPlus/core/util/data/FileUtils.java b/src/main/java/gtPlusPlus/core/util/data/FileUtils.java index bec5e0eeff..bec5e0eeff 100644 --- a/src/Java/gtPlusPlus/core/util/data/FileUtils.java +++ b/src/main/java/gtPlusPlus/core/util/data/FileUtils.java diff --git a/src/Java/gtPlusPlus/core/util/data/LocaleUtils.java b/src/main/java/gtPlusPlus/core/util/data/LocaleUtils.java index d1a35a661b..d1a35a661b 100644 --- a/src/Java/gtPlusPlus/core/util/data/LocaleUtils.java +++ b/src/main/java/gtPlusPlus/core/util/data/LocaleUtils.java diff --git a/src/Java/gtPlusPlus/core/util/data/LoggingUtils.java b/src/main/java/gtPlusPlus/core/util/data/LoggingUtils.java index 8415ab32fe..8415ab32fe 100644 --- a/src/Java/gtPlusPlus/core/util/data/LoggingUtils.java +++ b/src/main/java/gtPlusPlus/core/util/data/LoggingUtils.java diff --git a/src/Java/gtPlusPlus/core/util/data/StringUtils.java b/src/main/java/gtPlusPlus/core/util/data/StringUtils.java index 2372d04c15..2372d04c15 100644 --- a/src/Java/gtPlusPlus/core/util/data/StringUtils.java +++ b/src/main/java/gtPlusPlus/core/util/data/StringUtils.java diff --git a/src/Java/gtPlusPlus/core/util/data/UUIDUtils.java b/src/main/java/gtPlusPlus/core/util/data/UUIDUtils.java index d6b32314b1..d6b32314b1 100644 --- a/src/Java/gtPlusPlus/core/util/data/UUIDUtils.java +++ b/src/main/java/gtPlusPlus/core/util/data/UUIDUtils.java diff --git a/src/Java/gtPlusPlus/core/util/debug/DEBUG_INIT.java b/src/main/java/gtPlusPlus/core/util/debug/DEBUG_INIT.java index f8fc15c778..f8fc15c778 100644 --- a/src/Java/gtPlusPlus/core/util/debug/DEBUG_INIT.java +++ b/src/main/java/gtPlusPlus/core/util/debug/DEBUG_INIT.java diff --git a/src/Java/gtPlusPlus/core/util/debug/DEBUG_ITEM_ShapeSpawner.java b/src/main/java/gtPlusPlus/core/util/debug/DEBUG_ITEM_ShapeSpawner.java index d1e65afe3e..d1e65afe3e 100644 --- a/src/Java/gtPlusPlus/core/util/debug/DEBUG_ITEM_ShapeSpawner.java +++ b/src/main/java/gtPlusPlus/core/util/debug/DEBUG_ITEM_ShapeSpawner.java diff --git a/src/Java/gtPlusPlus/core/util/debug/DEBUG_MULTIBLOCK_ShapeSpawner.java b/src/main/java/gtPlusPlus/core/util/debug/DEBUG_MULTIBLOCK_ShapeSpawner.java index 2e46b171f9..2e46b171f9 100644 --- a/src/Java/gtPlusPlus/core/util/debug/DEBUG_MULTIBLOCK_ShapeSpawner.java +++ b/src/main/java/gtPlusPlus/core/util/debug/DEBUG_MULTIBLOCK_ShapeSpawner.java diff --git a/src/Java/gtPlusPlus/core/util/debug/DEBUG_ScreenOverlay.java b/src/main/java/gtPlusPlus/core/util/debug/DEBUG_ScreenOverlay.java index 1c6a8e9278..1c6a8e9278 100644 --- a/src/Java/gtPlusPlus/core/util/debug/DEBUG_ScreenOverlay.java +++ b/src/main/java/gtPlusPlus/core/util/debug/DEBUG_ScreenOverlay.java diff --git a/src/Java/gtPlusPlus/core/util/debug/DEBUG_TimerThread.java b/src/main/java/gtPlusPlus/core/util/debug/DEBUG_TimerThread.java index 50d12871cb..50d12871cb 100644 --- a/src/Java/gtPlusPlus/core/util/debug/DEBUG_TimerThread.java +++ b/src/main/java/gtPlusPlus/core/util/debug/DEBUG_TimerThread.java diff --git a/src/Java/gtPlusPlus/core/util/debug/UtilityGL11Debug.java b/src/main/java/gtPlusPlus/core/util/debug/UtilityGL11Debug.java index 7cb1054d53..7cb1054d53 100644 --- a/src/Java/gtPlusPlus/core/util/debug/UtilityGL11Debug.java +++ b/src/main/java/gtPlusPlus/core/util/debug/UtilityGL11Debug.java diff --git a/src/Java/gtPlusPlus/core/util/math/MathUtils.java b/src/main/java/gtPlusPlus/core/util/math/MathUtils.java index 2f4db2efcc..7573e0d51c 100644 --- a/src/Java/gtPlusPlus/core/util/math/MathUtils.java +++ b/src/main/java/gtPlusPlus/core/util/math/MathUtils.java @@ -1,5 +1,6 @@ package gtPlusPlus.core.util.math; +import java.text.NumberFormat; import java.util.Map; import java.util.Random; @@ -15,6 +16,13 @@ public class MathUtils { final static Random rand = CORE.RANDOM; + /** Formats a number with group separator and at most 2 fraction digits. */ + private static final NumberFormat sNumberFormat = NumberFormat.getInstance(); + + static { + sNumberFormat.setMaximumFractionDigits(2); + } + /** * Returns a psuedo-random number between min and max, inclusive. * The difference between min and max can be at most @@ -766,6 +774,14 @@ public class MathUtils { public static Number max(Number a, Number b) { return (a.longValue() >= b.longValue()) ? a : b; } + + public static String formatNumbers(long aNumber) { + return sNumberFormat.format(aNumber); + } + + public static String formatNumbers(double aNumber) { + return sNumberFormat.format(aNumber); + } } diff --git a/src/Java/gtPlusPlus/core/util/minecraft/ClientUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/ClientUtils.java index 806f83d830..806f83d830 100644 --- a/src/Java/gtPlusPlus/core/util/minecraft/ClientUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/ClientUtils.java diff --git a/src/Java/gtPlusPlus/core/util/minecraft/EnchantingUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/EnchantingUtils.java index 2f273d5f7f..2f273d5f7f 100644 --- a/src/Java/gtPlusPlus/core/util/minecraft/EnchantingUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/EnchantingUtils.java diff --git a/src/Java/gtPlusPlus/core/util/minecraft/EnergyUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/EnergyUtils.java index 8b02ea9c7c..8b02ea9c7c 100644 --- a/src/Java/gtPlusPlus/core/util/minecraft/EnergyUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/EnergyUtils.java diff --git a/src/Java/gtPlusPlus/core/util/minecraft/EntityUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/EntityUtils.java index fda7b0b738..fda7b0b738 100644 --- a/src/Java/gtPlusPlus/core/util/minecraft/EntityUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/EntityUtils.java diff --git a/src/Java/gtPlusPlus/core/util/minecraft/FluidUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/FluidUtils.java index 758ec8bab0..73fa919731 100644 --- a/src/Java/gtPlusPlus/core/util/minecraft/FluidUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/FluidUtils.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.util.minecraft; +import java.util.HashMap; + import gregtech.api.enums.Dyes; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -24,7 +26,9 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidContainerItem; public class FluidUtils { - + + private static HashMap<String, Fluid> sFluidCache = new HashMap<String, Fluid>(); + public static FluidStack getWater(final int amount){ return FluidUtils.getFluidStack("water", amount); } @@ -87,44 +91,67 @@ public class FluidUtils { return FluidUtils.getFluidStack("ic2uumatter", amount); } - public static FluidStack getFluidStack(final String fluidName, final int amount){ - Logger.WARNING("Trying to get a fluid stack of "+fluidName); - try { - FluidStack x = FluidRegistry.getFluidStack(fluidName, amount); - return x != null ? x.copy() : null; + public static FluidStack getHydrofluoricAcid(int amount) { + return FluidUtils.getFluidStack("hydrofluoricacid", amount); + } + + public static Fluid sGregtechHydrofluoricAcid = null; + + public static FluidStack getHydrofluoricAcidGT(int amount) { + if (sGregtechHydrofluoricAcid == null) { + FluidStack aGTHF = FluidUtils.getFluidStack("hydrofluoricacid_gt5u", 1); + sGregtechHydrofluoricAcid = aGTHF != null ? aGTHF.getFluid() : getHydrofluoricAcid(1).getFluid(); } - catch (final Throwable e){ - return null; + return FluidUtils.getFluidStack(sGregtechHydrofluoricAcid, amount); + } + + public static boolean doesHydrofluoricAcidGtExist() { + if (sGregtechHydrofluoricAcid == null) { + getHydrofluoricAcidGT(1); } - + return sGregtechHydrofluoricAcid != null && sGregtechHydrofluoricAcid != getHydrofluoricAcid(1).getFluid(); } - - public static FluidStack getFluidStack(final FluidStack vmoltenFluid, final int fluidAmount) { - Logger.WARNING("Trying to get a fluid stack of "+vmoltenFluid.getFluid().getName()); - try { - FluidStack x = FluidRegistry.getFluidStack(vmoltenFluid.getFluid().getName(), fluidAmount); - return x != null ? x.copy() : null; + + private static FluidStack createFluidStack(Fluid aFluid, int aAmount) { + if (aFluid != null) { + return new FluidStack(aFluid, aAmount); } - catch (final Throwable e){ - return null; + return null; + } + + public static FluidStack getFluidStack(final String aFluidName, final int aAmount){ + Fluid aFluid = sFluidCache.get(aFluidName); + if (aFluid != null) { + return createFluidStack(aFluid, aAmount); } + else { + Fluid aLookupFluid = FluidRegistry.getFluid(aFluidName); + if (aLookupFluid != null) { + sFluidCache.put(aFluidName, aLookupFluid); + return createFluidStack(aLookupFluid, aAmount); + } + } + return null; } - public static FluidStack getFluidStack(final Fluid vFluid, final int fluidAmount) { - Logger.WARNING("Trying to get a fluid stack of "+vFluid.getName()); - try { - FluidStack x = FluidRegistry.getFluidStack(vFluid.getName(), fluidAmount); - return x != null ? x.copy() : null; + public static FluidStack getFluidStack(final FluidStack aFluidStack, final int aAmount) { + if (aFluidStack == null) { + return null; } - catch (final Throwable e){ + return new FluidStack(aFluidStack, aAmount); + } + + public static FluidStack getFluidStack(final Fluid aFluid, final int aAmount) { + if (aFluid == null) { return null; } + return new FluidStack(aFluid, aAmount); } public static FluidStack[] getFluidStackArray(final String fluidName, final int amount){ Logger.WARNING("Trying to get a fluid stack of "+fluidName); try { - final FluidStack[] singleFluid = {FluidRegistry.getFluidStack(fluidName, amount)}; + final FluidStack[] singleFluid = {getFluidStack(fluidName, amount)}; return singleFluid; } catch (final Throwable e){ @@ -136,7 +163,7 @@ public class FluidUtils { public static FluidStack[] getFluidStackArray(final FluidStack fluidName, final int amount){ Logger.WARNING("Trying to get a fluid stack of "+fluidName); try { - final FluidStack[] singleFluid = {FluidRegistry.getFluidStack(fluidName.getLocalizedName(), amount)}; + final FluidStack[] singleFluid = {getFluidStack(fluidName, amount)}; return singleFluid; } catch (final Throwable e){ @@ -175,7 +202,7 @@ public class FluidUtils { } public static Fluid addGTFluid(final String aName, final String aLocalized, final short[] aRGBa, final int aState, final long aTemperatureK, final ItemStack aFullContainer, final ItemStack aEmptyContainer, final int aFluidAmount, final boolean aGenerateCell) { - return addGTFluid("molten."+aName, "molten.autogenerated", aLocalized, aRGBa, aState, aTemperatureK, aFullContainer, aEmptyContainer, aFluidAmount, aGenerateCell); + return addGTFluid("molten."+aName, "fluid.autogenerated", aLocalized, aRGBa, aState, aTemperatureK, aFullContainer, aEmptyContainer, aFluidAmount, aGenerateCell); } public static Fluid addGTFluidNonMolten(final String aName, final String aLocalized, final short[] aRGBa, final int aState, final long aTemperatureK, final ItemStack aFullContainer, final ItemStack aEmptyContainer, final int aFluidAmount, final boolean aGenerateCell) { @@ -232,6 +259,7 @@ public class FluidUtils { public static Fluid addGTFluid(String aName, final String aTexture, final String aLocalized, final short[] aRGBa, final int aState, final long aTemperatureK, ItemStack aFullContainer, final ItemStack aEmptyContainer, final int aFluidAmount, final boolean aGenerateFilledCell) { String aNameOriginal = aName; + Logger.INFO("Generating Fluid for "+aName); aName = Utils.sanitizeString(aName.toLowerCase()); @@ -286,10 +314,28 @@ public class FluidUtils { } + String aNameNonMolten = aLocalName.contains("Molten") ? aLocalName.replace("Molten", "") : aLocalName; if (aFullContainer == null) { - ItemStack oreStack = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cell"+aName, 1); - aFullContainer = oreStack; + ItemStack oreStack = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cell"+aLocalName, 1); + aFullContainer = oreStack; + if (aFullContainer == null) { + oreStack = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cell"+aNameOriginal, 1); + aFullContainer = oreStack; + if (aFullContainer == null) { + oreStack = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cell"+aNameNonMolten, 1); + aFullContainer = oreStack; + if (aFullContainer != null) { + Logger.INFO("Found cell for "+aNameNonMolten); + } + } + else { + Logger.INFO("Found cell for "+aNameOriginal); + } + } + else { + Logger.INFO("Found cell for "+aLocalName); + } } Item tempCell = null; @@ -304,7 +350,8 @@ public class FluidUtils { aMatName = aMatName.replace("fluid.", ""); aMatName = aMatName.substring(0, 1).toUpperCase() + aMatName.substring(1); } - tempCell = new BaseItemComponent(aMatName, aLocalized, aRGBa); + Logger.INFO("Generating cell for "+aMatName+", "+aLocalName); + tempCell = new BaseItemComponent(aMatName, aLocalName, aRGBa); aFullContainer = ItemUtils.getSimpleStack(tempCell); } @@ -563,11 +610,11 @@ public class FluidUtils { return aFStack1 != null || aFStack2 != null || aFStack3 != null || aFStack4 != null || aFStack5 != null || aFStack6 != null; } - public static FluidStack getWildcardFluidStack(String aFluidName, int amount) { - FluidStack aFStack1 = (FluidUtils.getFluidStack("molten"+"."+aFluidName.toLowerCase(), amount)); - FluidStack aFStack2 = (FluidUtils.getFluidStack("fluid"+"."+aFluidName.toLowerCase(), amount)); - FluidStack aFStack3 = (FluidUtils.getFluidStack(aFluidName.toLowerCase(), amount)); - FluidStack aFStack4 = (FluidUtils.getFluidStack(aFluidName, amount)); + public static FluidStack getWildcardFluidStack(String aFluidName, int amount) { + FluidStack aFStack1 = (FluidUtils.getFluidStack(aFluidName, amount)); + FluidStack aFStack2 = (FluidUtils.getFluidStack(aFluidName.toLowerCase(), amount)); + FluidStack aFStack3 = (FluidUtils.getFluidStack("molten"+"."+aFluidName.toLowerCase(), amount)); + FluidStack aFStack4 = (FluidUtils.getFluidStack("fluid"+"."+aFluidName.toLowerCase(), amount)); FluidStack aFStack5 = (FluidUtils.getFluidStack("liquid_"+aFluidName.toLowerCase(), amount)); FluidStack aFStack6 = (FluidUtils.getFluidStack("liquid"+"."+aFluidName.toLowerCase(), amount)); if (aFStack1 != null) { diff --git a/src/Java/gtPlusPlus/core/util/minecraft/FoodUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/FoodUtils.java index 9f5d4f36ca..9f5d4f36ca 100644 --- a/src/Java/gtPlusPlus/core/util/minecraft/FoodUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/FoodUtils.java diff --git a/src/Java/gtPlusPlus/core/util/minecraft/HazmatUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/HazmatUtils.java index b322036ef7..0e2fff3f35 100644 --- a/src/Java/gtPlusPlus/core/util/minecraft/HazmatUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/HazmatUtils.java @@ -254,7 +254,7 @@ public class HazmatUtils { aItemFields.add(ReflectionUtils.getField(aItemsGravisuite, "graviChestPlate")); AutoMap<ItemStack> aGravisuite = new AutoMap<ItemStack>(); for (Field aItemField : aItemFields) { - Item aItemObject = (Item) ReflectionUtils.getFieldValue(aItemField); + Item aItemObject = ReflectionUtils.getFieldValue(aItemField); if (aItemObject != null) { aGravisuite.add(ItemUtils.getSimpleStack(aItemObject)); } @@ -274,7 +274,7 @@ public class HazmatUtils { aItemFields.add(ReflectionUtils.getField(aItemsEMT, "ultimateSolarHelmet")); AutoMap<ItemStack> aASP = new AutoMap<ItemStack>(); for (Field aItemField : aItemFields) { - Item aItemObject = (Item) ReflectionUtils.getFieldValue(aItemField); + Item aItemObject = ReflectionUtils.getFieldValue(aItemField); if (aItemObject != null) { aASP.add(ItemUtils.getSimpleStack(aItemObject)); } diff --git a/src/Java/gtPlusPlus/core/util/minecraft/InventoryUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/InventoryUtils.java index fe67c88d69..fe67c88d69 100644 --- a/src/Java/gtPlusPlus/core/util/minecraft/InventoryUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/InventoryUtils.java diff --git a/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java index 1e282fb849..fa685aa93c 100644 --- a/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java @@ -703,6 +703,44 @@ public class ItemUtils { } return sRadiation; } + + public static String getArrayStackNames(ArrayList<?> aStack) { + Object aType = aStack.get(0); + if (aType instanceof FluidStack) { + FluidStack[] aItems = new FluidStack[aStack.size()]; + for (int i=0;i<aItems.length;i++) { + aItems[i] = (FluidStack) aStack.get(i); + } + return getArrayStackNames(aItems); + } + if (aType instanceof ItemStack) { + ItemStack[] aItems = new ItemStack[aStack.size()]; + for (int i=0;i<aItems.length;i++) { + aItems[i] = (ItemStack) aStack.get(i); + } + return getArrayStackNames(aItems); + } + return ""; + } + + public static String getArrayStackNames(final AutoMap<?> aStack) { + Object aType = aStack.get(0); + if (aType instanceof FluidStack) { + FluidStack[] aItems = new FluidStack[aStack.size()]; + for (int i=0;i<aItems.length;i++) { + aItems[i] = (FluidStack) aStack.get(i); + } + return getArrayStackNames(aItems); + } + if (aType instanceof ItemStack) { + ItemStack[] aItems = new ItemStack[aStack.size()]; + for (int i=0;i<aItems.length;i++) { + aItems[i] = (ItemStack) aStack.get(i); + } + return getArrayStackNames(aItems); + } + return ""; + } public static String getArrayStackNames(final FluidStack[] aStack) { String itemNames = "Fluid Array: "; @@ -717,7 +755,7 @@ public class ItemUtils { } return itemNames; } - + public static String getArrayStackNames(final ItemStack[] aStack) { String itemNames = ""; int aPos = 0; @@ -913,10 +951,11 @@ public class ItemUtils { } public static ItemStack getErrorStack(int mAmount, String aName) { - ItemStack g = getSimpleStack(ModItems.AAA_Broken, 1); - NBTUtils.setString(g, "Lore", EnumChatFormatting.RED+aName); + ItemStack g = getSimpleStack(ModItems.AAA_Broken, 1); if (aName != null) { - NBTUtils.setBookTitle(g, EnumChatFormatting.YELLOW+"Maybe Alkalus should know about this"); + //NBTUtils.setString(g, "Lore", EnumChatFormatting.RED+aName); + NBTUtils.setBookTitle(g, EnumChatFormatting.RED+aName); + //NBTUtils.setBookTitle(g, EnumChatFormatting.YELLOW+"Maybe Alkalus should know about this"); } return g; } @@ -1275,9 +1314,6 @@ public class ItemUtils { } public static boolean isCatalyst(ItemStack aStack) { - if (GT_Utility.areStacksEqual(aStack, RocketFuels.Formaldehyde_Catalyst_Stack, true)) { - return true; - } if (GT_Utility.areStacksEqual(aStack, GenericChem.mBlueCatalyst, true)) { return true; } @@ -1299,6 +1335,9 @@ public class ItemUtils { if (GT_Utility.areStacksEqual(aStack, GenericChem.mPinkCatalyst, true)) { return true; } + if (GT_Utility.areStacksEqual(aStack, GenericChem.mFormaldehydeCatalyst, true)) { + return true; + } if (GT_Utility.areStacksEqual(aStack, AgriculturalChem.mGreenCatalyst, true)) { return true; } @@ -1375,6 +1414,6 @@ public class ItemUtils { public static boolean areItemsEqual(ItemStack aStack1, ItemStack aStack2, boolean aIgnoreNBT) { return GT_Utility.areStacksEqual(aStack1, aStack2, aIgnoreNBT); - } + } } diff --git a/src/Java/gtPlusPlus/core/util/minecraft/LangUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/LangUtils.java index 0b24e962af..0b24e962af 100644 --- a/src/Java/gtPlusPlus/core/util/minecraft/LangUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/LangUtils.java diff --git a/src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/MaterialUtils.java index 7e9e34ae47..0323bf0161 100644 --- a/src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/MaterialUtils.java @@ -512,5 +512,12 @@ public class MaterialUtils { return false; } + public static boolean isNullGregtechMaterial(Materials aGregtechMaterial) { + if (aGregtechMaterial == Materials._NULL || aGregtechMaterial.equals(Materials._NULL) || aGregtechMaterial.name().equals(Materials._NULL.name())) { + return true; + } + return false; + } + }
\ No newline at end of file diff --git a/src/Java/gtPlusPlus/core/util/minecraft/MiningUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/MiningUtils.java index 080b5665a3..080b5665a3 100644 --- a/src/Java/gtPlusPlus/core/util/minecraft/MiningUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/MiningUtils.java diff --git a/src/Java/gtPlusPlus/core/util/minecraft/ModularArmourUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/ModularArmourUtils.java index e3ffb5c410..e3ffb5c410 100644 --- a/src/Java/gtPlusPlus/core/util/minecraft/ModularArmourUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/ModularArmourUtils.java diff --git a/src/Java/gtPlusPlus/core/util/minecraft/NBTUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/NBTUtils.java index 7ed4d887cc..7ed4d887cc 100644 --- a/src/Java/gtPlusPlus/core/util/minecraft/NBTUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/NBTUtils.java diff --git a/src/Java/gtPlusPlus/core/util/minecraft/OreDictUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/OreDictUtils.java index 324d39b863..324d39b863 100644 --- a/src/Java/gtPlusPlus/core/util/minecraft/OreDictUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/OreDictUtils.java diff --git a/src/Java/gtPlusPlus/core/util/minecraft/PlayerUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/PlayerUtils.java index 24ffa295b7..24ffa295b7 100644 --- a/src/Java/gtPlusPlus/core/util/minecraft/PlayerUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/PlayerUtils.java diff --git a/src/Java/gtPlusPlus/core/util/minecraft/RecipeUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/RecipeUtils.java index a20678c354..da5bc071bc 100644 --- a/src/Java/gtPlusPlus/core/util/minecraft/RecipeUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/RecipeUtils.java @@ -1,14 +1,18 @@ package gtPlusPlus.core.util.minecraft; import java.util.ArrayList; +import java.util.Arrays; import java.util.Iterator; import java.util.List; import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.enums.Materials; import gregtech.api.objects.ItemData; -import gregtech.api.util.*; +import gregtech.api.util.GT_ModHandler; +import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Recipe.GT_Recipe_Map; +import gregtech.api.util.GT_Utility; import gtPlusPlus.GTplusplus; import gtPlusPlus.api.interfaces.RunnableWithInfo; import gtPlusPlus.api.objects.Logger; @@ -20,7 +24,6 @@ import gtPlusPlus.core.handler.Recipes.RegistrationHandler; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.data.ArrayUtils; -import gtPlusPlus.core.util.reflect.ReflectionUtils; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -46,7 +49,7 @@ public static int mInvalidID = 1; Logger.RECIPE(ReflectionUtils.getMethodName(7)); Logger.RECIPE(ReflectionUtils.getMethodName(8)); Logger.RECIPE(ReflectionUtils.getMethodName(9)); - System.exit(1); + FMLCommonHandler.instance().exitJava(1, true); }*/ if (resultItem == null){ @@ -347,16 +350,7 @@ public static int mInvalidID = 1; if (gtPlusPlus.GTplusplus.CURRENT_LOAD_PHASE != GTplusplus.INIT_PHASE.POST_INIT) { - Logger.RECIPE(ReflectionUtils.getMethodName(1)); - Logger.RECIPE(ReflectionUtils.getMethodName(2)); - Logger.RECIPE(ReflectionUtils.getMethodName(3)); - Logger.RECIPE(ReflectionUtils.getMethodName(4)); - Logger.RECIPE(ReflectionUtils.getMethodName(5)); - Logger.RECIPE(ReflectionUtils.getMethodName(6)); - Logger.RECIPE(ReflectionUtils.getMethodName(7)); - Logger.RECIPE(ReflectionUtils.getMethodName(8)); - Logger.RECIPE(ReflectionUtils.getMethodName(9)); - System.exit(1); + CORE.crash("Load Phase "+gtPlusPlus.GTplusplus.CURRENT_LOAD_PHASE+" should be "+GTplusplus.INIT_PHASE.POST_INIT+". Unable to register recipe."); } @@ -417,6 +411,20 @@ public static int mInvalidID = 1; } return false; } + + public static boolean addShapelessGregtechRecipe( + final Object InputItem1, final Object InputItem2, final Object InputItem3, + final Object InputItem4, final Object InputItem5, final Object InputItem6, + final Object InputItem7, final Object InputItem8, final Object InputItem9, + final ItemStack OutputItem){ + + Object[] inputItems = { + InputItem1, InputItem2, InputItem3, + InputItem4, InputItem5, InputItem6, + InputItem7, InputItem8, InputItem9 + }; + return addShapelessGregtechRecipe(inputItems, OutputItem); + } public static boolean addShapelessGregtechRecipe(final Object[] inputItems, final ItemStack OutputItem){ //Catch Invalid Recipes @@ -491,10 +499,7 @@ public static int mInvalidID = 1; result.put("Is Enabled? "+m.mEnabled); result.put("Special Value: "+m.mSpecialValue); result.put("====================================="); - String s[] = new String[result.size()]; - for (int i=0;i<result.size();i++) { - s[i] = result.get(i); - } + String s[] = result.toArray(); return s; } @@ -728,7 +733,7 @@ public static int mInvalidID = 1; Logger.INFO("Data Size: "+aDataObject.length); aDataObject = ArrayUtils.removeNulls(aDataObject); Logger.INFO("Clean Size: "+aDataObject.length); - Logger.INFO("ArrayData: "+aDataObject.toString()); + Logger.INFO("ArrayData: "+Arrays.toString(aDataObject)); ShapedOreRecipe aRecipe = new ShapedOreRecipe(aOutputStack, aDataObject); diff --git a/src/Java/gtPlusPlus/core/util/minecraft/ShapelessUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/ShapelessUtils.java index 3caa9d4e4f..3caa9d4e4f 100644 --- a/src/Java/gtPlusPlus/core/util/minecraft/ShapelessUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/ShapelessUtils.java diff --git a/src/Java/gtPlusPlus/core/util/minecraft/gregtech/PollutionUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/gregtech/PollutionUtils.java index 2ae2a9f1de..242a63c712 100644 --- a/src/Java/gtPlusPlus/core/util/minecraft/gregtech/PollutionUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/gregtech/PollutionUtils.java @@ -2,17 +2,13 @@ package gtPlusPlus.core.util.minecraft.gregtech; import static gtPlusPlus.core.lib.CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK; -import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; - import org.apache.commons.lang3.ArrayUtils; import gregtech.GT_Mod; import gregtech.api.enums.OrePrefixes; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.interfaces.tileentity.IHasWorldObjectAndCoords; -import gregtech.common.GT_Proxy; +import gregtech.common.GT_Pollution; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.core.item.base.cell.BaseItemCell; @@ -21,7 +17,6 @@ import gtPlusPlus.core.material.MISC_MATERIALS; import gtPlusPlus.core.material.MaterialGenerator; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; -import gtPlusPlus.core.util.reflect.ReflectionUtils; import net.minecraft.item.ItemStack; import net.minecraft.world.chunk.Chunk; import net.minecraftforge.fluids.FluidStack; @@ -30,12 +25,6 @@ public class PollutionUtils { private static boolean mIsPollutionEnabled = true; - private static Method mAddPollution; - private static Method mAddPollution2; - - private static Method mGetPollution; - private static Method mGetPollution2; - public static AutoMap<FluidStack> mPollutionFluidStacks = new AutoMap<FluidStack>(); static { @@ -45,85 +34,37 @@ public class PollutionUtils { mIsPollutionEnabled = false; } } - + public static boolean isPollutionEnabled() { return mIsPollutionEnabled; } - public static boolean mPollution() { - try { - GT_Proxy GT_Pollution = GT_Mod.gregtechproxy; - if (GT_Pollution != null) { - Field mPollution = ReflectionUtils.getField(GT_Pollution.getClass(), "mPollution"); - if (mPollution != null) { - return mPollution.getBoolean(GT_Pollution); - } - } - } catch (SecurityException | IllegalArgumentException | IllegalAccessException e) { - } - return false; + private static boolean mPollution() { + return GT_Mod.gregtechproxy.mPollution; } public static boolean addPollution(IGregTechTileEntity te, int pollutionValue) { - if (mIsPollutionEnabled) - try { - if (te == null) { - return false; - } - if (mAddPollution != null) { - mAddPollution.invoke(null, te, pollutionValue); - } - Class<?> GT_Pollution = ReflectionUtils.getClass("gregtech.common.GT_Pollution"); - if (GT_Pollution != null) { - Method addPollution = ReflectionUtils.getMethod(GT_Pollution, "addPollution", IGregTechTileEntity.class, int.class); - if (addPollution != null) { - mAddPollution = addPollution; - addPollution.invoke(null, te, pollutionValue); - return true; - } - } - } catch (SecurityException | IllegalAccessException - | IllegalArgumentException | InvocationTargetException e) { - } + if (mIsPollutionEnabled) { + GT_Pollution.addPollution(te, pollutionValue); + return true; + } return false; } public static boolean addPollution(IHasWorldObjectAndCoords aTileOfSomeSort, int pollutionValue) { - if (mIsPollutionEnabled) - try { - if (aTileOfSomeSort == null) { - return false; - } - IHasWorldObjectAndCoords j = (IHasWorldObjectAndCoords) aTileOfSomeSort; - Chunk c = j.getWorld().getChunkFromBlockCoords(j.getXCoord(), j.getZCoord()); - return addPollution(c, pollutionValue); - } catch (SecurityException | IllegalArgumentException e) { - } + if (mIsPollutionEnabled) { + IHasWorldObjectAndCoords j = (IHasWorldObjectAndCoords) aTileOfSomeSort; + Chunk c = j.getWorld().getChunkFromBlockCoords(j.getXCoord(), j.getZCoord()); + return addPollution(c, pollutionValue); + } return false; } public static boolean addPollution(Chunk aChunk, int pollutionValue) { - if (mIsPollutionEnabled) - try { - if (aChunk == null) { - return false; - } - if (mAddPollution2 != null) { - mAddPollution2.invoke(null, aChunk, pollutionValue); - return true; - } - Class<?> GT_Pollution = ReflectionUtils.getClass("gregtech.common.GT_Pollution"); - if (GT_Pollution != null) { - Method addPollution = ReflectionUtils.getMethod(GT_Pollution, "addPollution", Chunk.class, int.class); - if (addPollution != null) { - mAddPollution2 = addPollution; - mAddPollution2.invoke(null, aChunk, pollutionValue); - return true; - } - } - } catch (SecurityException | IllegalAccessException - | IllegalArgumentException | InvocationTargetException e) { - } + if (mIsPollutionEnabled) { + GT_Pollution.addPollution(aChunk, pollutionValue); + return true; + } return false; } @@ -155,85 +96,30 @@ public class PollutionUtils { return nullifyPollution(c); } - public static boolean nullifyPollution(Chunk aChunk) { - try { + public static boolean nullifyPollution(Chunk aChunk) { + if (mIsPollutionEnabled) { if (aChunk == null) { return false; } - long getCurrentPollution = getPollution(aChunk); + int getCurrentPollution = getPollution(aChunk); if (getCurrentPollution <= 0) { return false; } else { - if (mAddPollution2 != null) { - mAddPollution2.invoke(null, aChunk, -getCurrentPollution); - return true; - } - else { - Class<?> GT_Pollution = ReflectionUtils.getClass("gregtech.common.GT_Pollution"); - if (GT_Pollution != null) { - Method addPollution = ReflectionUtils.getMethod(GT_Pollution, "addPollution", Chunk.class, int.class); - if (addPollution != null) { - mAddPollution2 = addPollution; - mAddPollution2.invoke(null, aChunk, 0); - return true; - } - } - } + return removePollution(aChunk, getCurrentPollution); } - - } catch (SecurityException | IllegalAccessException - | IllegalArgumentException | InvocationTargetException e) { - } + } return false; } public static int getPollution(IGregTechTileEntity te) { - if (MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) - try { - if (te == null) { - return 0; - } - if (mGetPollution != null) { - mGetPollution.invoke(null, te); - } - Class<?> GT_Pollution = ReflectionUtils.getClass("gregtech.common.GT_Pollution"); - if (GT_Pollution != null) { - Method addPollution = ReflectionUtils.getMethod(GT_Pollution, "getPollution", IGregTechTileEntity.class); - if (addPollution != null) { - mGetPollution = addPollution; - return (int) addPollution.invoke(null, te); - } - } - } catch (SecurityException | IllegalAccessException - | IllegalArgumentException | InvocationTargetException e) { - } - return 0; + return GT_Pollution.getPollution(te); } public static int getPollution(Chunk te) { - if (MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) - try { - if (te == null) { - return 0; - } - if (mGetPollution2 != null) { - mGetPollution2.invoke(null, te); - } - Class<?> GT_Pollution = ReflectionUtils.getClass("gregtech.common.GT_Pollution"); - if (GT_Pollution != null) { - Method addPollution = ReflectionUtils.getMethod(GT_Pollution, "getPollution", Chunk.class); - if (addPollution != null) { - mGetPollution2 = addPollution; - return (int) addPollution.invoke(null, te); - } - } - } catch (SecurityException | IllegalAccessException - | IllegalArgumentException | InvocationTargetException e) { - } - return 0; + return GT_Pollution.getPollution(te); } - + public static boolean setPollutionFluids() { if (mPollutionFluidStacks.isEmpty()) { FluidStack CD, CM, SD; @@ -258,7 +144,7 @@ public class PollutionUtils { else { MaterialGenerator.generate(MISC_MATERIALS.CARBON_DIOXIDE, false, false); } - + if (CM != null) { Logger.INFO("[PollutionCompat] Found carbon monoxide fluid, registering it."); PollutionUtils.mPollutionFluidStacks.put(CM); @@ -276,7 +162,7 @@ public class PollutionUtils { else { MaterialGenerator.generate(MISC_MATERIALS.CARBON_MONOXIDE, false, false); } - + if (SD != null) { Logger.INFO("[PollutionCompat] Found sulfur dioxide fluid, registering it."); PollutionUtils.mPollutionFluidStacks.put(SD); @@ -297,9 +183,9 @@ public class PollutionUtils { return true; } } - - - + + + } } diff --git a/src/Java/gtPlusPlus/core/util/minecraft/gregtech/material/MaterialBuilder.java b/src/main/java/gtPlusPlus/core/util/minecraft/gregtech/material/MaterialBuilder.java index 44c0f66732..44c0f66732 100644 --- a/src/Java/gtPlusPlus/core/util/minecraft/gregtech/material/MaterialBuilder.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/gregtech/material/MaterialBuilder.java diff --git a/src/Java/gtPlusPlus/core/util/minecraft/gregtech/recipehandlers/GregtechRecipe.java b/src/main/java/gtPlusPlus/core/util/minecraft/gregtech/recipehandlers/GregtechRecipe.java index 635239bbfc..635239bbfc 100644 --- a/src/Java/gtPlusPlus/core/util/minecraft/gregtech/recipehandlers/GregtechRecipe.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/gregtech/recipehandlers/GregtechRecipe.java diff --git a/src/Java/gtPlusPlus/core/util/minecraft/network/CustomPacket.java b/src/main/java/gtPlusPlus/core/util/minecraft/network/CustomPacket.java index def836eac9..def836eac9 100644 --- a/src/Java/gtPlusPlus/core/util/minecraft/network/CustomPacket.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/network/CustomPacket.java diff --git a/src/Java/gtPlusPlus/core/util/minecraft/network/PacketBuilder.java b/src/main/java/gtPlusPlus/core/util/minecraft/network/PacketBuilder.java index edbc6aaf83..edbc6aaf83 100644 --- a/src/Java/gtPlusPlus/core/util/minecraft/network/PacketBuilder.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/network/PacketBuilder.java diff --git a/src/Java/gtPlusPlus/core/util/minecraft/network/PacketDispatcher.java b/src/main/java/gtPlusPlus/core/util/minecraft/network/PacketDispatcher.java index f61a6f2b6c..f61a6f2b6c 100644 --- a/src/Java/gtPlusPlus/core/util/minecraft/network/PacketDispatcher.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/network/PacketDispatcher.java diff --git a/src/Java/gtPlusPlus/core/util/minecraft/network/PacketHandler.java b/src/main/java/gtPlusPlus/core/util/minecraft/network/PacketHandler.java index 158f9f9483..158f9f9483 100644 --- a/src/Java/gtPlusPlus/core/util/minecraft/network/PacketHandler.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/network/PacketHandler.java diff --git a/src/Java/gtPlusPlus/core/util/minecraft/network/PacketTileEntity.java b/src/main/java/gtPlusPlus/core/util/minecraft/network/PacketTileEntity.java index d59bee3c27..d59bee3c27 100644 --- a/src/Java/gtPlusPlus/core/util/minecraft/network/PacketTileEntity.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/network/PacketTileEntity.java diff --git a/src/Java/gtPlusPlus/core/util/minecraft/particles/BlockBreakParticles.java b/src/main/java/gtPlusPlus/core/util/minecraft/particles/BlockBreakParticles.java index 9046a57120..9046a57120 100644 --- a/src/Java/gtPlusPlus/core/util/minecraft/particles/BlockBreakParticles.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/particles/BlockBreakParticles.java diff --git a/src/Java/gtPlusPlus/core/util/minecraft/particles/EntityParticleFXMysterious.java b/src/main/java/gtPlusPlus/core/util/minecraft/particles/EntityParticleFXMysterious.java index d996cf705a..d996cf705a 100644 --- a/src/Java/gtPlusPlus/core/util/minecraft/particles/EntityParticleFXMysterious.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/particles/EntityParticleFXMysterious.java diff --git a/src/Java/gtPlusPlus/core/util/player/PlayerCache.java b/src/main/java/gtPlusPlus/core/util/player/PlayerCache.java index 753124dcd7..753124dcd7 100644 --- a/src/Java/gtPlusPlus/core/util/player/PlayerCache.java +++ b/src/main/java/gtPlusPlus/core/util/player/PlayerCache.java diff --git a/src/Java/gtPlusPlus/core/util/reflect/AddGregtechRecipe.java b/src/main/java/gtPlusPlus/core/util/reflect/AddGregtechRecipe.java index 0b22ea3acc..fc8e84cb61 100644 --- a/src/Java/gtPlusPlus/core/util/reflect/AddGregtechRecipe.java +++ b/src/main/java/gtPlusPlus/core/util/reflect/AddGregtechRecipe.java @@ -3,16 +3,15 @@ package gtPlusPlus.core.util.reflect; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import net.minecraft.item.ItemStack; - import gregtech.api.enums.GT_Values; import gregtech.api.interfaces.internal.IGT_RecipeAdder; import gregtech.api.util.GT_Recipe; -import gregtech.api.util.GT_Utility; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; public final class AddGregtechRecipe { @@ -24,53 +23,47 @@ public final class AddGregtechRecipe { if (aRecipe.mInputs == null || aRecipe.mFluidInputs == null || aRecipe.mFluidOutputs == null || aRecipe.mOutputs == null) { return false; - } - - if (aRecipe.mInputs.length > 2 || aRecipe.mFluidInputs.length > 1 || aRecipe.mFluidOutputs.length > 1 || aRecipe.mOutputs.length > 1) { + } + if (aRecipe.mInputs.length > 2 || aRecipe.mFluidInputs.length > 1 || aRecipe.mFluidOutputs.length > 1 || aRecipe.mOutputs.length > 9) { return false; } - else if (aRecipe.mInputs.length <= 0 || aRecipe.mFluidInputs.length <= 0 || aRecipe.mFluidOutputs.length <= 0 || aRecipe.mOutputs.length <= 0) { + else if (aRecipe.mInputs.length <= 0) { return false; } int aCircuitNumber = -1; - int aItemSlot = -1; + Item aCircuit = CI.getNumberedCircuit(1).getItem(); + boolean hasCircuit = false; - int aSlot = 0; for (ItemStack a : aRecipe.mInputs) { - if (a != null && a.getItem() != CI.getNumberedCircuit(1).getItem()) { - aItemSlot = aSlot; - } - else { - aSlot++; + if (a != null && a.getItem() == aCircuit) { + hasCircuit = true; + aCircuitNumber = a.getItemDamage(); + break; } } - for (int i=0;i<25;i++) { - ItemStack aTest = CI.getNumberedCircuit(i); - for (ItemStack a : aRecipe.mInputs) { - if (a != null && GT_Utility.areStacksEqual(a, aTest)) { - aCircuitNumber = i; - break; - } - } + ItemStack aInputItem = null; + if (!hasCircuit || aCircuitNumber < 1) { + return false; } - if (aCircuitNumber < 0) { - return false; + for (ItemStack a : aRecipe.mInputs) { + if (a != null && a.getItem() != aCircuit) { + aInputItem = a; + break; + } } - return CORE.RA.addCokeOvenRecipe( - aRecipe.mInputs[aItemSlot], - ItemUtils.getGregtechCircuit(aCircuitNumber), - aRecipe.mFluidInputs[0], - aRecipe.mFluidOutputs[0], - aRecipe.mOutputs[0], - aModifiedTime, - aRecipe.mEUt); - - + aCircuitNumber, + aInputItem, + aRecipe.mFluidInputs, + aRecipe.mFluidOutputs, + aRecipe.mOutputs, + aModifiedTime, + aRecipe.mEUt); + } diff --git a/src/Java/gtPlusPlus/core/util/reflect/ProxyFinder.java b/src/main/java/gtPlusPlus/core/util/reflect/ProxyFinder.java index aaa9b2fae7..aaa9b2fae7 100644 --- a/src/Java/gtPlusPlus/core/util/reflect/ProxyFinder.java +++ b/src/main/java/gtPlusPlus/core/util/reflect/ProxyFinder.java diff --git a/src/Java/gtPlusPlus/core/util/reflect/ReflectionUtils.java b/src/main/java/gtPlusPlus/core/util/reflect/ReflectionUtils.java index e0634dfb14..92804d72ec 100644 --- a/src/Java/gtPlusPlus/core/util/reflect/ReflectionUtils.java +++ b/src/main/java/gtPlusPlus/core/util/reflect/ReflectionUtils.java @@ -432,6 +432,18 @@ public class ReflectionUtils { t.printStackTrace(); } } + + /** + * Allows to change the state of an immutable instance. Huh?!? + */ + public static void setFinalFieldValue(Class<?> clazz, Field field, Object newValue) { + try { + setFieldValue_Internal(clazz, field, newValue); + } + catch (Throwable t) { + t.printStackTrace(); + } + } @Deprecated public static void setFinalStatic(Field field, Object newValue) throws Exception { @@ -1048,13 +1060,13 @@ public class ReflectionUtils { return false; } - public static Object getFieldValue(Field field) { + public static <T> T getFieldValue(Field field) { return getFieldValue(field, null); } - public static Object getFieldValue(Field field, Object instance) { + public static <T> T getFieldValue(Field field, Object instance) { try { - return field.get(instance); + return (T) field.get(instance); } catch (IllegalArgumentException | IllegalAccessException e) { } return null; diff --git a/src/Java/gtPlusPlus/core/util/sys/KeyboardUtils.java b/src/main/java/gtPlusPlus/core/util/sys/KeyboardUtils.java index ea87677ee2..ea87677ee2 100644 --- a/src/Java/gtPlusPlus/core/util/sys/KeyboardUtils.java +++ b/src/main/java/gtPlusPlus/core/util/sys/KeyboardUtils.java diff --git a/src/Java/gtPlusPlus/core/util/sys/Log.java b/src/main/java/gtPlusPlus/core/util/sys/Log.java index fcd4f34c1b..fcd4f34c1b 100644 --- a/src/Java/gtPlusPlus/core/util/sys/Log.java +++ b/src/main/java/gtPlusPlus/core/util/sys/Log.java diff --git a/src/Java/gtPlusPlus/core/util/sys/SystemUtils.java b/src/main/java/gtPlusPlus/core/util/sys/SystemUtils.java index 2788ba688e..2788ba688e 100644 --- a/src/Java/gtPlusPlus/core/util/sys/SystemUtils.java +++ b/src/main/java/gtPlusPlus/core/util/sys/SystemUtils.java diff --git a/src/Java/gtPlusPlus/core/world/damage/BaseCustomDamageSource.java b/src/main/java/gtPlusPlus/core/world/damage/BaseCustomDamageSource.java index 3778beacfb..3778beacfb 100644 --- a/src/Java/gtPlusPlus/core/world/damage/BaseCustomDamageSource.java +++ b/src/main/java/gtPlusPlus/core/world/damage/BaseCustomDamageSource.java diff --git a/src/Java/gtPlusPlus/core/world/explosions/ExplosionHandler.java b/src/main/java/gtPlusPlus/core/world/explosions/ExplosionHandler.java index 8d96aa2ff1..8d96aa2ff1 100644 --- a/src/Java/gtPlusPlus/core/world/explosions/ExplosionHandler.java +++ b/src/main/java/gtPlusPlus/core/world/explosions/ExplosionHandler.java diff --git a/src/Java/gtPlusPlus/core/world/explosions/MiningExplosion.java b/src/main/java/gtPlusPlus/core/world/explosions/MiningExplosion.java index 792e47085e..792e47085e 100644 --- a/src/Java/gtPlusPlus/core/world/explosions/MiningExplosion.java +++ b/src/main/java/gtPlusPlus/core/world/explosions/MiningExplosion.java diff --git a/src/Java/gtPlusPlus/everglades/GTplusplus_Everglades.java b/src/main/java/gtPlusPlus/everglades/GTplusplus_Everglades.java index 0709f0b1ff..ef8aa080c2 100644 --- a/src/Java/gtPlusPlus/everglades/GTplusplus_Everglades.java +++ b/src/main/java/gtPlusPlus/everglades/GTplusplus_Everglades.java @@ -126,36 +126,6 @@ public class GTplusplus_Everglades implements ActionListener { if (LoadedMods.Big_Reactors) { MaterialGenerator.generateOreMaterial(ELEMENT.getInstance().YELLORIUM, false, false, true, new short[] {255, 242, 10}); } - - if (!CORE.GTNH) { - MaterialGenerator.generateOreMaterial( - ELEMENT.getInstance().TRINIUM, - true, - false, - false, - ELEMENT.getInstance().TRINIUM_REFINED.getRGBA()); - } - - - - /* - * OSRS Materials - */ - - MaterialGenerator.generateOreMaterial( - ELEMENT.STANDALONE.GRANITE, - true, - false, - false, - ELEMENT.STANDALONE.GRANITE.getRGBA()); - MaterialGenerator.generateOreMaterial( - ELEMENT.STANDALONE.RUNITE, - true, - false, - false, - ELEMENT.STANDALONE.RUNITE.getRGBA()); - - } diff --git a/src/Java/gtPlusPlus/everglades/biome/BiomeGenerator_Custom.java b/src/main/java/gtPlusPlus/everglades/biome/BiomeGenerator_Custom.java index 0f8acd75b4..0f8acd75b4 100644 --- a/src/Java/gtPlusPlus/everglades/biome/BiomeGenerator_Custom.java +++ b/src/main/java/gtPlusPlus/everglades/biome/BiomeGenerator_Custom.java diff --git a/src/Java/gtPlusPlus/everglades/biome/Biome_Everglades.java b/src/main/java/gtPlusPlus/everglades/biome/Biome_Everglades.java index aadbfeb495..b31f6d034e 100644 --- a/src/Java/gtPlusPlus/everglades/biome/Biome_Everglades.java +++ b/src/main/java/gtPlusPlus/everglades/biome/Biome_Everglades.java @@ -61,7 +61,7 @@ public class Biome_Everglades { @SuppressWarnings("unchecked") public BiomeGenEverglades() { super(CORE.EVERGLADESBIOME_ID); - this.setBiomeID(); + //this.setBiomeID(); this.theBiomeDecorator = new BiomeGenerator_Custom(); this.theBiomeDecorator.treesPerChunk = 10; //Logger.INFO("Dark World Temperature Category: "+getTempCategory()); @@ -93,27 +93,31 @@ public class Biome_Everglades { } private synchronized boolean setBiomeID() { - BiomeGenBase[] mTempList; try { Field mInternalBiomeList = ReflectionUtils.getField(BiomeGenBase.class, "biomeList"); Field mClone = mInternalBiomeList; - mTempList = (BiomeGenBase[]) mInternalBiomeList.get(null); + BiomeGenBase[] mOriginalList = (BiomeGenBase[]) mInternalBiomeList.get(null); + BiomeGenBase[] mTempList = new BiomeGenBase[mOriginalList.length]; + for (int index=0;index<mTempList.length;index++) { + mTempList[index] = mOriginalList[index]; + } if (mTempList != null){ - mTempList[CORE.EVERGLADESBIOME_ID] = this; + mTempList[CORE.AUSTRALIA_BIOME_DESERT_1_ID] = this; mInternalBiomeList.set(null, mTempList); if (mTempList != mInternalBiomeList.get(null)){ - ReflectionUtils.setFinalStatic(mInternalBiomeList, mTempList); - Logger.REFLECTION("Set Biome ID for Dark World Biome internally in 'biomeList' field from "+BiomeGenBase.class.getCanonicalName()+"."); + ReflectionUtils.setFinalFieldValue(BiomeGenBase.class, mInternalBiomeList, mTempList); + Logger.REFLECTION("Set Biome ID for "+this.biomeName+" Biome internally in 'biomeList' field from "+BiomeGenBase.class.getCanonicalName()+"."); return true; } else { - Logger.REFLECTION("Failed to set Biome ID for Dark World Biome internally in 'biomeList' field from "+BiomeGenBase.class.getCanonicalName()+"."); + Logger.REFLECTION("Failed to set Biome ID for "+this.biomeName+" Biome internally in 'biomeList' field from "+BiomeGenBase.class.getCanonicalName()+"."); } } return false; } catch (Exception e) { Logger.REFLECTION("Could not access 'biomeList' field in "+BiomeGenBase.class.getCanonicalName()+"."); + e.printStackTrace(); return false; } } diff --git a/src/Java/gtPlusPlus/everglades/biome/GenLayerBiomes.java b/src/main/java/gtPlusPlus/everglades/biome/GenLayerBiomes.java index b69a8ea555..b69a8ea555 100644 --- a/src/Java/gtPlusPlus/everglades/biome/GenLayerBiomes.java +++ b/src/main/java/gtPlusPlus/everglades/biome/GenLayerBiomes.java diff --git a/src/Java/gtPlusPlus/everglades/biome/GenLayerEverglades.java b/src/main/java/gtPlusPlus/everglades/biome/GenLayerEverglades.java index 8034921dce..8034921dce 100644 --- a/src/Java/gtPlusPlus/everglades/biome/GenLayerEverglades.java +++ b/src/main/java/gtPlusPlus/everglades/biome/GenLayerEverglades.java diff --git a/src/Java/gtPlusPlus/everglades/block/BlockDarkWorldGround.java b/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldGround.java index f68c97b3c5..f68c97b3c5 100644 --- a/src/Java/gtPlusPlus/everglades/block/BlockDarkWorldGround.java +++ b/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldGround.java diff --git a/src/Java/gtPlusPlus/everglades/block/BlockDarkWorldPollutedDirt.java b/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldPollutedDirt.java index a1fcc588b5..a1fcc588b5 100644 --- a/src/Java/gtPlusPlus/everglades/block/BlockDarkWorldPollutedDirt.java +++ b/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldPollutedDirt.java diff --git a/src/Java/gtPlusPlus/everglades/block/BlockDarkWorldPortalFrame.java b/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldPortalFrame.java index 09dea46ab1..09dea46ab1 100644 --- a/src/Java/gtPlusPlus/everglades/block/BlockDarkWorldPortalFrame.java +++ b/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldPortalFrame.java diff --git a/src/Java/gtPlusPlus/everglades/block/BlockDarkWorldSludgeFluid.java b/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldSludgeFluid.java index 3c0445c86d..3c0445c86d 100644 --- a/src/Java/gtPlusPlus/everglades/block/BlockDarkWorldSludgeFluid.java +++ b/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldSludgeFluid.java diff --git a/src/Java/gtPlusPlus/everglades/block/BlockEvergladesPortal.java b/src/main/java/gtPlusPlus/everglades/block/BlockEvergladesPortal.java index e64968888d..e64968888d 100644 --- a/src/Java/gtPlusPlus/everglades/block/BlockEvergladesPortal.java +++ b/src/main/java/gtPlusPlus/everglades/block/BlockEvergladesPortal.java diff --git a/src/Java/gtPlusPlus/everglades/block/DarkWorldContentLoader.java b/src/main/java/gtPlusPlus/everglades/block/DarkWorldContentLoader.java index 9d0e425e3a..9d0e425e3a 100644 --- a/src/Java/gtPlusPlus/everglades/block/DarkWorldContentLoader.java +++ b/src/main/java/gtPlusPlus/everglades/block/DarkWorldContentLoader.java diff --git a/src/Java/gtPlusPlus/everglades/chunk/ChunkProviderModded.java b/src/main/java/gtPlusPlus/everglades/chunk/ChunkProviderModded.java index 0ff265a4ae..0ff265a4ae 100644 --- a/src/Java/gtPlusPlus/everglades/chunk/ChunkProviderModded.java +++ b/src/main/java/gtPlusPlus/everglades/chunk/ChunkProviderModded.java diff --git a/src/Java/gtPlusPlus/everglades/dimension/Dimension_Everglades.java b/src/main/java/gtPlusPlus/everglades/dimension/Dimension_Everglades.java index 33b36a9ae0..33b36a9ae0 100644 --- a/src/Java/gtPlusPlus/everglades/dimension/Dimension_Everglades.java +++ b/src/main/java/gtPlusPlus/everglades/dimension/Dimension_Everglades.java diff --git a/src/Java/gtPlusPlus/everglades/gen/WorldGenDeadLilly.java b/src/main/java/gtPlusPlus/everglades/gen/WorldGenDeadLilly.java index 0314f71eec..0314f71eec 100644 --- a/src/Java/gtPlusPlus/everglades/gen/WorldGenDeadLilly.java +++ b/src/main/java/gtPlusPlus/everglades/gen/WorldGenDeadLilly.java diff --git a/src/Java/gtPlusPlus/everglades/gen/WorldGenMinable_Custom.java b/src/main/java/gtPlusPlus/everglades/gen/WorldGenMinable_Custom.java index 303f7353f0..303f7353f0 100644 --- a/src/Java/gtPlusPlus/everglades/gen/WorldGenMinable_Custom.java +++ b/src/main/java/gtPlusPlus/everglades/gen/WorldGenMinable_Custom.java diff --git a/src/Java/gtPlusPlus/everglades/gen/gt/WorldGen_GT.java b/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT.java index 2035cfe096..2035cfe096 100644 --- a/src/Java/gtPlusPlus/everglades/gen/gt/WorldGen_GT.java +++ b/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT.java diff --git a/src/Java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Base.java b/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Base.java index f1d62cf58e..f1d62cf58e 100644 --- a/src/Java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Base.java +++ b/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Base.java diff --git a/src/Java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Ore_Layer.java b/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Ore_Layer.java index 140098ee06..140098ee06 100644 --- a/src/Java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Ore_Layer.java +++ b/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Ore_Layer.java diff --git a/src/Java/gtPlusPlus/everglades/gen/gt/WorldGen_Ores.java b/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_Ores.java index 0715f86e01..0715f86e01 100644 --- a/src/Java/gtPlusPlus/everglades/gen/gt/WorldGen_Ores.java +++ b/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_Ores.java diff --git a/src/Java/gtPlusPlus/everglades/item/ItemBlockToxicEverglades.java b/src/main/java/gtPlusPlus/everglades/item/ItemBlockToxicEverglades.java index ce4182c598..ce4182c598 100644 --- a/src/Java/gtPlusPlus/everglades/item/ItemBlockToxicEverglades.java +++ b/src/main/java/gtPlusPlus/everglades/item/ItemBlockToxicEverglades.java diff --git a/src/Java/gtPlusPlus/everglades/item/ItemEvergladesPortalTrigger.java b/src/main/java/gtPlusPlus/everglades/item/ItemEvergladesPortalTrigger.java index 3119de19b9..3119de19b9 100644 --- a/src/Java/gtPlusPlus/everglades/item/ItemEvergladesPortalTrigger.java +++ b/src/main/java/gtPlusPlus/everglades/item/ItemEvergladesPortalTrigger.java diff --git a/src/Java/gtPlusPlus/everglades/object/BoxedQuad.java b/src/main/java/gtPlusPlus/everglades/object/BoxedQuad.java index d0fbc4247b..d0fbc4247b 100644 --- a/src/Java/gtPlusPlus/everglades/object/BoxedQuad.java +++ b/src/main/java/gtPlusPlus/everglades/object/BoxedQuad.java diff --git a/src/Java/gtPlusPlus/everglades/world/CustomWorldType.java b/src/main/java/gtPlusPlus/everglades/world/CustomWorldType.java index 5a5344ca65..5a5344ca65 100644 --- a/src/Java/gtPlusPlus/everglades/world/CustomWorldType.java +++ b/src/main/java/gtPlusPlus/everglades/world/CustomWorldType.java diff --git a/src/Java/gtPlusPlus/everglades/world/EvergladesPortalPosition.java b/src/main/java/gtPlusPlus/everglades/world/EvergladesPortalPosition.java index 227d32502b..227d32502b 100644 --- a/src/Java/gtPlusPlus/everglades/world/EvergladesPortalPosition.java +++ b/src/main/java/gtPlusPlus/everglades/world/EvergladesPortalPosition.java diff --git a/src/Java/gtPlusPlus/everglades/world/TeleporterDimensionMod.java b/src/main/java/gtPlusPlus/everglades/world/TeleporterDimensionMod.java index e67a882638..e67a882638 100644 --- a/src/Java/gtPlusPlus/everglades/world/TeleporterDimensionMod.java +++ b/src/main/java/gtPlusPlus/everglades/world/TeleporterDimensionMod.java diff --git a/src/Java/gtPlusPlus/everglades/world/WorldChunkManagerCustom.java b/src/main/java/gtPlusPlus/everglades/world/WorldChunkManagerCustom.java index fc1b2ac425..fc1b2ac425 100644 --- a/src/Java/gtPlusPlus/everglades/world/WorldChunkManagerCustom.java +++ b/src/main/java/gtPlusPlus/everglades/world/WorldChunkManagerCustom.java diff --git a/src/Java/gtPlusPlus/everglades/world/WorldProviderMod.java b/src/main/java/gtPlusPlus/everglades/world/WorldProviderMod.java index b5945bcd21..b5945bcd21 100644 --- a/src/Java/gtPlusPlus/everglades/world/WorldProviderMod.java +++ b/src/main/java/gtPlusPlus/everglades/world/WorldProviderMod.java diff --git a/src/Java/gtPlusPlus/nei/DecayableRecipeHandler.java b/src/main/java/gtPlusPlus/nei/DecayableRecipeHandler.java index ce2062d12c..ce2062d12c 100644 --- a/src/Java/gtPlusPlus/nei/DecayableRecipeHandler.java +++ b/src/main/java/gtPlusPlus/nei/DecayableRecipeHandler.java diff --git a/src/main/java/gtPlusPlus/nei/GTPP_NEI_DefaultHandler.java b/src/main/java/gtPlusPlus/nei/GTPP_NEI_DefaultHandler.java new file mode 100644 index 0000000000..b0849048d3 --- /dev/null +++ b/src/main/java/gtPlusPlus/nei/GTPP_NEI_DefaultHandler.java @@ -0,0 +1,943 @@ +package gtPlusPlus.nei; + +import java.awt.Point; +import java.awt.Rectangle; +import java.lang.ref.SoftReference; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.stream.Collectors; + +import org.lwjgl.opengl.GL11; + +import codechicken.lib.gui.GuiDraw; +import codechicken.nei.PositionedStack; +import codechicken.nei.guihook.GuiContainerManager; +import codechicken.nei.guihook.IContainerInputHandler; +import codechicken.nei.guihook.IContainerTooltipHandler; +import codechicken.nei.recipe.GuiCraftingRecipe; +import codechicken.nei.recipe.GuiRecipe; +import codechicken.nei.recipe.GuiUsageRecipe; +import codechicken.nei.recipe.TemplateRecipeHandler; +import cpw.mods.fml.common.event.FMLInterModComms; +import gregtech.api.enums.GT_Values; +import gregtech.api.enums.OrePrefixes; +import gregtech.api.gui.GT_GUIContainer_BasicMachine; +import gregtech.api.objects.ItemData; +import gregtech.api.util.GT_LanguageManager; +import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.util.GT_Recipe; +import gregtech.api.util.GT_Recipe.GT_Recipe_Map; +import gregtech.api.util.GT_Utility; +import gtPlusPlus.api.objects.Logger; +import gtPlusPlus.api.objects.data.Pair; +import gtPlusPlus.core.util.math.MathUtils; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; + +public class GTPP_NEI_DefaultHandler extends TemplateRecipeHandler { + + public static final int sOffsetX = 5; + public static final int sOffsetY = 11; + private SoftReference<List<CachedDefaultRecipe>> mCachedRecipes = null; + + private static final HashMap<Integer, Pair<Integer, Integer>> mInputSlotMap = new HashMap<Integer, Pair<Integer, Integer>>(); + private static final HashMap<Integer, Pair<Integer, Integer>> mOutputSlotMap = new HashMap<Integer, Pair<Integer, Integer>>(); + + static { + GuiContainerManager.addInputHandler(new GT_RectHandler()); + GuiContainerManager.addTooltipHandler(new GT_RectHandler()); + int[] aSlotX = new int[] {12, 30, 48}; + int[] aSlotY = new int[] {5, 23, 41, 64}; + // Input slots + int aIndex = 0; + for (int y=0; y<aSlotY.length;y++) { + for (int x=0; x<aSlotX.length;x++) { + mInputSlotMap.put(aIndex++, new Pair<Integer, Integer>(aSlotX[x], aSlotY[y])); + } + } + // Output slots + aSlotX = new int[] {102, 120, 138}; + aIndex = 0; + for (int y=0; y<aSlotY.length;y++) { + for (int x=0; x<aSlotX.length;x++) { + mOutputSlotMap.put(aIndex++, new Pair<Integer, Integer>(aSlotX[x], aSlotY[y])); + } + } + } + + protected final GT_Recipe_Map mRecipeMap; + + public GTPP_NEI_DefaultHandler(final GT_Recipe_Map tMap) { + this.mRecipeMap = tMap; + this.transferRects.add(new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(65, 13, 36, 18), this.getOverlayIdentifier(), new Object[0])); + if (!NEI_GT_Config.sIsAdded) { + FMLInterModComms.sendRuntimeMessage(GT_Values.GT, "NEIPlugins", "register-crafting-handler", "gregtechplusplus@" + this.getRecipeName() + "@" + this.getOverlayIdentifier()); + GuiCraftingRecipe.craftinghandlers.add(this); + GuiUsageRecipe.usagehandlers.add(this); + } + } + + public static void drawText(final int aX, final int aY, final String aString, final int aColor) { + Minecraft.getMinecraft().fontRenderer.drawString(aString, aX, aY, aColor); + } + + @Override + public TemplateRecipeHandler newInstance() { + return new GTPP_NEI_DefaultHandler(this.mRecipeMap); + } + + + public List<GT_Recipe> getSortedRecipes() { + List<GT_Recipe> result = new ArrayList<>(this.mRecipeMap.mRecipeList); + Collections.sort(result); + return result; + } + + public List<CachedDefaultRecipe> getCache() { + List<CachedDefaultRecipe> cache; + if (mCachedRecipes == null || (cache = mCachedRecipes.get()) == null) { + cache = mRecipeMap.mRecipeList.stream() // do not use parallel stream. This is already parallelized by NEI + .filter(r -> !r.mHidden) + .sorted() + .map(temp -> {return createCachedRecipe(temp);}) + .collect(Collectors.toList()); + // while the NEI parallelize handlers, for each individual handler it still uses sequential execution model + // so we do not need any synchronization here + mCachedRecipes = new SoftReference<>(cache); + } + return cache; + } + + public CachedDefaultRecipe createCachedRecipe(GT_Recipe aRecipe) { + return new CachedDefaultRecipe(aRecipe); + } + + public void loadCraftingRecipes(String outputId, Object... results) { + if (outputId.equals(getOverlayIdentifier())) { + arecipes.addAll(getCache()); + } else { + super.loadCraftingRecipes(outputId, results); + } + } + + public void loadCraftingRecipes(ItemStack aResult) { + ItemData tPrefixMaterial = GT_OreDictUnificator.getAssociation(aResult); + + ArrayList<ItemStack> tResults = new ArrayList<>(); + tResults.add(aResult); + tResults.add(GT_OreDictUnificator.get(true, aResult)); + if ((tPrefixMaterial != null) && (!tPrefixMaterial.mBlackListed) && (!tPrefixMaterial.mPrefix.mFamiliarPrefixes.isEmpty())) { + for (OrePrefixes tPrefix : tPrefixMaterial.mPrefix.mFamiliarPrefixes) { + tResults.add(GT_OreDictUnificator.get(tPrefix, tPrefixMaterial.mMaterial.mMaterial, 1L)); + } + } + FluidStack tFluid = GT_Utility.getFluidForFilledItem(aResult, true); + FluidStack tFluidStack; + if (tFluid != null) { + tFluidStack = tFluid; + tResults.add(GT_Utility.getFluidDisplayStack(tFluid, false)); + } + else tFluidStack = GT_Utility.getFluidFromDisplayStack(aResult); + if (tFluidStack != null) { + tResults.addAll(GT_Utility.getContainersFromFluid(tFluidStack)); + } + for (CachedDefaultRecipe recipe : getCache()) { + if (tResults.stream().anyMatch(stack -> recipe.contains(recipe.mOutputs, stack))) + arecipes.add(recipe); + } + } + + public void loadUsageRecipes(ItemStack aInput) { + ItemData tPrefixMaterial = GT_OreDictUnificator.getAssociation(aInput); + + ArrayList<ItemStack> tInputs = new ArrayList<>(); + tInputs.add(aInput); + tInputs.add(GT_OreDictUnificator.get(false, aInput)); + if ((tPrefixMaterial != null) && (!tPrefixMaterial.mPrefix.mFamiliarPrefixes.isEmpty())) { + for (OrePrefixes tPrefix : tPrefixMaterial.mPrefix.mFamiliarPrefixes) { + tInputs.add(GT_OreDictUnificator.get(tPrefix, tPrefixMaterial.mMaterial.mMaterial, 1L)); + } + } + FluidStack tFluid = GT_Utility.getFluidForFilledItem(aInput, true); + FluidStack tFluidStack; + if (tFluid != null) { + tFluidStack = tFluid; + tInputs.add(GT_Utility.getFluidDisplayStack(tFluid, false)); + } + else tFluidStack = GT_Utility.getFluidFromDisplayStack(aInput); + if (tFluidStack != null) { + tInputs.addAll(GT_Utility.getContainersFromFluid(tFluidStack)); + } + for (CachedDefaultRecipe recipe : getCache()) { + if (tInputs.stream().anyMatch(stack -> recipe.contains(recipe.mInputs, stack))) + arecipes.add(recipe); + } + } + + @Override + public String getOverlayIdentifier() { + return this.mRecipeMap.mNEIName; + } + + @Override + public void drawBackground(final int recipe) { + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GuiDraw.changeTexture(this.getGuiTexture()); + GuiDraw.drawTexturedModalRect(-4, -8, 1, 3, 174, 78); + } + + @Override + public int recipiesPerPage() { + return 1; + } + + @Override + public String getRecipeName() { + return GT_LanguageManager.getTranslation(this.mRecipeMap.mUnlocalizedName); + } + + @Override + public String getGuiTexture() { + return this.mRecipeMap.mNEIGUIPath; + } + + @Override + public List<String> handleItemTooltip(final GuiRecipe gui, final ItemStack aStack, final List<String> currenttip, final int aRecipeIndex) { + final TemplateRecipeHandler.CachedRecipe tObject = this.arecipes.get(aRecipeIndex); + if ((tObject instanceof CachedDefaultRecipe)) { + final CachedDefaultRecipe tRecipe = (CachedDefaultRecipe) tObject; + for (final PositionedStack tStack : tRecipe.mOutputs) { + if (aStack == tStack.item) { + if ((!(tStack instanceof FixedPositionedStack)) || (((FixedPositionedStack) tStack).mChance <= 0) || (((FixedPositionedStack) tStack).mChance == 10000)) { + break; + } + currenttip.add("Chance: " + (((FixedPositionedStack) tStack).mChance / 100) + "." + ((((FixedPositionedStack) tStack).mChance % 100) < 10 ? "0" + (((FixedPositionedStack) tStack).mChance % 100) : Integer.valueOf(((FixedPositionedStack) tStack).mChance % 100)) + "%"); + break; + } + } + for (final PositionedStack tStack : tRecipe.mInputs) { + if (aStack == tStack.item) { + if ((gregtech.api.enums.ItemList.Display_Fluid.isStackEqual(tStack.item, true, true)) || + (tStack.item.stackSize != 0)) { + break; + } + currenttip.add("Does not get consumed in the process"); + break; + } + } + } + return currenttip; + } + + @Override + public void drawExtras(final int aRecipeIndex) { + final long tEUt = ((CachedDefaultRecipe) this.arecipes.get(aRecipeIndex)).mRecipe.mEUt; + final long tDuration = ((CachedDefaultRecipe) this.arecipes.get(aRecipeIndex)).mRecipe.mDuration; + if (tEUt != 0) { + drawText(10, 73, "Total: " + MathUtils.formatNumbers((long) (tDuration * tEUt)) + " EU", -16777216); + drawText(10, 83, "Usage: " + MathUtils.formatNumbers(tEUt) + " EU/t", -16777216); + if (this.mRecipeMap.mShowVoltageAmperageInNEI) { + drawText(10, 93, "Voltage: " + MathUtils.formatNumbers(tEUt / this.mRecipeMap.mAmperage) + " EU", -16777216); + drawText(10, 103, "Amperage: " + this.mRecipeMap.mAmperage, -16777216); + } else { + drawText(10, 93, "Voltage: unspecified", -16777216); + drawText(10, 103, "Amperage: unspecified", -16777216); + } + } + if (tDuration > 0) { + drawText(10, 113, "Time: " + (tDuration < 20 ? "< 1" : MathUtils.formatNumbers(Long.valueOf(tDuration / 20))) + " secs", -16777216); + } + if ((GT_Utility.isStringValid(this.mRecipeMap.mNEISpecialValuePre)) || (GT_Utility.isStringValid(this.mRecipeMap.mNEISpecialValuePost))) { + drawText(10, 123, this.mRecipeMap.mNEISpecialValuePre + (((CachedDefaultRecipe) this.arecipes.get(aRecipeIndex)).mRecipe.mSpecialValue * this.mRecipeMap.mNEISpecialValueMultiplier) + this.mRecipeMap.mNEISpecialValuePost, -16777216); + } + } + + public static class GT_RectHandler + implements IContainerInputHandler, IContainerTooltipHandler { + @Override + public boolean mouseClicked(final GuiContainer gui, final int mousex, final int mousey, final int button) { + if (this.canHandle(gui)) { + if (button == 0) { + return this.transferRect(gui, false); + } + if (button == 1) { + return this.transferRect(gui, true); + } + } + return false; + } + + @Override + public boolean lastKeyTyped(final GuiContainer gui, final char keyChar, final int keyCode) { + return false; + } + + public boolean canHandle(final GuiContainer gui) { + return (((gui instanceof GT_GUIContainer_BasicMachine)) && (GT_Utility.isStringValid(((GT_GUIContainer_BasicMachine) gui).mNEI))); + } + + @Override + public List<String> handleTooltip(final GuiContainer gui, final int mousex, final int mousey, final List<String> currenttip) { + if ((this.canHandle(gui)) && (currenttip.isEmpty())) { + if ((gui instanceof GT_GUIContainer_BasicMachine) && new Rectangle(65, 13, 36, 18).contains(new Point(GuiDraw.getMousePosition().x - ((GT_GUIContainer_BasicMachine) gui).getLeft() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[0], GuiDraw.getMousePosition().y - ((GT_GUIContainer_BasicMachine) gui).getTop() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[1]))) { + currenttip.add("Recipes"); + } + } + return currenttip; + } + + private boolean transferRect(final GuiContainer gui, final boolean usage) { + if (gui instanceof GT_GUIContainer_BasicMachine) { + return (this.canHandle(gui)) && (new Rectangle(65, 13, 36, 18).contains(new Point(GuiDraw.getMousePosition().x - ((GT_GUIContainer_BasicMachine) gui).getLeft() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[0], GuiDraw.getMousePosition().y - ((GT_GUIContainer_BasicMachine) gui).getTop() - codechicken.nei.recipe.RecipeInfo.getGuiOffset(gui)[1]))) && (usage ? GuiUsageRecipe.openRecipeGui(((GT_GUIContainer_BasicMachine) gui).mNEI, new Object[0]) : GuiCraftingRecipe.openRecipeGui(((GT_GUIContainer_BasicMachine) gui).mNEI, new Object[0])); + } + return false; + } + + @Override + public List<String> handleItemDisplayName(final GuiContainer gui, final ItemStack itemstack, final List<String> currenttip) { + return currenttip; + } + + @Override + public List<String> handleItemTooltip(final GuiContainer gui, final ItemStack itemstack, final int mousex, final int mousey, final List<String> currenttip) { + return currenttip; + } + + @Override + public boolean keyTyped(final GuiContainer gui, final char keyChar, final int keyCode) { + return false; + } + + @Override + public void onKeyTyped(final GuiContainer gui, final char keyChar, final int keyID) { + } + + @Override + public void onMouseClicked(final GuiContainer gui, final int mousex, final int mousey, final int button) { + } + + @Override + public void onMouseUp(final GuiContainer gui, final int mousex, final int mousey, final int button) { + } + + @Override + public boolean mouseScrolled(final GuiContainer gui, final int mousex, final int mousey, final int scrolled) { + return false; + } + + @Override + public void onMouseScrolled(final GuiContainer gui, final int mousex, final int mousey, final int scrolled) { + } + + @Override + public void onMouseDragged(final GuiContainer gui, final int mousex, final int mousey, final int button, final long heldTime) { + } + } + + public class FixedPositionedStack + extends PositionedStack { + public final int mChance; + public boolean permutated = false; + + public FixedPositionedStack(final Object object, final int x, final int y) { + this(object, x, y, 0); + } + + public FixedPositionedStack(final Object object, final int x, final int y, final int aChance) { + super(object, x, y, true); + this.mChance = aChance; + } + + @Override + public void generatePermutations() { + if (this.permutated) { + return; + } + final ArrayList<ItemStack> tDisplayStacks = new ArrayList<ItemStack>(); + for (final ItemStack tStack : this.items) { + if (GT_Utility.isStackValid(tStack)) { + if (tStack.getItemDamage() == 32767) { + final List<ItemStack> permutations = codechicken.nei.ItemList.itemMap.get(tStack.getItem()); + if (!permutations.isEmpty()) { + ItemStack stack; + for (final Iterator<ItemStack> i$ = permutations.iterator(); i$.hasNext(); tDisplayStacks.add(GT_Utility.copyAmount(tStack.stackSize, new Object[]{stack}))) { + stack = i$.next(); + } + } else { + final ItemStack base = new ItemStack(tStack.getItem(), tStack.stackSize); + base.stackTagCompound = tStack.stackTagCompound; + tDisplayStacks.add(base); + } + } else { + tDisplayStacks.add(GT_Utility.copy(new Object[]{tStack})); + } + } + } + this.items = (tDisplayStacks.toArray(new ItemStack[0])); + if (this.items.length == 0) { + this.items = new ItemStack[]{new ItemStack(Blocks.fire)}; + } + this.permutated = true; + this.setPermutationToRender(0); + } + } + + public class CachedDefaultRecipe extends TemplateRecipeHandler.CachedRecipe { + public final GT_Recipe mRecipe; + public final List<PositionedStack> mOutputs = new ArrayList<PositionedStack>(); + public final List<PositionedStack> mInputs = new ArrayList<PositionedStack>(); + + public CachedDefaultRecipe(final GT_Recipe aRecipe) { + super(); + this.mRecipe = aRecipe; + handleSlots(); + } + + public void handleSlots() { + int tStartIndex = 0; + switch (GTPP_NEI_DefaultHandler.this.mRecipeMap.mUsualInputCount) { + case 0: + break; + case 1: + if (mRecipe.getRepresentativeInput(tStartIndex) != null) { + this.mInputs.add(new FixedPositionedStack(mRecipe.getRepresentativeInput(tStartIndex), 48, 14)); + } + tStartIndex++; + break; + case 2: + if (mRecipe.getRepresentativeInput(tStartIndex) != null) { + this.mInputs.add(new FixedPositionedStack(mRecipe.getRepresentativeInput(tStartIndex), 30, 14)); + } + tStartIndex++; + if (mRecipe.getRepresentativeInput(tStartIndex) != null) { + this.mInputs.add(new FixedPositionedStack(mRecipe.getRepresentativeInput(tStartIndex), 48, 14)); + } + tStartIndex++; + break; + case 3: + if (mRecipe.getRepresentativeInput(tStartIndex) != null) { + this.mInputs.add(new FixedPositionedStack(mRecipe.getRepresentativeInput(tStartIndex), 12, 14)); + } + tStartIndex++; + if (mRecipe.getRepresentativeInput(tStartIndex) != null) { + this.mInputs.add(new FixedPositionedStack(mRecipe.getRepresentativeInput(tStartIndex), 30, 14)); + } + tStartIndex++; + if (mRecipe.getRepresentativeInput(tStartIndex) != null) { + this.mInputs.add(new FixedPositionedStack(mRecipe.getRepresentativeInput(tStartIndex), 48, 14)); + } + tStartIndex++; + break; + case 4: + if (mRecipe.getRepresentativeInput(tStartIndex) != null) { + this.mInputs.add(new FixedPositionedStack(mRecipe.getRepresentativeInput(tStartIndex), 30, 5)); + } + tStartIndex++; + if (mRecipe.getRepresentativeInput(tStartIndex) != null) { + this.mInputs.add(new FixedPositionedStack(mRecipe.getRepresentativeInput(tStartIndex), 48, 5)); + } + tStartIndex++; + if (mRecipe.getRepresentativeInput(tStartIndex) != null) { + this.mInputs.add(new FixedPositionedStack(mRecipe.getRepresentativeInput(tStartIndex), 30, 23)); + } + tStartIndex++; + if (mRecipe.getRepresentativeInput(tStartIndex) != null) { + this.mInputs.add(new FixedPositionedStack(mRecipe.getRepresentativeInput(tStartIndex), 48, 23)); + } + tStartIndex++; + break; + case 5: + if (mRecipe.getRepresentativeInput(tStartIndex) != null) { + this.mInputs.add(new FixedPositionedStack(mRecipe.getRepresentativeInput(tStartIndex), 12, 5)); + } + tStartIndex++; + if (mRecipe.getRepresentativeInput(tStartIndex) != null) { + this.mInputs.add(new FixedPositionedStack(mRecipe.getRepresentativeInput(tStartIndex), 30, 5)); + } + tStartIndex++; + if (mRecipe.getRepresentativeInput(tStartIndex) != null) { + this.mInputs.add(new FixedPositionedStack(mRecipe.getRepresentativeInput(tStartIndex), 48, 5)); + } + tStartIndex++; + if (mRecipe.getRepresentativeInput(tStartIndex) != null) { + this.mInputs.add(new FixedPositionedStack(mRecipe.getRepresentativeInput(tStartIndex), 30, 23)); + } + tStartIndex++; + if (mRecipe.getRepresentativeInput(tStartIndex) != null) { + this.mInputs.add(new FixedPositionedStack(mRecipe.getRepresentativeInput(tStartIndex), 48, 23)); + } + tStartIndex++; + break; + case 6: + if (mRecipe.getRepresentativeInput(tStartIndex) != null) { + this.mInputs.add(new FixedPositionedStack(mRecipe.getRepresentativeInput(tStartIndex), 12, 5)); + } + tStartIndex++; + if (mRecipe.getRepresentativeInput(tStartIndex) != null) { + this.mInputs.add(new FixedPositionedStack(mRecipe.getRepresentativeInput(tStartIndex), 30, 5)); + } + tStartIndex++; + if (mRecipe.getRepresentativeInput(tStartIndex) != null) { + this.mInputs.add(new FixedPositionedStack(mRecipe.getRepresentativeInput(tStartIndex), 48, 5)); + } + tStartIndex++; + if (mRecipe.getRepresentativeInput(tStartIndex) != null) { + this.mInputs.add(new FixedPositionedStack(mRecipe.getRepresentativeInput(tStartIndex), 12, 23)); + } + tStartIndex++; + if (mRecipe.getRepresentativeInput(tStartIndex) != null) { + this.mInputs.add(new FixedPositionedStack(mRecipe.getRepresentativeInput(tStartIndex), 30, 23)); + } + tStartIndex++; + if (mRecipe.getRepresentativeInput(tStartIndex) != null) { + this.mInputs.add(new FixedPositionedStack(mRecipe.getRepresentativeInput(tStartIndex), 48, 23)); + } + tStartIndex++; + break; + case 7: + if (mRecipe.getRepresentativeInput(tStartIndex) != null) { + this.mInputs.add(new FixedPositionedStack(mRecipe.getRepresentativeInput(tStartIndex), 12, -4)); + } + tStartIndex++; + if (mRecipe.getRepresentativeInput(tStartIndex) != null) { + this.mInputs.add(new FixedPositionedStack(mRecipe.getRepresentativeInput(tStartIndex), 30, -4)); + } + tStartIndex++; + if (mRecipe.getRepresentativeInput(tStartIndex) != null) { + this.mInputs.add(new FixedPositionedStack(mRecipe.getRepresentativeInput(tStartIndex), 48, -4)); + } + tStartIndex++; + if (mRecipe.getRepresentativeInput(tStartIndex) != null) { + this.mInputs.add(new FixedPositionedStack(mRecipe.getRepresentativeInput(tStartIndex), 12, 14)); + } + tStartIndex++; + if (mRecipe.getRepresentativeInput(tStartIndex) != null) { + this.mInputs.add(new FixedPositionedStack(mRecipe.getRepresentativeInput(tStartIndex), 30, 14)); + } + tStartIndex++; + if (mRecipe.getRepresentativeInput(tStartIndex) != null) { + this.mInputs.add(new FixedPositionedStack(mRecipe.getRepresentativeInput(tStartIndex), 48, 14)); + } + tStartIndex++; + if (mRecipe.getRepresentativeInput(tStartIndex) != null) { + this.mInputs.add(new FixedPositionedStack(mRecipe.getRepresentativeInput(tStartIndex), 12, 32)); + } + tStartIndex++; + break; + case 8: + if (mRecipe.getRepresentativeInput(tStartIndex) != null) { + this.mInputs.add(new FixedPositionedStack(mRecipe.getRepresentativeInput(tStartIndex), 12, -4)); + } + tStartIndex++; + if (mRecipe.getRepresentativeInput(tStartIndex) != null) { + this.mInputs.add(new FixedPositionedStack(mRecipe.getRepresentativeInput(tStartIndex), 30, -4)); + } + tStartIndex++; + if (mRecipe.getRepresentativeInput(tStartIndex) != null) { + this.mInputs.add(new FixedPositionedStack(mRecipe.getRepresentativeInput(tStartIndex), 48, -4)); + } + tStartIndex++; + if (mRecipe.getRepresentativeInput(tStartIndex) != null) { + this.mInputs.add(new FixedPositionedStack(mRecipe.getRepresentativeInput(tStartIndex), 12, 14)); + } + tStartIndex++; + if (mRecipe.getRepresentativeInput(tStartIndex) != null) { + this.mInputs.add(new FixedPositionedStack(mRecipe.getRepresentativeInput(tStartIndex), 30, 14)); + } + tStartIndex++; + if (mRecipe.getRepresentativeInput(tStartIndex) != null) { + this.mInputs.add(new FixedPositionedStack(mRecipe.getRepresentativeInput(tStartIndex), 48, 14)); + } + tStartIndex++; + if (mRecipe.getRepresentativeInput(tStartIndex) != null) { + this.mInputs.add(new FixedPositionedStack(mRecipe.getRepresentativeInput(tStartIndex), 12, 32)); + } + tStartIndex++; + if (mRecipe.getRepresentativeInput(tStartIndex) != null) { + this.mInputs.add(new FixedPositionedStack(mRecipe.getRepresentativeInput(tStartIndex), 30, 32)); + } + tStartIndex++; + break; + default: + if (mRecipe.getRepresentativeInput(tStartIndex) != null) { + this.mInputs.add(new FixedPositionedStack(mRecipe.getRepresentativeInput(tStartIndex), 12, -4)); + } + tStartIndex++; + if (mRecipe.getRepresentativeInput(tStartIndex) != null) { + this.mInputs.add(new FixedPositionedStack(mRecipe.getRepresentativeInput(tStartIndex), 30, -4)); + } + tStartIndex++; + if (mRecipe.getRepresentativeInput(tStartIndex) != null) { + this.mInputs.add(new FixedPositionedStack(mRecipe.getRepresentativeInput(tStartIndex), 48, -4)); + } + tStartIndex++; + if (mRecipe.getRepresentativeInput(tStartIndex) != null) { + this.mInputs.add(new FixedPositionedStack(mRecipe.getRepresentativeInput(tStartIndex), 12, 14)); + } + tStartIndex++; + if (mRecipe.getRepresentativeInput(tStartIndex) != null) { + this.mInputs.add(new FixedPositionedStack(mRecipe.getRepresentativeInput(tStartIndex), 30, 14)); + } + tStartIndex++; + if (mRecipe.getRepresentativeInput(tStartIndex) != null) { + this.mInputs.add(new FixedPositionedStack(mRecipe.getRepresentativeInput(tStartIndex), 48, 14)); + } + tStartIndex++; + if (mRecipe.getRepresentativeInput(tStartIndex) != null) { + this.mInputs.add(new FixedPositionedStack(mRecipe.getRepresentativeInput(tStartIndex), 12, 32)); + } + tStartIndex++; + if (mRecipe.getRepresentativeInput(tStartIndex) != null) { + this.mInputs.add(new FixedPositionedStack(mRecipe.getRepresentativeInput(tStartIndex), 30, 32)); + } + tStartIndex++; + if (mRecipe.getRepresentativeInput(tStartIndex) != null) { + this.mInputs.add(new FixedPositionedStack(mRecipe.getRepresentativeInput(tStartIndex), 48, 32)); + } + tStartIndex++; + } + if (mRecipe.mSpecialItems != null) { + this.mInputs.add(new FixedPositionedStack(mRecipe.mSpecialItems, 120, 52)); + } + tStartIndex = 0; + switch (GTPP_NEI_DefaultHandler.this.mRecipeMap.mUsualOutputCount) { + case 0: + break; + case 1: + if (mRecipe.getOutput(tStartIndex) != null) { + this.mOutputs.add(new FixedPositionedStack(mRecipe.getOutput(tStartIndex), 102, 14, mRecipe.getOutputChance(tStartIndex))); + } + tStartIndex++; + break; + case 2: + if (mRecipe.getOutput(tStartIndex) != null) { + this.mOutputs.add(new FixedPositionedStack(mRecipe.getOutput(tStartIndex), 102, 14, mRecipe.getOutputChance(tStartIndex))); + } + tStartIndex++; + if (mRecipe.getOutput(tStartIndex) != null) { + this.mOutputs.add(new FixedPositionedStack(mRecipe.getOutput(tStartIndex), 120, 14, mRecipe.getOutputChance(tStartIndex))); + } + tStartIndex++; + break; + case 3: + if (mRecipe.getOutput(tStartIndex) != null) { + this.mOutputs.add(new FixedPositionedStack(mRecipe.getOutput(tStartIndex), 102, 14, mRecipe.getOutputChance(tStartIndex))); + } + tStartIndex++; + if (mRecipe.getOutput(tStartIndex) != null) { + this.mOutputs.add(new FixedPositionedStack(mRecipe.getOutput(tStartIndex), 120, 14, mRecipe.getOutputChance(tStartIndex))); + } + tStartIndex++; + if (mRecipe.getOutput(tStartIndex) != null) { + this.mOutputs.add(new FixedPositionedStack(mRecipe.getOutput(tStartIndex), 138, 14, mRecipe.getOutputChance(tStartIndex))); + } + tStartIndex++; + break; + case 4: + if (mRecipe.getOutput(tStartIndex) != null) { + this.mOutputs.add(new FixedPositionedStack(mRecipe.getOutput(tStartIndex), 102, 5, mRecipe.getOutputChance(tStartIndex))); + } + tStartIndex++; + if (mRecipe.getOutput(tStartIndex) != null) { + this.mOutputs.add(new FixedPositionedStack(mRecipe.getOutput(tStartIndex), 120, 5, mRecipe.getOutputChance(tStartIndex))); + } + tStartIndex++; + if (mRecipe.getOutput(tStartIndex) != null) { + this.mOutputs.add(new FixedPositionedStack(mRecipe.getOutput(tStartIndex), 102, 23, mRecipe.getOutputChance(tStartIndex))); + } + tStartIndex++; + if (mRecipe.getOutput(tStartIndex) != null) { + this.mOutputs.add(new FixedPositionedStack(mRecipe.getOutput(tStartIndex), 120, 23, mRecipe.getOutputChance(tStartIndex))); + } + tStartIndex++; + break; + case 5: + if (mRecipe.getOutput(tStartIndex) != null) { + this.mOutputs.add(new FixedPositionedStack(mRecipe.getOutput(tStartIndex), 102, 5, mRecipe.getOutputChance(tStartIndex))); + } + tStartIndex++; + if (mRecipe.getOutput(tStartIndex) != null) { + this.mOutputs.add(new FixedPositionedStack(mRecipe.getOutput(tStartIndex), 120, 5, mRecipe.getOutputChance(tStartIndex))); + } + tStartIndex++; + if (mRecipe.getOutput(tStartIndex) != null) { + this.mOutputs.add(new FixedPositionedStack(mRecipe.getOutput(tStartIndex), 138, 5, mRecipe.getOutputChance(tStartIndex))); + } + tStartIndex++; + if (mRecipe.getOutput(tStartIndex) != null) { + this.mOutputs.add(new FixedPositionedStack(mRecipe.getOutput(tStartIndex), 102, 23, mRecipe.getOutputChance(tStartIndex))); + } + tStartIndex++; + if (mRecipe.getOutput(tStartIndex) != null) { + this.mOutputs.add(new FixedPositionedStack(mRecipe.getOutput(tStartIndex), 120, 23, mRecipe.getOutputChance(tStartIndex))); + } + tStartIndex++; + break; + case 6: + if (mRecipe.getOutput(tStartIndex) != null) { + this.mOutputs.add(new FixedPositionedStack(mRecipe.getOutput(tStartIndex), 102, 5, mRecipe.getOutputChance(tStartIndex))); + } + tStartIndex++; + if (mRecipe.getOutput(tStartIndex) != null) { + this.mOutputs.add(new FixedPositionedStack(mRecipe.getOutput(tStartIndex), 120, 5, mRecipe.getOutputChance(tStartIndex))); + } + tStartIndex++; + if (mRecipe.getOutput(tStartIndex) != null) { + this.mOutputs.add(new FixedPositionedStack(mRecipe.getOutput(tStartIndex), 138, 5, mRecipe.getOutputChance(tStartIndex))); + } + tStartIndex++; + if (mRecipe.getOutput(tStartIndex) != null) { + this.mOutputs.add(new FixedPositionedStack(mRecipe.getOutput(tStartIndex), 102, 23, mRecipe.getOutputChance(tStartIndex))); + } + tStartIndex++; + if (mRecipe.getOutput(tStartIndex) != null) { + this.mOutputs.add(new FixedPositionedStack(mRecipe.getOutput(tStartIndex), 120, 23, mRecipe.getOutputChance(tStartIndex))); + } + tStartIndex++; + if (mRecipe.getOutput(tStartIndex) != null) { + this.mOutputs.add(new FixedPositionedStack(mRecipe.getOutput(tStartIndex), 138, 23, mRecipe.getOutputChance(tStartIndex))); + } + tStartIndex++; + break; + case 7: + if (mRecipe.getOutput(tStartIndex) != null) { + this.mOutputs.add(new FixedPositionedStack(mRecipe.getOutput(tStartIndex), 102, -4, mRecipe.getOutputChance(tStartIndex))); + } + tStartIndex++; + if (mRecipe.getOutput(tStartIndex) != null) { + this.mOutputs.add(new FixedPositionedStack(mRecipe.getOutput(tStartIndex), 120, -4, mRecipe.getOutputChance(tStartIndex))); + } + tStartIndex++; + if (mRecipe.getOutput(tStartIndex) != null) { + this.mOutputs.add(new FixedPositionedStack(mRecipe.getOutput(tStartIndex), 138, -4, mRecipe.getOutputChance(tStartIndex))); + } + tStartIndex++; + if (mRecipe.getOutput(tStartIndex) != null) { + this.mOutputs.add(new FixedPositionedStack(mRecipe.getOutput(tStartIndex), 102, 14, mRecipe.getOutputChance(tStartIndex))); + } + tStartIndex++; + if (mRecipe.getOutput(tStartIndex) != null) { + this.mOutputs.add(new FixedPositionedStack(mRecipe.getOutput(tStartIndex), 120, 14, mRecipe.getOutputChance(tStartIndex))); + } + tStartIndex++; + if (mRecipe.getOutput(tStartIndex) != null) { + this.mOutputs.add(new FixedPositionedStack(mRecipe.getOutput(tStartIndex), 138, 14, mRecipe.getOutputChance(tStartIndex))); + } + tStartIndex++; + if (mRecipe.getOutput(tStartIndex) != null) { + this.mOutputs.add(new FixedPositionedStack(mRecipe.getOutput(tStartIndex), 102, 32, mRecipe.getOutputChance(tStartIndex))); + } + tStartIndex++; + break; + case 8: + if (mRecipe.getOutput(tStartIndex) != null) { + this.mOutputs.add(new FixedPositionedStack(mRecipe.getOutput(tStartIndex), 102, -4, mRecipe.getOutputChance(tStartIndex))); + } + tStartIndex++; + if (mRecipe.getOutput(tStartIndex) != null) { + this.mOutputs.add(new FixedPositionedStack(mRecipe.getOutput(tStartIndex), 120, -4, mRecipe.getOutputChance(tStartIndex))); + } + tStartIndex++; + if (mRecipe.getOutput(tStartIndex) != null) { + this.mOutputs.add(new FixedPositionedStack(mRecipe.getOutput(tStartIndex), 138, -4, mRecipe.getOutputChance(tStartIndex))); + } + tStartIndex++; + if (mRecipe.getOutput(tStartIndex) != null) { + this.mOutputs.add(new FixedPositionedStack(mRecipe.getOutput(tStartIndex), 102, 14, mRecipe.getOutputChance(tStartIndex))); + } + tStartIndex++; + if (mRecipe.getOutput(tStartIndex) != null) { + this.mOutputs.add(new FixedPositionedStack(mRecipe.getOutput(tStartIndex), 120, 14, mRecipe.getOutputChance(tStartIndex))); + } + tStartIndex++; + if (mRecipe.getOutput(tStartIndex) != null) { + this.mOutputs.add(new FixedPositionedStack(mRecipe.getOutput(tStartIndex), 138, 14, mRecipe.getOutputChance(tStartIndex))); + } + tStartIndex++; + if (mRecipe.getOutput(tStartIndex) != null) { + this.mOutputs.add(new FixedPositionedStack(mRecipe.getOutput(tStartIndex), 102, 32, mRecipe.getOutputChance(tStartIndex))); + } + tStartIndex++; + if (mRecipe.getOutput(tStartIndex) != null) { + this.mOutputs.add(new FixedPositionedStack(mRecipe.getOutput(tStartIndex), 120, 32, mRecipe.getOutputChance(tStartIndex))); + } + tStartIndex++; + break; + default: + if (mRecipe.getOutput(tStartIndex) != null) { + this.mOutputs.add(new FixedPositionedStack(mRecipe.getOutput(tStartIndex), 102, -4, mRecipe.getOutputChance(tStartIndex))); + } + tStartIndex++; + if (mRecipe.getOutput(tStartIndex) != null) { + this.mOutputs.add(new FixedPositionedStack(mRecipe.getOutput(tStartIndex), 120, -4, mRecipe.getOutputChance(tStartIndex))); + } + tStartIndex++; + if (mRecipe.getOutput(tStartIndex) != null) { + this.mOutputs.add(new FixedPositionedStack(mRecipe.getOutput(tStartIndex), 138, -4, mRecipe.getOutputChance(tStartIndex))); + } + tStartIndex++; + if (mRecipe.getOutput(tStartIndex) != null) { + this.mOutputs.add(new FixedPositionedStack(mRecipe.getOutput(tStartIndex), 102, 14, mRecipe.getOutputChance(tStartIndex))); + } + tStartIndex++; + if (mRecipe.getOutput(tStartIndex) != null) { + this.mOutputs.add(new FixedPositionedStack(mRecipe.getOutput(tStartIndex), 120, 14, mRecipe.getOutputChance(tStartIndex))); + } + tStartIndex++; + if (mRecipe.getOutput(tStartIndex) != null) { + this.mOutputs.add(new FixedPositionedStack(mRecipe.getOutput(tStartIndex), 138, 14, mRecipe.getOutputChance(tStartIndex))); + } + tStartIndex++; + if (mRecipe.getOutput(tStartIndex) != null) { + this.mOutputs.add(new FixedPositionedStack(mRecipe.getOutput(tStartIndex), 102, 32, mRecipe.getOutputChance(tStartIndex))); + } + tStartIndex++; + if (mRecipe.getOutput(tStartIndex) != null) { + this.mOutputs.add(new FixedPositionedStack(mRecipe.getOutput(tStartIndex), 120, 32, mRecipe.getOutputChance(tStartIndex))); + } + tStartIndex++; + if (mRecipe.getOutput(tStartIndex) != null) { + this.mOutputs.add(new FixedPositionedStack(mRecipe.getOutput(tStartIndex), 138, 32, mRecipe.getOutputChance(tStartIndex))); + } + tStartIndex++; + } + + + if ((mRecipe.mFluidInputs.length > 0) && (mRecipe.mFluidInputs[0] != null) && (mRecipe.mFluidInputs[0].getFluid() != null)) { + this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(mRecipe.mFluidInputs[0], true), 48, 52)); + if ((mRecipe.mFluidInputs.length > 1) && (mRecipe.mFluidInputs[1] != null) && (mRecipe.mFluidInputs[1].getFluid() != null)) { + this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(mRecipe.mFluidInputs[1], true), 30, 52)); + } + } + if (mRecipe.mFluidOutputs.length > 1) { + if (mRecipe.mFluidOutputs[0] != null && (mRecipe.mFluidOutputs[0].getFluid() != null)) { + this.mOutputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(mRecipe.mFluidOutputs[0], true), 120, 5)); + } + if (mRecipe.mFluidOutputs[1] != null && (mRecipe.mFluidOutputs[1].getFluid() != null)) { + this.mOutputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(mRecipe.mFluidOutputs[1], true), 138, 5)); + } + if (mRecipe.mFluidOutputs.length > 2 && mRecipe.mFluidOutputs[2] != null && (mRecipe.mFluidOutputs[2].getFluid() != null)) { + this.mOutputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(mRecipe.mFluidOutputs[2], true), 102, 23)); + } + if (mRecipe.mFluidOutputs.length > 3 && mRecipe.mFluidOutputs[3] != null && (mRecipe.mFluidOutputs[3].getFluid() != null)) { + this.mOutputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(mRecipe.mFluidOutputs[3], true), 120, 23)); + } + if (mRecipe.mFluidOutputs.length > 4 && mRecipe.mFluidOutputs[4] != null && (mRecipe.mFluidOutputs[4].getFluid() != null)) { + this.mOutputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(mRecipe.mFluidOutputs[4], true), 138, 23)); + } + } else if ((mRecipe.mFluidOutputs.length > 0) && (mRecipe.mFluidOutputs[0] != null) && (mRecipe.mFluidOutputs[0].getFluid() != null)) { + this.mOutputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(mRecipe.mFluidOutputs[0], true), 102, 52)); + } + } + + @Override + public List<PositionedStack> getIngredients() { + return this.getCycledIngredients(GTPP_NEI_DefaultHandler.this.cycleticks / 10, this.mInputs); + } + + @Override + public PositionedStack getResult() { + return null; + } + + @Override + public List<PositionedStack> getOtherStacks() { + return this.mOutputs; + } + } + + public class NoCellMultiDefaultRecipe extends CachedDefaultRecipe { + + public NoCellMultiDefaultRecipe(final GT_Recipe aRecipe) { + super(aRecipe); + + } + + @Override + public void handleSlots() { + + int aInputItemsCount = this.mRecipe.mInputs.length; + int aInputFluidsCount = this.mRecipe.mFluidInputs.length; + int aOutputItemsCount = this.mRecipe.mOutputs.length; + int aOutputFluidsCount = this.mRecipe.mFluidOutputs.length; + int aInputSlotsUsed = 0; + int aOutputSlotsUsed = 0; + int aSlotToCheck = 0; + + // Special Slot + if (mRecipe.mSpecialItems != null) { + this.mInputs.add(new FixedPositionedStack(mRecipe.mSpecialItems, 120, 52)); + } + + /* + * Items + */ + + // Upto 9 Inputs Slots + if (aInputItemsCount > 0) { + if (aInputItemsCount > 9) { + aInputItemsCount = 9; + } + for (int i=0;i<aInputItemsCount;i++) { + int x = mInputSlotMap.get(aInputSlotsUsed).getKey(); + int y = mInputSlotMap.get(aInputSlotsUsed).getValue(); + ItemStack aRepStack = mRecipe.getRepresentativeInput(aSlotToCheck++); + if (aRepStack != null) { + this.mInputs.add(new FixedPositionedStack(aRepStack, x, y)); + aInputSlotsUsed++; + } + } + } + aSlotToCheck = 0; + // Upto 9 Output Slots + if (aOutputItemsCount > 0) { + if (aOutputItemsCount > 9) { + aOutputItemsCount = 9; + } + for (int i=0;i<aOutputItemsCount;i++) { + int x = mOutputSlotMap.get(aOutputSlotsUsed).getKey(); + int y = mOutputSlotMap.get(aOutputSlotsUsed).getValue(); + ItemStack aRepStack = mRecipe.getOutput(aSlotToCheck); + if (aRepStack != null) { + this.mOutputs.add(new FixedPositionedStack(aRepStack, x, y, mRecipe.getOutputChance(aSlotToCheck))); + aOutputSlotsUsed++; + } + aSlotToCheck++; + } + } + + /* + * Fluids + */ + + // Upto 9 Fluid Inputs Slots + aSlotToCheck = aInputSlotsUsed; + if (aInputFluidsCount > 0) { + for (int i=0;i<aInputFluidsCount;i++) { + int x = mInputSlotMap.get(aSlotToCheck).getKey(); + int y = mInputSlotMap.get(aSlotToCheck).getValue(); + this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(mRecipe.mFluidInputs[i], true), x, y)); + aSlotToCheck++; + aInputSlotsUsed++; + } + } + // Upto 9 Fluid Outputs Slots + aSlotToCheck = aOutputSlotsUsed; + if (aOutputFluidsCount > 0) { + for (int i=0;i<aOutputFluidsCount;i++) { + int x = mOutputSlotMap.get(aSlotToCheck).getKey(); + int y = mOutputSlotMap.get(aSlotToCheck).getValue(); + this.mOutputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(mRecipe.mFluidOutputs[i], true), x, y)); + aSlotToCheck++; + aOutputSlotsUsed++; + } + } + } + } +} diff --git a/src/main/java/gtPlusPlus/nei/GT_NEI_FlotationCell.java b/src/main/java/gtPlusPlus/nei/GT_NEI_FlotationCell.java new file mode 100644 index 0000000000..ca12e1c740 --- /dev/null +++ b/src/main/java/gtPlusPlus/nei/GT_NEI_FlotationCell.java @@ -0,0 +1,100 @@ +package gtPlusPlus.nei; + +import codechicken.nei.recipe.TemplateRecipeHandler; +import gregtech.api.util.GTPP_Recipe.GTPP_Recipe_Map; +import gregtech.api.util.GT_Recipe; +import gregtech.api.util.GT_Utility; + +public class GT_NEI_FlotationCell extends GTPP_NEI_DefaultHandler { + + public GT_NEI_FlotationCell() { + super(GTPP_Recipe_Map.sFlotationCellRecipes); + } + + @Override + public TemplateRecipeHandler newInstance() { + return new GT_NEI_FlotationCell(); + } + + @Override + public CachedDefaultRecipe createCachedRecipe(GT_Recipe aRecipe) { + return new FlotationCellDefaultRecipe(aRecipe); + } + + public class FlotationCellDefaultRecipe extends CachedDefaultRecipe { + + public FlotationCellDefaultRecipe(final GT_Recipe aRecipe) { + super(aRecipe); + } + + @Override + public void handleSlots() { + int tStartIndex = 0; + + if (mRecipe.getRepresentativeInput(tStartIndex) != null) { + this.mInputs.add(new FixedPositionedStack(mRecipe.getRepresentativeInput(tStartIndex), 12, 5)); + } + tStartIndex++; + if (mRecipe.getRepresentativeInput(tStartIndex) != null) { + this.mInputs.add(new FixedPositionedStack(mRecipe.getRepresentativeInput(tStartIndex), 30, 5)); + } + tStartIndex++; + if (mRecipe.getRepresentativeInput(tStartIndex) != null) { + this.mInputs.add(new FixedPositionedStack(mRecipe.getRepresentativeInput(tStartIndex), 48, 5)); + } + tStartIndex++; + if (mRecipe.getRepresentativeInput(tStartIndex) != null) { + this.mInputs.add(new FixedPositionedStack(mRecipe.getRepresentativeInput(tStartIndex), 12, 23)); + } + tStartIndex++; + if (mRecipe.getRepresentativeInput(tStartIndex) != null) { + this.mInputs.add(new FixedPositionedStack(mRecipe.getRepresentativeInput(tStartIndex), 30, 23)); + } + tStartIndex++; + if (mRecipe.getRepresentativeInput(tStartIndex) != null) { + this.mInputs.add(new FixedPositionedStack(mRecipe.getRepresentativeInput(tStartIndex), 48, 23)); + } + tStartIndex++; + + if (mRecipe.mSpecialItems != null) { + this.mInputs.add(new FixedPositionedStack(mRecipe.mSpecialItems, 120, 52)); + } + tStartIndex = 0; + + //Four Output Slots + if (mRecipe.getOutput(tStartIndex) != null) { + this.mOutputs.add(new FixedPositionedStack(mRecipe.getOutput(tStartIndex), 102, 5, mRecipe.getOutputChance(tStartIndex))); + } + tStartIndex++; + if (mRecipe.getOutput(tStartIndex) != null) { + this.mOutputs.add(new FixedPositionedStack(mRecipe.getOutput(tStartIndex), 120, 5, mRecipe.getOutputChance(tStartIndex))); + } + tStartIndex++; + if (mRecipe.getOutput(tStartIndex) != null) { + this.mOutputs.add(new FixedPositionedStack(mRecipe.getOutput(tStartIndex), 102, 23, mRecipe.getOutputChance(tStartIndex))); + } + tStartIndex++; + if (mRecipe.getOutput(tStartIndex) != null) { + this.mOutputs.add(new FixedPositionedStack(mRecipe.getOutput(tStartIndex), 120, 23, mRecipe.getOutputChance(tStartIndex))); + } + tStartIndex++; + + if ((mRecipe.mFluidInputs.length > 0) && (mRecipe.mFluidInputs[0] != null) && (mRecipe.mFluidInputs[0].getFluid() != null)) { + this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(mRecipe.mFluidInputs[0], true), 30, 52)); + if ((mRecipe.mFluidInputs.length > 1) && (mRecipe.mFluidInputs[1] != null) && (mRecipe.mFluidInputs[1].getFluid() != null)) { + this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(mRecipe.mFluidInputs[1], true), 48, 52)); + } + } + + if (mRecipe.mFluidOutputs.length > 0) { + if ((mRecipe.mFluidOutputs[0] != null) && (mRecipe.mFluidOutputs[0].getFluid() != null)) { + this.mOutputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(mRecipe.mFluidOutputs[0], true), 102, 52)); + } + if ((mRecipe.mFluidOutputs.length > 1) && (mRecipe.mFluidOutputs[1] != null) && (mRecipe.mFluidOutputs[1].getFluid() != null)) { + this.mOutputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(mRecipe.mFluidOutputs[1], true), 120, 52)); + } + } + } + + } +} diff --git a/src/main/java/gtPlusPlus/nei/GT_NEI_FluidReactor.java b/src/main/java/gtPlusPlus/nei/GT_NEI_FluidReactor.java new file mode 100644 index 0000000000..7ef76f68b2 --- /dev/null +++ b/src/main/java/gtPlusPlus/nei/GT_NEI_FluidReactor.java @@ -0,0 +1,195 @@ +package gtPlusPlus.nei; + +import java.util.List; + +import codechicken.nei.PositionedStack; +import codechicken.nei.recipe.GuiRecipe; +import codechicken.nei.recipe.TemplateRecipeHandler; +import gregtech.api.util.GTPP_Recipe.GTPP_Recipe_Map; +import gregtech.api.util.GT_Recipe; +import gregtech.api.util.GT_Utility; +import gtPlusPlus.core.util.math.MathUtils; +import gtPlusPlus.core.util.minecraft.ItemUtils; +import net.minecraft.item.ItemStack; + +public class GT_NEI_FluidReactor extends GTPP_NEI_DefaultHandler { + + public GT_NEI_FluidReactor() { + super(GTPP_Recipe_Map.sChemicalPlantRecipes); + } + + @Override + public TemplateRecipeHandler newInstance() { + return new GT_NEI_FluidReactor(); + } + + @Override + public CachedDefaultRecipe createCachedRecipe(GT_Recipe aRecipe) { + return new ChemPlantDefaultRecipe(aRecipe); + } + + @Override + public List<String> handleItemTooltip(final GuiRecipe gui, final ItemStack aStack, final List<String> currenttip, final int aRecipeIndex) { + final TemplateRecipeHandler.CachedRecipe tObject = this.arecipes.get(aRecipeIndex); + if ((tObject instanceof ChemPlantDefaultRecipe)) { + final ChemPlantDefaultRecipe tRecipe = (ChemPlantDefaultRecipe) tObject; + for (final PositionedStack tStack : tRecipe.mOutputs) { + if (aStack == tStack.item) { + if ((!(tStack instanceof FixedPositionedStack)) || (((FixedPositionedStack) tStack).mChance <= 0) || (((FixedPositionedStack) tStack).mChance == 10000)) { + break; + } + currenttip.add("Chance: " + (((FixedPositionedStack) tStack).mChance / 100) + "." + ((((FixedPositionedStack) tStack).mChance % 100) < 10 ? "0" + (((FixedPositionedStack) tStack).mChance % 100) : Integer.valueOf(((FixedPositionedStack) tStack).mChance % 100)) + "%"); + break; + } + } + for (final PositionedStack tStack : tRecipe.mInputs) { + if (GT_Utility.areStacksEqual(aStack, tStack.item)) { + if ((gregtech.api.enums.ItemList.Display_Fluid.isStackEqual(tStack.item, true, true)) || + (tStack.item.stackSize != 0)) { + break; + } + if (ItemUtils.isCatalyst(aStack)) { + currenttip.add("Does not always get consumed in the process"); + currenttip.add("Higher tier pipe casings allow this item to last longer"); + } + else if (ItemUtils.isControlCircuit(aStack)) { + currenttip.add("Does not get consumed in the process"); + } + break; + } + } + } + return currenttip; + } + + @Override + public void drawExtras(final int aRecipeIndex) { + final long tEUt = ((ChemPlantDefaultRecipe) this.arecipes.get(aRecipeIndex)).mRecipe.mEUt; + final int tDuration = ((ChemPlantDefaultRecipe) this.arecipes.get(aRecipeIndex)).mRecipe.mDuration; + if (tEUt != 0) { + drawText(10, 73, "Total: " + MathUtils.formatNumbers((long) (tDuration * tEUt)) + " EU", -16777216); + //drawText(10, 83, "Usage: " + tEUt + " EU/t", -16777216); + if (this.mRecipeMap.mShowVoltageAmperageInNEI) { + drawText(10, 83, "Voltage: " + MathUtils.formatNumbers((tEUt / this.mRecipeMap.mAmperage)) + " EU/t", -16777216); + drawText(10, 93, "Amperage: " + this.mRecipeMap.mAmperage, -16777216); + } else { + drawText(10, 93, "Voltage: unspecified", -16777216); + drawText(10, 103, "Amperage: unspecified", -16777216); + } + } + if (tDuration > 0) { + drawText(10, 103, "Time: " + (tDuration < 20 ? "< 1" : MathUtils.formatNumbers(Integer.valueOf(tDuration / 20))) + " secs", -16777216); + } + if ((GT_Utility.isStringValid(this.mRecipeMap.mNEISpecialValuePre)) || (GT_Utility.isStringValid(this.mRecipeMap.mNEISpecialValuePost))) { + int aTier = (((ChemPlantDefaultRecipe) this.arecipes.get(aRecipeIndex)).mRecipe.mSpecialValue); + String aTierMaterial = " - "; + if (aTier <= 0) { + aTierMaterial += "Bronze"; + } + else if (aTier == 1) { + aTierMaterial += "Steel"; + } + else if (aTier == 2) { + aTierMaterial += "Aluminium"; + } + else if (aTier == 3) { + aTierMaterial += "Stainless Steel"; + } + else if (aTier == 4) { + aTierMaterial += "Titanium"; + } + else if (aTier == 5) { + aTierMaterial += "Tungsten Steel"; + } + else if (aTier == 6) { + aTierMaterial += "Laurenium"; + } + else if (aTier == 7) { + aTierMaterial += "Botmium"; + } + + drawText(10, 113, this.mRecipeMap.mNEISpecialValuePre + (((ChemPlantDefaultRecipe) this.arecipes.get(aRecipeIndex)).mRecipe.mSpecialValue * this.mRecipeMap.mNEISpecialValueMultiplier) + aTierMaterial, -16777216); + } + } + + public class ChemPlantDefaultRecipe extends CachedDefaultRecipe { + + public ChemPlantDefaultRecipe(final GT_Recipe aRecipe) { + super(aRecipe); + } + + @Override + public void handleSlots() { + int tStartIndex = 0; + + // Four Input Slots + if (mRecipe.getRepresentativeInput(tStartIndex) != null) { + this.mInputs.add(new FixedPositionedStack(mRecipe.getRepresentativeInput(tStartIndex), 3, -4)); + } + tStartIndex++; + if (mRecipe.getRepresentativeInput(tStartIndex) != null) { + this.mInputs.add(new FixedPositionedStack(mRecipe.getRepresentativeInput(tStartIndex), 21, -4)); + } + tStartIndex++; + if (mRecipe.getRepresentativeInput(tStartIndex) != null) { + this.mInputs.add(new FixedPositionedStack(mRecipe.getRepresentativeInput(tStartIndex), 39, -4)); + } + tStartIndex++; + if (mRecipe.getRepresentativeInput(tStartIndex) != null) { + this.mInputs.add(new FixedPositionedStack(mRecipe.getRepresentativeInput(tStartIndex), 57, -4)); + } + tStartIndex++; + + + if (mRecipe.mSpecialItems != null) { + this.mInputs.add(new FixedPositionedStack(mRecipe.mSpecialItems, 120, 52)); + } + tStartIndex = 0; + + //Four Output Slots + if (mRecipe.getOutput(tStartIndex) != null) { + this.mOutputs.add(new FixedPositionedStack(mRecipe.getOutput(tStartIndex), 102, 5, mRecipe.getOutputChance(tStartIndex))); + } + tStartIndex++; + if (mRecipe.getOutput(tStartIndex) != null) { + this.mOutputs.add(new FixedPositionedStack(mRecipe.getOutput(tStartIndex), 120, 5, mRecipe.getOutputChance(tStartIndex))); + } + tStartIndex++; + if (mRecipe.getOutput(tStartIndex) != null) { + this.mOutputs.add(new FixedPositionedStack(mRecipe.getOutput(tStartIndex), 102, 23, mRecipe.getOutputChance(tStartIndex))); + } + tStartIndex++; + if (mRecipe.getOutput(tStartIndex) != null) { + this.mOutputs.add(new FixedPositionedStack(mRecipe.getOutput(tStartIndex), 120, 23, mRecipe.getOutputChance(tStartIndex))); + } + tStartIndex++; + + + //New fluid display behaviour when 3 fluid inputs are detected. (Basically a mix of the code below for outputs an the code above for 9 input slots.) + if (mRecipe.mFluidInputs.length >= 1) { + if ((mRecipe.mFluidInputs[0] != null) && (mRecipe.mFluidInputs[0].getFluid() != null)) { + this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(mRecipe.mFluidInputs[0], true), 3, 31)); + } + if ((mRecipe.mFluidInputs.length > 1) && (mRecipe.mFluidInputs[1] != null) && (mRecipe.mFluidInputs[1].getFluid() != null)) { + this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(mRecipe.mFluidInputs[1], true), 21, 31)); + } + if ((mRecipe.mFluidInputs.length > 2) && (mRecipe.mFluidInputs[2] != null) && (mRecipe.mFluidInputs[2].getFluid() != null)) { + this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(mRecipe.mFluidInputs[2], true), 39, 31)); + } + if ((mRecipe.mFluidInputs.length > 3) && (mRecipe.mFluidInputs[3] != null) && (mRecipe.mFluidInputs[3].getFluid() != null)) { + this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(mRecipe.mFluidInputs[3], true), 57, 31)); + } + } + + if (mRecipe.mFluidOutputs.length > 0) { + if ((mRecipe.mFluidOutputs[0] != null) && (mRecipe.mFluidOutputs[0].getFluid() != null)) { + this.mOutputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(mRecipe.mFluidOutputs[0], true), 138, 5)); + } + if ((mRecipe.mFluidOutputs.length > 1) && (mRecipe.mFluidOutputs[1] != null) && (mRecipe.mFluidOutputs[1].getFluid() != null)) { + this.mOutputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(mRecipe.mFluidOutputs[1], true), 138, 23)); + } + } + + } + } +} diff --git a/src/main/java/gtPlusPlus/nei/GT_NEI_LFTR.java b/src/main/java/gtPlusPlus/nei/GT_NEI_LFTR.java new file mode 100644 index 0000000000..dd7338eccd --- /dev/null +++ b/src/main/java/gtPlusPlus/nei/GT_NEI_LFTR.java @@ -0,0 +1,118 @@ +package gtPlusPlus.nei; + +import org.lwjgl.opengl.GL11; + +import codechicken.lib.gui.GuiDraw; +import codechicken.nei.recipe.TemplateRecipeHandler; +import gregtech.api.util.GTPP_Recipe.GTPP_Recipe_Map; +import gregtech.api.util.GT_Recipe; +import gregtech.api.util.GT_Utility; +import gtPlusPlus.core.util.math.MathUtils; + +public class GT_NEI_LFTR extends GTPP_NEI_DefaultHandler { + + public GT_NEI_LFTR() { + super(GTPP_Recipe_Map.sLiquidFluorineThoriumReactorRecipes); + } + + @Override + public TemplateRecipeHandler newInstance() { + return new GT_NEI_LFTR(); + } + + @Override + public CachedDefaultRecipe createCachedRecipe(GT_Recipe aRecipe) { + return new LFTRDefaultRecipe(aRecipe); + } + + @Override + public void drawBackground(final int recipe) { + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GuiDraw.changeTexture(this.getGuiTexture()); + GuiDraw.drawTexturedModalRect(-4, -8, 1, 3, 174, 89); + } + + @Override + public void drawExtras(final int aRecipeIndex) { + final long tEUt = ((CachedDefaultRecipe) this.arecipes.get(aRecipeIndex)).mRecipe.mSpecialValue; + final int tDuration = ((CachedDefaultRecipe) this.arecipes.get(aRecipeIndex)).mRecipe.mDuration; + drawText(10, 83, "Time: " + (tDuration < 20 ? "< 1" : MathUtils.formatNumbers(Integer.valueOf(tDuration / 20))) + " secs", -16777216); + drawText(10, 93, this.mRecipeMap.mNEISpecialValuePre + MathUtils.formatNumbers((((CachedDefaultRecipe) this.arecipes.get(aRecipeIndex)).mRecipe.mSpecialValue * this.mRecipeMap.mNEISpecialValueMultiplier)) + this.mRecipeMap.mNEISpecialValuePost, -16777216); + drawText(10, 103, "Dynamo: " + MathUtils.formatNumbers((long) (tDuration * tEUt)) + " EU", -16777216); + drawText(10, 113, "Total: " + MathUtils.formatNumbers((long) (tDuration * tEUt * 4)) + " EU", -16777216); + } + + public class LFTRDefaultRecipe extends CachedDefaultRecipe { + + public LFTRDefaultRecipe(final GT_Recipe aRecipe) { + super(aRecipe); + } + + @Override + public void handleSlots() { + int tStartIndex = 0; + if (mRecipe.mFluidInputs.length > 0) { + if ((mRecipe.mFluidInputs[0] != null) && (mRecipe.mFluidInputs[0].getFluid() != null)) { + this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(mRecipe.mFluidInputs[0], true), 12, 5)); + } + if ((mRecipe.mFluidInputs.length > 1) && (mRecipe.mFluidInputs[1] != null) && (mRecipe.mFluidInputs[1].getFluid() != null)) { + this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(mRecipe.mFluidInputs[1], true), 30, 5)); + } + if ((mRecipe.mFluidInputs.length > 2) && (mRecipe.mFluidInputs[2] != null) && (mRecipe.mFluidInputs[2].getFluid() != null)) { + this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(mRecipe.mFluidInputs[2], true), 48, 5)); + } + if ((mRecipe.mFluidInputs.length > 3) && (mRecipe.mFluidInputs[3] != null) && (mRecipe.mFluidInputs[3].getFluid() != null)) { + this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(mRecipe.mFluidInputs[3], true), 12, 23)); + } + if ((mRecipe.mFluidInputs.length > 4) && (mRecipe.mFluidInputs[4] != null) && (mRecipe.mFluidInputs[4].getFluid() != null)) { + this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(mRecipe.mFluidInputs[4], true), 30, 23)); + } + if ((mRecipe.mFluidInputs.length > 5) && (mRecipe.mFluidInputs[5] != null) && (mRecipe.mFluidInputs[5].getFluid() != null)) { + this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(mRecipe.mFluidInputs[5], true), 48, 23)); + } + if ((mRecipe.mFluidInputs.length > 6) && (mRecipe.mFluidInputs[6] != null) && (mRecipe.mFluidInputs[6].getFluid() != null)) { + this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(mRecipe.mFluidInputs[6], true), 12, 41)); + } + if ((mRecipe.mFluidInputs.length > 7) && (mRecipe.mFluidInputs[7] != null) && (mRecipe.mFluidInputs[7].getFluid() != null)) { + this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(mRecipe.mFluidInputs[7], true), 30, 41)); + } + if ((mRecipe.mFluidInputs.length > 8) && (mRecipe.mFluidInputs[8] != null) && (mRecipe.mFluidInputs[8].getFluid() != null)) { + this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(mRecipe.mFluidInputs[8], true), 48, 41)); + } + } + + tStartIndex = 0; + if (mRecipe.mFluidOutputs.length > 0) { + if ((mRecipe.mFluidOutputs[0] != null) && (mRecipe.mFluidOutputs[0].getFluid() != null)) { + this.mOutputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(mRecipe.mFluidOutputs[0], true), 102, 5, mRecipe.getOutputChance(tStartIndex++))); + } + if ((mRecipe.mFluidOutputs.length > 1) && (mRecipe.mFluidOutputs[1] != null) && (mRecipe.mFluidOutputs[1].getFluid() != null)) { + this.mOutputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(mRecipe.mFluidOutputs[1], true), 120, 5, mRecipe.getOutputChance(tStartIndex++))); + } + if ((mRecipe.mFluidOutputs.length > 2) && (mRecipe.mFluidOutputs[2] != null) && (mRecipe.mFluidOutputs[2].getFluid() != null)) { + this.mOutputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(mRecipe.mFluidOutputs[2], true), 138, 5, mRecipe.getOutputChance(tStartIndex++))); + } + if ((mRecipe.mFluidOutputs.length > 3) && (mRecipe.mFluidOutputs[3] != null) && (mRecipe.mFluidOutputs[3].getFluid() != null)) { + this.mOutputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(mRecipe.mFluidOutputs[3], true), 102, 23, mRecipe.getOutputChance(tStartIndex++))); + } + if ((mRecipe.mFluidOutputs.length > 4) && (mRecipe.mFluidOutputs[4] != null) && (mRecipe.mFluidOutputs[4].getFluid() != null)) { + this.mOutputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(mRecipe.mFluidOutputs[4], true), 120, 23, mRecipe.getOutputChance(tStartIndex++))); + } + if ((mRecipe.mFluidOutputs.length > 5) && (mRecipe.mFluidOutputs[5] != null) && (mRecipe.mFluidOutputs[5].getFluid() != null)) { + this.mOutputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(mRecipe.mFluidOutputs[5], true), 138, 23, mRecipe.getOutputChance(tStartIndex++))); + } + if ((mRecipe.mFluidOutputs.length > 6) && (mRecipe.mFluidOutputs[6] != null) && (mRecipe.mFluidOutputs[6].getFluid() != null)) { + this.mOutputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(mRecipe.mFluidOutputs[6], true), 102, 41, mRecipe.getOutputChance(tStartIndex++))); + } + if ((mRecipe.mFluidOutputs.length > 7) && (mRecipe.mFluidOutputs[7] != null) && (mRecipe.mFluidOutputs[7].getFluid() != null)) { + this.mOutputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(mRecipe.mFluidOutputs[7], true), 120, 41, mRecipe.getOutputChance(tStartIndex++))); + } + if ((mRecipe.mFluidOutputs.length > 8) && (mRecipe.mFluidOutputs[8] != null) && (mRecipe.mFluidOutputs[8].getFluid() != null)) { + this.mOutputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(mRecipe.mFluidOutputs[8], true), 138, 41, mRecipe.getOutputChance(tStartIndex++))); + } + } + + } + + } +} diff --git a/src/main/java/gtPlusPlus/nei/GT_NEI_LFTR_Sparging.java b/src/main/java/gtPlusPlus/nei/GT_NEI_LFTR_Sparging.java new file mode 100644 index 0000000000..c9f9f0722a --- /dev/null +++ b/src/main/java/gtPlusPlus/nei/GT_NEI_LFTR_Sparging.java @@ -0,0 +1,372 @@ +package gtPlusPlus.nei; + +import java.awt.Rectangle; +import java.lang.ref.SoftReference; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.stream.Collectors; + +import org.lwjgl.opengl.GL11; + +import codechicken.lib.gui.GuiDraw; +import codechicken.nei.PositionedStack; +import codechicken.nei.recipe.GuiCraftingRecipe; +import codechicken.nei.recipe.GuiRecipe; +import codechicken.nei.recipe.GuiUsageRecipe; +import codechicken.nei.recipe.TemplateRecipeHandler; +import cpw.mods.fml.common.event.FMLInterModComms; +import gregtech.api.enums.GT_Values; +import gregtech.api.enums.ItemList; +import gregtech.api.enums.OrePrefixes; +import gregtech.api.objects.ItemData; +import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.util.GT_Utility; +import gregtech.api.util.GasSpargingRecipe; +import gregtech.api.util.GasSpargingRecipeMap; +import gtPlusPlus.core.util.math.MathUtils; +import gtPlusPlus.core.util.minecraft.ItemUtils; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; + +public class GT_NEI_LFTR_Sparging extends TemplateRecipeHandler { + + public static final String mNEIName = GasSpargingRecipeMap.mNEIDisplayName; + private SoftReference<List<GasSpargingRecipeNEI>> mCachedRecipes = null; + + public GT_NEI_LFTR_Sparging() { + this.transferRects.add(new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(65, 13, 36, 18), this.getOverlayIdentifier(), new Object[0])); + if (!NEI_GT_Config.sIsAdded) { + FMLInterModComms.sendRuntimeMessage(GT_Values.GT, "NEIPlugins", "register-crafting-handler", "gregtechplusplus@" + this.getRecipeName() + "@" + this.getOverlayIdentifier()); + GuiCraftingRecipe.craftinghandlers.add(this); + GuiUsageRecipe.usagehandlers.add(this); + } + } + + public String getRecipeName() { + return mNEIName; + } + + public String getGuiTexture() { + return GasSpargingRecipeMap.mNEIGUIPath; + } + + public String getOverlayIdentifier() { + return gregtech.api.util.GasSpargingRecipeMap.mUnlocalizedName; + } + + public int recipiesPerPage() { + return 1; + } + + @Override + public void drawBackground(final int recipe) { + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GuiDraw.changeTexture(this.getGuiTexture()); + GuiDraw.drawTexturedModalRect(-4, -8, 1, 3, 174, 68); + } + + public void loadTransferRects() { + this.transferRects.add(new RecipeTransferRect(new Rectangle(72, 14, 22, 16), getRecipeName(), new Object[0])); + } + + public List<GasSpargingRecipeNEI> getCache() { + List<GasSpargingRecipeNEI> cache; + if (mCachedRecipes == null || (cache = mCachedRecipes.get()) == null) { + cache = GasSpargingRecipeMap.mRecipes.stream() // do not use parallel stream. This is already parallelized by NEI + .sorted() + .map(temp -> {return createCachedRecipe(temp);}) + .collect(Collectors.toList()); + // while the NEI parallelize handlers, for each individual handler it still uses sequential execution model + // so we do not need any synchronization here + mCachedRecipes = new SoftReference<>(cache); + } + return cache; + } + + public GasSpargingRecipeNEI createCachedRecipe(GasSpargingRecipe aRecipe) { + return new GasSpargingRecipeNEI(aRecipe); + } + + public void loadCraftingRecipes(String outputId, Object... results) { + if (outputId.equals(getOverlayIdentifier())) { + arecipes.addAll(getCache()); + } else { + super.loadCraftingRecipes(outputId, results); + } + } + + public void loadCraftingRecipes(ItemStack aResult) { + ItemData tPrefixMaterial = GT_OreDictUnificator.getAssociation(aResult); + + ArrayList<ItemStack> tResults = new ArrayList<>(); + tResults.add(aResult); + tResults.add(GT_OreDictUnificator.get(true, aResult)); + if ((tPrefixMaterial != null) && (!tPrefixMaterial.mBlackListed) && (!tPrefixMaterial.mPrefix.mFamiliarPrefixes.isEmpty())) { + for (OrePrefixes tPrefix : tPrefixMaterial.mPrefix.mFamiliarPrefixes) { + tResults.add(GT_OreDictUnificator.get(tPrefix, tPrefixMaterial.mMaterial.mMaterial, 1L)); + } + } + FluidStack tFluid = GT_Utility.getFluidForFilledItem(aResult, true); + FluidStack tFluidStack; + if (tFluid != null) { + tFluidStack = tFluid; + tResults.add(GT_Utility.getFluidDisplayStack(tFluid, false)); + } + else tFluidStack = GT_Utility.getFluidFromDisplayStack(aResult); + if (tFluidStack != null) { + tResults.addAll(GT_Utility.getContainersFromFluid(tFluidStack)); + } + for (GasSpargingRecipeNEI recipe : getCache()) { + if (tResults.stream().anyMatch(stack -> recipe.contains(recipe.mOutputs, stack))) + arecipes.add(recipe); + } + } + + public void loadUsageRecipes(ItemStack aInput) { + ItemData tPrefixMaterial = GT_OreDictUnificator.getAssociation(aInput); + + ArrayList<ItemStack> tInputs = new ArrayList<>(); + tInputs.add(aInput); + tInputs.add(GT_OreDictUnificator.get(false, aInput)); + if ((tPrefixMaterial != null) && (!tPrefixMaterial.mPrefix.mFamiliarPrefixes.isEmpty())) { + for (OrePrefixes tPrefix : tPrefixMaterial.mPrefix.mFamiliarPrefixes) { + tInputs.add(GT_OreDictUnificator.get(tPrefix, tPrefixMaterial.mMaterial.mMaterial, 1L)); + } + } + FluidStack tFluid = GT_Utility.getFluidForFilledItem(aInput, true); + FluidStack tFluidStack; + if (tFluid != null) { + tFluidStack = tFluid; + tInputs.add(GT_Utility.getFluidDisplayStack(tFluid, false)); + } + else tFluidStack = GT_Utility.getFluidFromDisplayStack(aInput); + if (tFluidStack != null) { + tInputs.addAll(GT_Utility.getContainersFromFluid(tFluidStack)); + } + for (GasSpargingRecipeNEI recipe : getCache()) { + if (tInputs.stream().anyMatch(stack -> recipe.contains(recipe.mInputs, stack))) + arecipes.add(recipe); + } + } + + public void drawExtras(int aRecipeIndex) { + final long tEUt = ((GasSpargingRecipeNEI) this.arecipes.get(aRecipeIndex)).mRecipe.mEUt; + final long tDuration = ((GasSpargingRecipeNEI) this.arecipes.get(aRecipeIndex)).mRecipe.mDuration; + GT_NEI_LFTR.drawText(10, 73, "Total: " + MathUtils.formatNumbers((long) (tDuration * tEUt)) + " EU", -16777216); + GT_NEI_LFTR.drawText(10, 83, "Usage: " + MathUtils.formatNumbers(tEUt) + " EU/t", -16777216); + GT_NEI_LFTR.drawText(10, 93, "Time: " + (tDuration < 20 ? "< 1" : MathUtils.formatNumbers(Long.valueOf(tDuration / 20))) + " secs", -16777216); + GT_NEI_LFTR.drawText(10, 103, "Gas not used to sparge is", -16777216); + GT_NEI_LFTR.drawText(10, 113, "returned alongside outputs.", -16777216); + } + + @Override + public List<String> handleItemTooltip(final GuiRecipe gui, final ItemStack aStack, final List<String> currenttip, final int aRecipeIndex) { + final TemplateRecipeHandler.CachedRecipe tObject = this.arecipes.get(aRecipeIndex); + if ((tObject instanceof GasSpargingRecipeNEI)) { + final GasSpargingRecipeNEI tRecipe = (GasSpargingRecipeNEI) tObject; + ItemStack aSpargeInput = tRecipe.mOutputs.get(0).item; + ItemStack aSpentFuel = tRecipe.mOutputs.get(1).item; + for (final PositionedStack tStack : tRecipe.mOutputs) { + if (aStack == tStack.item) { + if (ItemList.Display_Fluid.isStackEqual(tStack.item, true, true)) { + if (GT_Utility.areStacksEqual(aStack, aSpentFuel, true)) { + break; + } + if (GT_Utility.areStacksEqual(aStack, aSpargeInput, true)) { + currenttip.add("The amount returned is the remainder after all other outputs."); + } + currenttip.add("Maximum Output: " + (((FixedPositionedStack) tStack).mChance / 100) + "." + ((((FixedPositionedStack) tStack).mChance % 100) < 10 ? "0" + (((FixedPositionedStack) tStack).mChance % 100) : Integer.valueOf(((FixedPositionedStack) tStack).mChance % 100)) + "L"); + break; + } + break; + } + } + for (final PositionedStack tStack : tRecipe.mInputs) { + if (GT_Utility.areStacksEqual(aStack, tStack.item)) { + if ((gregtech.api.enums.ItemList.Display_Fluid.isStackEqual(tStack.item, true, true)) || + (tStack.item.stackSize != 0)) { + break; + } + if (ItemUtils.isControlCircuit(aStack)) { + currenttip.add("Does not get consumed in the process"); + } + break; + } + } + } + return currenttip; + } + + public class FixedPositionedStack + extends PositionedStack { + public final int mChance; + public boolean permutated = false; + + public FixedPositionedStack(final Object object, final int x, final int y) { + this(object, x, y, 0); + } + + public FixedPositionedStack(final Object object, final int x, final int y, final int aChance) { + super(object, x, y, true); + this.mChance = aChance; + } + + @Override + public void generatePermutations() { + if (this.permutated) { + return; + } + final ArrayList<ItemStack> tDisplayStacks = new ArrayList<ItemStack>(); + for (final ItemStack tStack : this.items) { + if (GT_Utility.isStackValid(tStack)) { + if (tStack.getItemDamage() == 32767) { + final List<ItemStack> permutations = codechicken.nei.ItemList.itemMap.get(tStack.getItem()); + if (!permutations.isEmpty()) { + ItemStack stack; + for (final Iterator<ItemStack> i$ = permutations.iterator(); i$.hasNext(); tDisplayStacks.add(GT_Utility.copyAmount(tStack.stackSize, new Object[]{stack}))) { + stack = i$.next(); + } + } else { + final ItemStack base = new ItemStack(tStack.getItem(), tStack.stackSize); + base.stackTagCompound = tStack.stackTagCompound; + tDisplayStacks.add(base); + } + } else { + tDisplayStacks.add(GT_Utility.copy(new Object[]{tStack})); + } + } + } + this.items = (tDisplayStacks.toArray(new ItemStack[0])); + if (this.items.length == 0) { + this.items = new ItemStack[]{new ItemStack(Blocks.fire)}; + } + this.permutated = true; + this.setPermutationToRender(0); + } + } + + public class GasSpargingRecipeNEI extends CachedRecipe implements Comparable<CachedRecipe> { + + public final GasSpargingRecipe mRecipe; + public final List<PositionedStack> mOutputs = new ArrayList<PositionedStack>(); + public final List<PositionedStack> mInputs = new ArrayList<PositionedStack>(); + + public GasSpargingRecipeNEI(GasSpargingRecipe tRecipe) { + super(); + this.mRecipe = tRecipe; + int tStartIndex = 0; + if (tRecipe.mFluidInputs.length > 0) { + if ((tRecipe.mFluidInputs[0] != null) && (tRecipe.mFluidInputs[0].getFluid() != null)) { + this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(tRecipe.mFluidInputs[0], true), 30, 5)); + } + if ((tRecipe.mFluidInputs.length > 1) && (tRecipe.mFluidInputs[1] != null) && (tRecipe.mFluidInputs[1].getFluid() != null)) { + this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(tRecipe.mFluidInputs[1], true), 12, 5)); + } + if ((tRecipe.mFluidInputs.length > 2) && (tRecipe.mFluidInputs[2] != null) && (tRecipe.mFluidInputs[2].getFluid() != null)) { + this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(tRecipe.mFluidInputs[2], true), 48, 5)); + } + if ((tRecipe.mFluidInputs.length > 3) && (tRecipe.mFluidInputs[3] != null) && (tRecipe.mFluidInputs[3].getFluid() != null)) { + this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(tRecipe.mFluidInputs[3], true), 12, 23)); + } + if ((tRecipe.mFluidInputs.length > 4) && (tRecipe.mFluidInputs[4] != null) && (tRecipe.mFluidInputs[4].getFluid() != null)) { + this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(tRecipe.mFluidInputs[4], true), 30, 23)); + } + if ((tRecipe.mFluidInputs.length > 5) && (tRecipe.mFluidInputs[5] != null) && (tRecipe.mFluidInputs[5].getFluid() != null)) { + this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(tRecipe.mFluidInputs[5], true), 48, 23)); + } + if ((tRecipe.mFluidInputs.length > 6) && (tRecipe.mFluidInputs[6] != null) && (tRecipe.mFluidInputs[6].getFluid() != null)) { + this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(tRecipe.mFluidInputs[6], true), 12, 41)); + } + if ((tRecipe.mFluidInputs.length > 7) && (tRecipe.mFluidInputs[7] != null) && (tRecipe.mFluidInputs[7].getFluid() != null)) { + this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(tRecipe.mFluidInputs[7], true), 30, 41)); + } + if ((tRecipe.mFluidInputs.length > 8) && (tRecipe.mFluidInputs[8] != null) && (tRecipe.mFluidInputs[8].getFluid() != null)) { + this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(tRecipe.mFluidInputs[8], true), 48, 41)); + } + } + + tStartIndex = 0; + if (tRecipe.mFluidOutputs.length > 0) { + if ((tRecipe.mFluidOutputs[0] != null) && (tRecipe.mFluidOutputs[0].getFluid() != null)) { + this.mOutputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(tRecipe.mFluidOutputs[0], false), 120, 5, tRecipe.getMaxOutput(tStartIndex++))); + } + if ((tRecipe.mFluidOutputs.length > 1) && (tRecipe.mFluidOutputs[1] != null) && (tRecipe.mFluidOutputs[1].getFluid() != null)) { + this.mOutputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(tRecipe.mFluidOutputs[1], true), 102, 5, tRecipe.getMaxOutput(tStartIndex++))); + } + if ((tRecipe.mFluidOutputs.length > 2) && (tRecipe.mFluidOutputs[2] != null) && (tRecipe.mFluidOutputs[2].getFluid() != null)) { + this.mOutputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(tRecipe.mFluidOutputs[2], false), 138, 5, tRecipe.getMaxOutput(tStartIndex++))); + } + if ((tRecipe.mFluidOutputs.length > 3) && (tRecipe.mFluidOutputs[3] != null) && (tRecipe.mFluidOutputs[3].getFluid() != null)) { + this.mOutputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(tRecipe.mFluidOutputs[3], false), 102, 23, tRecipe.getMaxOutput(tStartIndex++))); + } + if ((tRecipe.mFluidOutputs.length > 4) && (tRecipe.mFluidOutputs[4] != null) && (tRecipe.mFluidOutputs[4].getFluid() != null)) { + this.mOutputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(tRecipe.mFluidOutputs[4], false), 120, 23, tRecipe.getMaxOutput(tStartIndex++))); + } + if ((tRecipe.mFluidOutputs.length > 5) && (tRecipe.mFluidOutputs[5] != null) && (tRecipe.mFluidOutputs[5].getFluid() != null)) { + this.mOutputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(tRecipe.mFluidOutputs[5], false), 138, 23, tRecipe.getMaxOutput(tStartIndex++))); + } + if ((tRecipe.mFluidOutputs.length > 6) && (tRecipe.mFluidOutputs[6] != null) && (tRecipe.mFluidOutputs[6].getFluid() != null)) { + this.mOutputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(tRecipe.mFluidOutputs[6], false), 102, 41, tRecipe.getMaxOutput(tStartIndex++))); + } + if ((tRecipe.mFluidOutputs.length > 7) && (tRecipe.mFluidOutputs[7] != null) && (tRecipe.mFluidOutputs[7].getFluid() != null)) { + this.mOutputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(tRecipe.mFluidOutputs[7], false), 120, 41, tRecipe.getMaxOutput(tStartIndex++))); + } + if ((tRecipe.mFluidOutputs.length > 8) && (tRecipe.mFluidOutputs[8] != null) && (tRecipe.mFluidOutputs[8].getFluid() != null)) { + this.mOutputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(tRecipe.mFluidOutputs[8], false), 138, 41, tRecipe.getMaxOutput(tStartIndex++))); + } + } + } + + @Override + public int compareTo(CachedRecipe o) { + boolean b = GasSpargingRecipeNEI.class.isInstance(o); + if (b) { + GasSpargingRecipeNEI p = (GasSpargingRecipeNEI) o; + if (p.mOutputs.size() > this.mOutputs.size()) { + return 1; + } else if (p.mOutputs.size() == this.mOutputs.size()) { + return 0; + } else { + return -1; + } + } + return 0; + } + + @Override + public boolean equals(Object obj) { + if (obj != null) { + if (GasSpargingRecipeNEI.class.isInstance(obj)) { + GasSpargingRecipeNEI p = (GasSpargingRecipeNEI) obj; + if (p != null) { + if (GT_Utility.areStacksEqual(p.mInputs.get(0).item, this.mInputs.get(0).item, true)) { + if (p.mOutputs.size() == this.mOutputs.size()) { + return true; + } + } + } + } + } + return false; + } + + @Override + public List<PositionedStack> getIngredients() { + return this.getCycledIngredients(GT_NEI_LFTR_Sparging.this.cycleticks / 10, this.mInputs); + } + + @Override + public PositionedStack getResult() { + return null; + } + + @Override + public List<PositionedStack> getOtherStacks() { + return this.mOutputs; + } + + + } +}
\ No newline at end of file diff --git a/src/main/java/gtPlusPlus/nei/GT_NEI_MillingMachine.java b/src/main/java/gtPlusPlus/nei/GT_NEI_MillingMachine.java new file mode 100644 index 0000000000..5d09b9003f --- /dev/null +++ b/src/main/java/gtPlusPlus/nei/GT_NEI_MillingMachine.java @@ -0,0 +1,136 @@ +package gtPlusPlus.nei; + +import java.util.List; + +import codechicken.nei.PositionedStack; +import codechicken.nei.recipe.GuiRecipe; +import codechicken.nei.recipe.TemplateRecipeHandler; +import gregtech.api.util.GTPP_Recipe.GTPP_Recipe_Map; +import gregtech.api.util.GT_Recipe; +import gregtech.api.util.GT_Utility; +import gtPlusPlus.core.util.minecraft.ItemUtils; +import net.minecraft.item.ItemStack; + +public class GT_NEI_MillingMachine extends GTPP_NEI_DefaultHandler { + + public GT_NEI_MillingMachine() { + super(GTPP_Recipe_Map.sOreMillRecipes); + } + + @Override + public TemplateRecipeHandler newInstance() { + return new GT_NEI_MillingMachine(); + } + + @Override + public CachedDefaultRecipe createCachedRecipe(GT_Recipe aRecipe) { + return new MillingDefaultRecipe(aRecipe); + } + + @Override + public List<String> handleItemTooltip(final GuiRecipe gui, final ItemStack aStack, final List<String> currenttip, final int aRecipeIndex) { + final TemplateRecipeHandler.CachedRecipe tObject = this.arecipes.get(aRecipeIndex); + if ((tObject instanceof CachedDefaultRecipe)) { + final CachedDefaultRecipe tRecipe = (CachedDefaultRecipe) tObject; + for (final PositionedStack tStack : tRecipe.mOutputs) { + if (aStack == tStack.item) { + if ((!(tStack instanceof FixedPositionedStack)) || (((FixedPositionedStack) tStack).mChance <= 0) || (((FixedPositionedStack) tStack).mChance == 10000)) { + break; + } + currenttip.add("Chance: " + (((FixedPositionedStack) tStack).mChance / 100) + "." + ((((FixedPositionedStack) tStack).mChance % 100) < 10 ? "0" + (((FixedPositionedStack) tStack).mChance % 100) : Integer.valueOf(((FixedPositionedStack) tStack).mChance % 100)) + "%"); + break; + } + } + for (final PositionedStack tStack : tRecipe.mInputs) { + if (GT_Utility.areStacksEqual(aStack, tStack.item)) { + if ((gregtech.api.enums.ItemList.Display_Fluid.isStackEqual(tStack.item, true, true)) || + (tStack.item.stackSize != 0)) { + break; + } + if (ItemUtils.isMillingBall(aStack)) { + currenttip.add("Does not always get consumed in the process"); + } + else if (ItemUtils.isControlCircuit(aStack)) { + currenttip.add("Does not get consumed in the process"); + } + break; + } + } + } + return currenttip; + } + + public class MillingDefaultRecipe extends CachedDefaultRecipe { + + public MillingDefaultRecipe(final GT_Recipe aRecipe) { + super(aRecipe); + } + + @Override + public void handleSlots() { + int tStartIndex = 0; + + if (mRecipe.getRepresentativeInput(tStartIndex) != null) { + this.mInputs.add(new FixedPositionedStack(mRecipe.getRepresentativeInput(tStartIndex), 12, 14)); + } + tStartIndex++; + if (mRecipe.getRepresentativeInput(tStartIndex) != null) { + this.mInputs.add(new FixedPositionedStack(mRecipe.getRepresentativeInput(tStartIndex), 30, 14)); + } + tStartIndex++; + if (mRecipe.getRepresentativeInput(tStartIndex) != null) { + this.mInputs.add(new FixedPositionedStack(mRecipe.getRepresentativeInput(tStartIndex), 48, 14)); + } + tStartIndex++; + + if (mRecipe.mSpecialItems != null) { + this.mInputs.add(new FixedPositionedStack(mRecipe.mSpecialItems, 120, 52)); + } + tStartIndex = 0; + + //Four Output Slots + if (mRecipe.getOutput(tStartIndex) != null) { + this.mOutputs.add(new FixedPositionedStack(mRecipe.getOutput(tStartIndex), 102, 5, mRecipe.getOutputChance(tStartIndex))); + } + tStartIndex++; + if (mRecipe.getOutput(tStartIndex) != null) { + this.mOutputs.add(new FixedPositionedStack(mRecipe.getOutput(tStartIndex), 120, 5, mRecipe.getOutputChance(tStartIndex))); + } + tStartIndex++; + if (mRecipe.getOutput(tStartIndex) != null) { + this.mOutputs.add(new FixedPositionedStack(mRecipe.getOutput(tStartIndex), 102, 23, mRecipe.getOutputChance(tStartIndex))); + } + tStartIndex++; + if (mRecipe.getOutput(tStartIndex) != null) { + this.mOutputs.add(new FixedPositionedStack(mRecipe.getOutput(tStartIndex), 120, 23, mRecipe.getOutputChance(tStartIndex))); + } + tStartIndex++; + + + //New fluid display behaviour when 3 fluid inputs are detected. (Basically a mix of the code below for outputs an the code above for 9 input slots.) + if (mRecipe.mFluidInputs.length >= 1) { + if ((mRecipe.mFluidInputs[0] != null) && (mRecipe.mFluidInputs[0].getFluid() != null)) { + this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(mRecipe.mFluidInputs[0], true), 3, 31)); + } + if ((mRecipe.mFluidInputs.length > 1) && (mRecipe.mFluidInputs[1] != null) && (mRecipe.mFluidInputs[1].getFluid() != null)) { + this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(mRecipe.mFluidInputs[1], true), 21, 31)); + } + if ((mRecipe.mFluidInputs.length > 2) && (mRecipe.mFluidInputs[2] != null) && (mRecipe.mFluidInputs[2].getFluid() != null)) { + this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(mRecipe.mFluidInputs[2], true), 39, 31)); + } + if ((mRecipe.mFluidInputs.length > 3) && (mRecipe.mFluidInputs[3] != null) && (mRecipe.mFluidInputs[3].getFluid() != null)) { + this.mInputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(mRecipe.mFluidInputs[3], true), 57, 31)); + } + } + + if (mRecipe.mFluidOutputs.length > 0) { + if ((mRecipe.mFluidOutputs[0] != null) && (mRecipe.mFluidOutputs[0].getFluid() != null)) { + this.mOutputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(mRecipe.mFluidOutputs[0], true), 138, 5)); + } + if ((mRecipe.mFluidOutputs.length > 1) && (mRecipe.mFluidOutputs[1] != null) && (mRecipe.mFluidOutputs[1].getFluid() != null)) { + this.mOutputs.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(mRecipe.mFluidOutputs[1], true), 138, 23)); + } + } + } + } +} diff --git a/src/main/java/gtPlusPlus/nei/GT_NEI_MultiNoCell.java b/src/main/java/gtPlusPlus/nei/GT_NEI_MultiNoCell.java new file mode 100644 index 0000000000..f4f69589b6 --- /dev/null +++ b/src/main/java/gtPlusPlus/nei/GT_NEI_MultiNoCell.java @@ -0,0 +1,58 @@ +package gtPlusPlus.nei; + +import static gregtech.api.enums.GT_Values.RES_PATH_GUI; + +import org.lwjgl.opengl.GL11; + +import codechicken.lib.gui.GuiDraw; +import codechicken.nei.recipe.TemplateRecipeHandler; +import gregtech.api.util.GT_Recipe; +import gregtech.api.util.GT_Recipe.GT_Recipe_Map; +import gregtech.api.util.GT_Utility; +import gtPlusPlus.core.util.math.MathUtils; + +public class GT_NEI_MultiNoCell extends GTPP_NEI_DefaultHandler { + + public GT_NEI_MultiNoCell(GT_Recipe_Map aMap) { + super(aMap); + } + + @Override + public TemplateRecipeHandler newInstance() { + return new GT_NEI_MultiNoCell(mRecipeMap); + } + + @Override + public CachedDefaultRecipe createCachedRecipe(GT_Recipe aRecipe) { + return new NoCellMultiDefaultRecipe(aRecipe); + } + + @Override + public void drawBackground(final int recipe) { + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GuiDraw.changeTexture(this.getGuiTexture()); + GuiDraw.drawTexturedModalRect(-4, -8, 1, 3, 174, 89); + } + + @Override + public String getGuiTexture() { + return RES_PATH_GUI + "basicmachines/FissionFuel.png"; + } + + @Override + public void drawExtras(final int aRecipeIndex) { + final long tEUt = ((CachedDefaultRecipe) this.arecipes.get(aRecipeIndex)).mRecipe.mEUt; + final int tDuration = ((CachedDefaultRecipe) this.arecipes.get(aRecipeIndex)).mRecipe.mDuration; + if (tEUt != 0) { + drawText(10, 90, "Total: " + MathUtils.formatNumbers((long) (tDuration * tEUt)) + " EU", -16777216); + drawText(10, 100, "Usage: " + MathUtils.formatNumbers(tEUt) + " EU/t", -16777216); + } + if (tDuration > 0) { + drawText(10, 110, "Time: " + (tDuration < 20 ? "< 1" : MathUtils.formatNumbers(Integer.valueOf(tDuration / 20))) + " secs", -16777216); + } + if ((GT_Utility.isStringValid(this.mRecipeMap.mNEISpecialValuePre)) || (GT_Utility.isStringValid(this.mRecipeMap.mNEISpecialValuePost))) { + drawText(10, 120, this.mRecipeMap.mNEISpecialValuePre + MathUtils.formatNumbers((((CachedDefaultRecipe) this.arecipes.get(aRecipeIndex)).mRecipe.mSpecialValue * this.mRecipeMap.mNEISpecialValueMultiplier)) + this.mRecipeMap.mNEISpecialValuePost, -16777216); + } + } + +} diff --git a/src/Java/gtPlusPlus/nei/NEI_GT_Config.java b/src/main/java/gtPlusPlus/nei/NEI_GT_Config.java index 07bd7ef46c..0b3cf8e66e 100644 --- a/src/Java/gtPlusPlus/nei/NEI_GT_Config.java +++ b/src/main/java/gtPlusPlus/nei/NEI_GT_Config.java @@ -2,11 +2,13 @@ package gtPlusPlus.nei; import codechicken.nei.api.API; import codechicken.nei.api.IConfigureNEI; -import gregtech.api.util.GTPP_Recipe; import gregtech.api.util.GTPP_Recipe.GTPP_Recipe_Map; +import gregtech.api.util.GTPP_Recipe.GTPP_Recipe_Map_Internal; import gregtech.api.util.GT_Recipe.GT_Recipe_Map; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; +import gtPlusPlus.core.util.Utils; +import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; public class NEI_GT_Config implements IConfigureNEI { @@ -18,7 +20,8 @@ implements IConfigureNEI { @Override public synchronized void loadConfig() { - mUniqueRecipeMapHandling.add(GTPP_Recipe.GTPP_Recipe_Map.sFissionFuelProcessing.mUnlocalizedName); + mUniqueRecipeMapHandling.add(GTPP_Recipe_Map.sFissionFuelProcessing.mUnlocalizedName); + mUniqueRecipeMapHandling.add(GTPP_Recipe_Map.sLiquidFluorineThoriumReactorRecipes.mUnlocalizedName); mUniqueRecipeMapHandling.add(GTPP_Recipe_Map.sChemicalPlantRecipes.mUnlocalizedName); mUniqueRecipeMapHandling.add(GTPP_Recipe_Map.sOreMillRecipes.mUnlocalizedName); mUniqueRecipeMapHandling.add(GTPP_Recipe_Map.sFlotationCellRecipes.mUnlocalizedName); @@ -28,27 +31,11 @@ implements IConfigureNEI { mUniqueRecipeMapHandling.add(GTPP_Recipe_Map.sMultiblockCentrifugeRecipes_GT.mUnlocalizedName); mUniqueRecipeMapHandling.add(GTPP_Recipe_Map.sMultiblockElectrolyzerRecipes_GT.mUnlocalizedName); mUniqueRecipeMapHandling.add(GTPP_Recipe_Map.sMultiblockMixerRecipes_GT.mUnlocalizedName); - - // Custom Recipe Maps - /*Logger.INFO("NEI Registration: "+CustomRecipeMap.sMappings.size()+" CustomRecipeMaps"); - for (final CustomRecipeMap tMap : CustomRecipeMap.sMappings) { - if (tMap.mNEIAllowed) { - if (!mUniqueRecipeMapHandling.contains(tMap.mUnlocalizedName)) { - Logger.INFO("NEI Registration: Registering NEI handler for "+tMap.mNEIName); - new GTPP_NEI_CustomMapHandler(tMap); - } - else { - Logger.INFO("NEI Registration: Not allowed to register NEI handler for "+tMap.mNEIName); - } - } - else { - Logger.INFO("NEI Registration: Not allowed to register NEI handler for "+tMap.mNEIName); - } - }*/ + mUniqueRecipeMapHandling.add(GTPP_Recipe_Map.sAlloyBlastSmelterRecipes.mUnlocalizedName); // Standard GT Recipe Maps - Logger.INFO("NEI Registration: "+GTPP_Recipe.GTPP_Recipe_Map_Internal.sMappingsEx.size()+" sMappingEx"); - for (final GT_Recipe_Map tMap : GTPP_Recipe.GTPP_Recipe_Map_Internal.sMappingsEx) { + Logger.INFO("NEI Registration: "+GTPP_Recipe_Map_Internal.sMappingsEx.size()+" sMappingEx"); + for (final GT_Recipe_Map tMap : GTPP_Recipe_Map_Internal.sMappingsEx) { if (tMap.mNEIAllowed) { if (!mUniqueRecipeMapHandling.contains(tMap.mUnlocalizedName)) { Logger.INFO("NEI Registration: Registering NEI handler for "+tMap.mNEIName); @@ -62,29 +49,42 @@ implements IConfigureNEI { Logger.INFO("NEI Registration: Skipping registration of NEI handler for "+tMap.mNEIName); } } - Logger.INFO("NEI Registration: Registering NEI handler for "+GTPP_Recipe.GTPP_Recipe_Map.sChemicalPlantRecipes.mNEIName); + + Logger.INFO("NEI Registration: Registering NEI handler for "+GTPP_Recipe_Map.sChemicalPlantRecipes.mNEIName); new GT_NEI_FluidReactor(); - Logger.INFO("NEI Registration: Registering NEI handler for "+GTPP_Recipe.GTPP_Recipe_Map.sOreMillRecipes.mNEIName); + Logger.INFO("NEI Registration: Registering NEI handler for "+GTPP_Recipe_Map.sOreMillRecipes.mNEIName); new GT_NEI_MillingMachine(); - Logger.INFO("NEI Registration: Registering NEI handler for "+GTPP_Recipe.GTPP_Recipe_Map.sFlotationCellRecipes.mNEIName); + Logger.INFO("NEI Registration: Registering NEI handler for "+GTPP_Recipe_Map.sFlotationCellRecipes.mNEIName); new GT_NEI_FlotationCell(); - Logger.INFO("NEI Registration: Registering NEI handler for "+GTPP_Recipe.GTPP_Recipe_Map.sVacuumFurnaceRecipes.mNEIName); - new GT_NEI_VacFurnace(); - Logger.INFO("NEI Registration: Registering NEI handler for "+GTPP_Recipe.GTPP_Recipe_Map.sFissionFuelProcessing.mNEIName); - new GT_NEI_RFPP(); - - Logger.INFO("NEI Registration: Registering NEI handler for "+GTPP_Recipe.GTPP_Recipe_Map.sAdvFreezerRecipes_GT.mNEIName); - new GT_NEI_multiCentriElectroFreezer(GTPP_Recipe.GTPP_Recipe_Map.sAdvFreezerRecipes_GT); - Logger.INFO("NEI Registration: Registering NEI handler for "+GTPP_Recipe.GTPP_Recipe_Map.sMultiblockCentrifugeRecipes_GT.mNEIName); - new GT_NEI_multiCentriElectroFreezer(GTPP_Recipe.GTPP_Recipe_Map.sMultiblockCentrifugeRecipes_GT); - Logger.INFO("NEI Registration: Registering NEI handler for "+GTPP_Recipe.GTPP_Recipe_Map.sMultiblockElectrolyzerRecipes_GT.mNEIName); - new GT_NEI_multiCentriElectroFreezer(GTPP_Recipe.GTPP_Recipe_Map.sMultiblockElectrolyzerRecipes_GT); - Logger.INFO("NEI Registration: Registering NEI handler for "+GTPP_Recipe.GTPP_Recipe_Map.sMultiblockMixerRecipes_GT.mNEIName); - new GT_NEI_multiCentriElectroFreezer(GTPP_Recipe.GTPP_Recipe_Map.sMultiblockMixerRecipes_GT); + Logger.INFO("NEI Registration: Registering NEI handler for "+GTPP_Recipe_Map.sLiquidFluorineThoriumReactorRecipes.mNEIName); + new GT_NEI_LFTR(); + Logger.INFO("NEI Registration: Registering NEI handler for "+GTPP_Recipe_Map.sFissionFuelProcessing.mNEIName); + new GT_NEI_MultiNoCell(GTPP_Recipe_Map.sFissionFuelProcessing); + Logger.INFO("NEI Registration: Registering NEI handler for "+GTPP_Recipe_Map.sVacuumFurnaceRecipes.mNEIName); + new GT_NEI_MultiNoCell(GTPP_Recipe_Map.sVacuumFurnaceRecipes); + Logger.INFO("NEI Registration: Registering NEI handler for "+GTPP_Recipe_Map.sAdvFreezerRecipes_GT.mNEIName); + new GT_NEI_MultiNoCell(GTPP_Recipe_Map.sAdvFreezerRecipes_GT); + Logger.INFO("NEI Registration: Registering NEI handler for "+GTPP_Recipe_Map.sMultiblockCentrifugeRecipes_GT.mNEIName); + new GT_NEI_MultiNoCell(GTPP_Recipe_Map.sMultiblockCentrifugeRecipes_GT); + Logger.INFO("NEI Registration: Registering NEI handler for "+GTPP_Recipe_Map.sMultiblockElectrolyzerRecipes_GT.mNEIName); + new GT_NEI_MultiNoCell(GTPP_Recipe_Map.sMultiblockElectrolyzerRecipes_GT); + Logger.INFO("NEI Registration: Registering NEI handler for "+GTPP_Recipe_Map.sMultiblockMixerRecipes_GT.mNEIName); + new GT_NEI_MultiNoCell(GTPP_Recipe_Map.sMultiblockMixerRecipes_GT); + Logger.INFO("NEI Registration: Registering NEI handler for "+GTPP_Recipe_Map.sAlloyBlastSmelterRecipes.mNEIName); + new GT_NEI_MultiNoCell(GTPP_Recipe_Map.sAlloyBlastSmelterRecipes); Logger.INFO("NEI Registration: Registering NEI handler for "+DecayableRecipeHandler.mNEIName); API.registerRecipeHandler(new DecayableRecipeHandler()); API.registerUsageHandler(new DecayableRecipeHandler()); + + Logger.INFO("NEI Registration: Registering NEI handler for "+GT_NEI_LFTR_Sparging.mNEIName); + new GT_NEI_LFTR_Sparging(); + + // Hide Flasks + if (Utils.isClient()) { + codechicken.nei.api.API.addItemListEntry(GregtechItemList.VOLUMETRIC_FLASK_8k.get(1)); + codechicken.nei.api.API.addItemListEntry(GregtechItemList.VOLUMETRIC_FLASK_32k.get(1)); + } sIsAdded = true; } diff --git a/src/Java/gtPlusPlus/nei/NEI_IMC_Sender.java b/src/main/java/gtPlusPlus/nei/NEI_IMC_Sender.java index 461678dd7a..7bc2316a04 100644 --- a/src/Java/gtPlusPlus/nei/NEI_IMC_Sender.java +++ b/src/main/java/gtPlusPlus/nei/NEI_IMC_Sender.java @@ -5,30 +5,37 @@ import net.minecraft.nbt.NBTTagCompound; public class NEI_IMC_Sender { public static void IMCSender() { - setNBTInfoAndSendIt("gtpp.recipe.alloyblastsmelter", "gregtech:gt.blockmachines:810"); + setNBTInfoAndSendIt("gtpp.recipe.alloyblastsmelter", "gregtech:gt.blockmachines:810", 1); setNBTInfoAndSendIt("gtpp.recipe.rocketenginefuel", "gregtech:gt.blockmachines:793"); setNBTInfoAndSendIt("gtpp.recipe.cyclotron", "gregtech:gt.blockmachines:828"); - setNBTInfoAndSendIt("gtpp.recipe.chemicaldehydrator", "gregtech:gt.blockmachines:911"); + setNBTInfoAndSendIt("gtpp.recipe.chemicaldehydrator", "gregtech:gt.blockmachines:911", 1); setNBTInfoAndSendIt("gtpp.recipe.slowfusionreactor", "gregtech:gt.blockmachines:31015"); setNBTInfoAndSendIt("gtpp.recipe.RTGgenerators", "gregtech:gt.blockmachines:869"); setNBTInfoAndSendIt("gtpp.recipe.cokeoven", "gregtech:gt.blockmachines:791"); setNBTInfoAndSendIt("gtpp.recipe.semifluidgeneratorfuels", "gregtech:gt.blockmachines:837"); - setNBTInfoAndSendIt("gtpp.recipe.fishpond", "gregtech:gt.blockmachines:829"); + setNBTInfoAndSendIt("gtpp.recipe.fishpond", "gregtech:gt.blockmachines:829", 1); setNBTInfoAndSendIt("gtpp.recipe.multimixer", "gregtech:gt.blockmachines:811"); setNBTInfoAndSendIt("gtpp.recipe.advanced.mixer", "gregtech:gt.blockmachines:811"); setNBTInfoAndSendIt("gtpp.recipe.cryogenicfreezer", "gregtech:gt.blockmachines:910"); - setNBTInfoAndSendIt("gtpp.recipe.fissionfuel", "gregtech:gt.blockmachines:835"); setNBTInfoAndSendIt("gtpp.recipe.geothermalfuel", "gregtech:gt.blockmachines:830"); - setNBTInfoAndSendIt("gtpp.recipe.lftr", "gregtech:gt.blockmachines:751"); - setNBTInfoAndSendIt("gtpp.recipe.lftr.2", "gregtech:gt.blockmachines:751"); setNBTInfoAndSendIt("gtpp.recipe.matterfab2", "gregtech:gt.blockmachines:799"); - setNBTInfoAndSendIt("gtpp.recipe.multicentrifuge", "gregtech:gt.blockmachines:790"); - setNBTInfoAndSendIt("gtpp.recipe.multielectro", "gregtech:gt.blockmachines:796"); + setNBTInfoAndSendIt("gtpp.recipe.multicentrifuge", "gregtech:gt.blockmachines:790", 1); + setNBTInfoAndSendIt("gtpp.recipe.multielectro", "gregtech:gt.blockmachines:796", 1); setNBTInfoAndSendIt("gtpp.recipe.simplewasher", "gregtech:gt.blockmachines:767"); - setNBTInfoAndSendIt("gtpp.recipe.vacfurnace", "gregtech:gt.blockmachines:995"); + setNBTInfoAndSendIt("gtpp.recipe.vacfurnace", "gregtech:gt.blockmachines:995", 1); + setNBTInfoAndSendIt("gtpp.recipe.fissionfuel", "gregtech:gt.blockmachines:835", 1); + setNBTInfoAndSendIt("gtpp.recipe.lftr", "gregtech:gt.blockmachines:751", 1); + setNBTInfoAndSendIt("gtpp.recipe.lftr.sparging", "gregtech:gt.blockmachines:31035", 1); + setNBTInfoAndSendIt("gtpp.recipe.coldtrap", "gregtech:gt.blockmachines:31034"); + setNBTInfoAndSendIt("gtpp.recipe.reactorprocessingunit", "gregtech:gt.blockmachines:31032"); } + private static void setNBTInfoAndSendIt(String aRecipeName, String aBlock) { + setNBTInfoAndSendIt(aRecipeName, aBlock, 2); + } + + private static void setNBTInfoAndSendIt(String aRecipeName, String aBlock, int aRecipesPerPage) { NBTTagCompound aNBT = new NBTTagCompound(); aNBT.setString("handler", aRecipeName); aNBT.setString("modName", "GT++"); @@ -38,7 +45,7 @@ public class NEI_IMC_Sender { aNBT.setInteger("yShift", 6); aNBT.setInteger("handlerHeight", 135); aNBT.setInteger("handlerWidth", 166); - aNBT.setInteger("maxRecipesPerPage", 2); + aNBT.setInteger("maxRecipesPerPage", aRecipesPerPage); FMLInterModComms.sendMessage("NotEnoughItems", "registerHandlerInfo", aNBT); } } diff --git a/src/Java/gtPlusPlus/nei/handlers/NeiTextureHandler.java b/src/main/java/gtPlusPlus/nei/handlers/NeiTextureHandler.java index 30c159ca93..30c159ca93 100644 --- a/src/Java/gtPlusPlus/nei/handlers/NeiTextureHandler.java +++ b/src/main/java/gtPlusPlus/nei/handlers/NeiTextureHandler.java diff --git a/src/Java/gtPlusPlus/plugin/agrichem/AlgaeDefinition.java b/src/main/java/gtPlusPlus/plugin/agrichem/AlgaeDefinition.java index c6e98581ff..c6e98581ff 100644 --- a/src/Java/gtPlusPlus/plugin/agrichem/AlgaeDefinition.java +++ b/src/main/java/gtPlusPlus/plugin/agrichem/AlgaeDefinition.java diff --git a/src/Java/gtPlusPlus/plugin/agrichem/AlgaeUtils.java b/src/main/java/gtPlusPlus/plugin/agrichem/AlgaeUtils.java index 73ff23888c..73ff23888c 100644 --- a/src/Java/gtPlusPlus/plugin/agrichem/AlgaeUtils.java +++ b/src/main/java/gtPlusPlus/plugin/agrichem/AlgaeUtils.java diff --git a/src/Java/gtPlusPlus/plugin/agrichem/BioRecipes.java b/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java index 077b397f88..edfd42b5ca 100644 --- a/src/Java/gtPlusPlus/plugin/agrichem/BioRecipes.java +++ b/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java @@ -23,7 +23,11 @@ import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.material.ALLOY; import gtPlusPlus.core.material.MISC_MATERIALS; import gtPlusPlus.core.recipe.common.CI; -import gtPlusPlus.core.util.minecraft.*; +import gtPlusPlus.core.util.minecraft.FluidUtils; +import gtPlusPlus.core.util.minecraft.ItemUtils; +import gtPlusPlus.core.util.minecraft.MaterialUtils; +import gtPlusPlus.core.util.minecraft.OreDictUtils; +import gtPlusPlus.core.util.minecraft.RecipeUtils; import gtPlusPlus.core.util.reflect.ReflectionUtils; import gtPlusPlus.plugin.agrichem.block.AgrichemFluids; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; @@ -128,7 +132,7 @@ public class BioRecipes { mThermalWater = FluidUtils.getFluidStack("ic2hotwater", 1).getFluid(); mAir = FluidUtils.getFluidStack("air", 1).getFluid(); mSulfuricWasteWater = FluidUtils.getFluidStack("sulfuricapatite", 1).getFluid(); - mAmmonia = MISC_MATERIALS.AMMONIA.getFluid(1).getFluid(); + mAmmonia = MISC_MATERIALS.AMMONIA.getFluidStack(1).getFluid(); mEthylene = FluidUtils.getFluidStack("ethylene", 1).getFluid(); mEthanol = FluidUtils.getFluidStack("bioethanol", 1).getFluid(); mDilutedSulfuricAcid = FluidUtils.getFluidStack("dilutedsulfuricacid", 1).getFluid(); @@ -140,8 +144,8 @@ public class BioRecipes { mStyrene = FluidUtils.getFluidStack("styrene", 1).getFluid(); mMethanol = FluidUtils.getFluidStack("methanol", 1).getFluid(); mLiquidPlastic = FluidUtils.getWildcardFluidStack("plastic", 1).getFluid(); - mCarbonDioxide = MISC_MATERIALS.CARBON_DIOXIDE.getFluid(1).getFluid(); - mCarbonMonoxide = MISC_MATERIALS.CARBON_MONOXIDE.getFluid(1).getFluid(); + mCarbonDioxide = MISC_MATERIALS.CARBON_DIOXIDE.getFluidStack(1).getFluid(); + mCarbonMonoxide = MISC_MATERIALS.CARBON_MONOXIDE.getFluidStack(1).getFluid(); mChlorine = FluidUtils.getFluidStack("chlorine", 1).getFluid(); mHydrogen = FluidUtils.getFluidStack("hydrogen", 1).getFluid(); mAceticAcid = AgrichemFluids.mAceticAcid; @@ -502,14 +506,19 @@ public class BioRecipes { 120 * 20, 60, 1); - + CORE.RA.addDehydratorRecipe( - CI.emptyCells(1), - FluidUtils.getFluidStack(mFermentationBase, 4000), + new ItemStack[] { + CI.getNumberedBioCircuit(14), + CI.emptyCells(1) + }, + FluidUtils.getFluidStack(mFermentationBase, 4000), + null, new ItemStack[] { ItemUtils.getSimpleStack(AgriculturalChem.mCompost, 1), ItemUtils.getItemStackOfAmountFromOreDict("cellAceticAcid", 1) }, + new int[] {10000, 10000}, 60 * 20, 16); diff --git a/src/Java/gtPlusPlus/plugin/agrichem/Core_Agrichem.java b/src/main/java/gtPlusPlus/plugin/agrichem/Core_Agrichem.java index 4cf31e9335..4cf31e9335 100644 --- a/src/Java/gtPlusPlus/plugin/agrichem/Core_Agrichem.java +++ b/src/main/java/gtPlusPlus/plugin/agrichem/Core_Agrichem.java diff --git a/src/Java/gtPlusPlus/plugin/agrichem/IAlgalItem.java b/src/main/java/gtPlusPlus/plugin/agrichem/IAlgalItem.java index fada07d062..fada07d062 100644 --- a/src/Java/gtPlusPlus/plugin/agrichem/IAlgalItem.java +++ b/src/main/java/gtPlusPlus/plugin/agrichem/IAlgalItem.java diff --git a/src/Java/gtPlusPlus/plugin/agrichem/block/AgrichemFluids.java b/src/main/java/gtPlusPlus/plugin/agrichem/block/AgrichemFluids.java index 039dd702da..039dd702da 100644 --- a/src/Java/gtPlusPlus/plugin/agrichem/block/AgrichemFluids.java +++ b/src/main/java/gtPlusPlus/plugin/agrichem/block/AgrichemFluids.java diff --git a/src/Java/gtPlusPlus/plugin/agrichem/fluids/FluidLoader.java b/src/main/java/gtPlusPlus/plugin/agrichem/fluids/FluidLoader.java index a60a8c09de..a60a8c09de 100644 --- a/src/Java/gtPlusPlus/plugin/agrichem/fluids/FluidLoader.java +++ b/src/main/java/gtPlusPlus/plugin/agrichem/fluids/FluidLoader.java diff --git a/src/Java/gtPlusPlus/plugin/agrichem/item/algae/ItemAgrichemBase.java b/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAgrichemBase.java index abeebc054d..abeebc054d 100644 --- a/src/Java/gtPlusPlus/plugin/agrichem/item/algae/ItemAgrichemBase.java +++ b/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAgrichemBase.java diff --git a/src/Java/gtPlusPlus/plugin/agrichem/item/algae/ItemAlgaeBase.java b/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAlgaeBase.java index 6b31a42809..6b31a42809 100644 --- a/src/Java/gtPlusPlus/plugin/agrichem/item/algae/ItemAlgaeBase.java +++ b/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAlgaeBase.java diff --git a/src/Java/gtPlusPlus/plugin/agrichem/item/algae/ItemBioChip.java b/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemBioChip.java index f876839f5f..f876839f5f 100644 --- a/src/Java/gtPlusPlus/plugin/agrichem/item/algae/ItemBioChip.java +++ b/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemBioChip.java diff --git a/src/Java/gtPlusPlus/plugin/agrichem/logic/AlgaeGeneticData.java b/src/main/java/gtPlusPlus/plugin/agrichem/logic/AlgaeGeneticData.java index dfe0f50b47..dfe0f50b47 100644 --- a/src/Java/gtPlusPlus/plugin/agrichem/logic/AlgaeGeneticData.java +++ b/src/main/java/gtPlusPlus/plugin/agrichem/logic/AlgaeGeneticData.java diff --git a/src/Java/gtPlusPlus/plugin/agrichem/logic/AlgaeGrowthRequirement.java b/src/main/java/gtPlusPlus/plugin/agrichem/logic/AlgaeGrowthRequirement.java index 6bddc9d085..6bddc9d085 100644 --- a/src/Java/gtPlusPlus/plugin/agrichem/logic/AlgaeGrowthRequirement.java +++ b/src/main/java/gtPlusPlus/plugin/agrichem/logic/AlgaeGrowthRequirement.java diff --git a/src/Java/gtPlusPlus/plugin/fishing/Core_Fishing.java b/src/main/java/gtPlusPlus/plugin/fishing/Core_Fishing.java index 48706bc986..48706bc986 100644 --- a/src/Java/gtPlusPlus/plugin/fishing/Core_Fishing.java +++ b/src/main/java/gtPlusPlus/plugin/fishing/Core_Fishing.java diff --git a/src/Java/gtPlusPlus/plugin/fishing/block/BlockFishEggs.java b/src/main/java/gtPlusPlus/plugin/fishing/block/BlockFishEggs.java index c11d4fa333..c11d4fa333 100644 --- a/src/Java/gtPlusPlus/plugin/fishing/block/BlockFishEggs.java +++ b/src/main/java/gtPlusPlus/plugin/fishing/block/BlockFishEggs.java diff --git a/src/Java/gtPlusPlus/plugin/fishing/item/BaseFish.java b/src/main/java/gtPlusPlus/plugin/fishing/item/BaseFish.java index d96d8d8cfd..d96d8d8cfd 100644 --- a/src/Java/gtPlusPlus/plugin/fishing/item/BaseFish.java +++ b/src/main/java/gtPlusPlus/plugin/fishing/item/BaseFish.java diff --git a/src/Java/gtPlusPlus/plugin/fishing/misc/BaseFishTypes.java b/src/main/java/gtPlusPlus/plugin/fishing/misc/BaseFishTypes.java index ea8d04b5d3..ea8d04b5d3 100644 --- a/src/Java/gtPlusPlus/plugin/fishing/misc/BaseFishTypes.java +++ b/src/main/java/gtPlusPlus/plugin/fishing/misc/BaseFishTypes.java diff --git a/src/Java/gtPlusPlus/plugin/fixes/interfaces/IBugFix.java b/src/main/java/gtPlusPlus/plugin/fixes/interfaces/IBugFix.java index d67ff24d7b..d67ff24d7b 100644 --- a/src/Java/gtPlusPlus/plugin/fixes/interfaces/IBugFix.java +++ b/src/main/java/gtPlusPlus/plugin/fixes/interfaces/IBugFix.java diff --git a/src/Java/gtPlusPlus/plugin/fixes/vanilla/Core_VanillaFixes.java b/src/main/java/gtPlusPlus/plugin/fixes/vanilla/Core_VanillaFixes.java index 2bfd05e5be..2bfd05e5be 100644 --- a/src/Java/gtPlusPlus/plugin/fixes/vanilla/Core_VanillaFixes.java +++ b/src/main/java/gtPlusPlus/plugin/fixes/vanilla/Core_VanillaFixes.java diff --git a/src/Java/gtPlusPlus/plugin/fixes/vanilla/VanillaBackgroundMusicFix.java b/src/main/java/gtPlusPlus/plugin/fixes/vanilla/VanillaBackgroundMusicFix.java index bfd73407f7..bfd73407f7 100644 --- a/src/Java/gtPlusPlus/plugin/fixes/vanilla/VanillaBackgroundMusicFix.java +++ b/src/main/java/gtPlusPlus/plugin/fixes/vanilla/VanillaBackgroundMusicFix.java diff --git a/src/Java/gtPlusPlus/plugin/fixes/vanilla/VanillaBedHeightFix.java b/src/main/java/gtPlusPlus/plugin/fixes/vanilla/VanillaBedHeightFix.java index f33cc71fc6..f33cc71fc6 100644 --- a/src/Java/gtPlusPlus/plugin/fixes/vanilla/VanillaBedHeightFix.java +++ b/src/main/java/gtPlusPlus/plugin/fixes/vanilla/VanillaBedHeightFix.java diff --git a/src/Java/gtPlusPlus/plugin/fixes/vanilla/music/MusicTocker.java b/src/main/java/gtPlusPlus/plugin/fixes/vanilla/music/MusicTocker.java index 452c902e05..452c902e05 100644 --- a/src/Java/gtPlusPlus/plugin/fixes/vanilla/music/MusicTocker.java +++ b/src/main/java/gtPlusPlus/plugin/fixes/vanilla/music/MusicTocker.java diff --git a/src/Java/gtPlusPlus/plugin/manager/Core_Manager.java b/src/main/java/gtPlusPlus/plugin/manager/Core_Manager.java index 45e85d68ac..45e85d68ac 100644 --- a/src/Java/gtPlusPlus/plugin/manager/Core_Manager.java +++ b/src/main/java/gtPlusPlus/plugin/manager/Core_Manager.java diff --git a/src/Java/gtPlusPlus/plugin/sulfurchem/Core_SulfuricChemistry.java b/src/main/java/gtPlusPlus/plugin/sulfurchem/Core_SulfuricChemistry.java index ed6762c69d..ed6762c69d 100644 --- a/src/Java/gtPlusPlus/plugin/sulfurchem/Core_SulfuricChemistry.java +++ b/src/main/java/gtPlusPlus/plugin/sulfurchem/Core_SulfuricChemistry.java diff --git a/src/Java/gtPlusPlus/plugin/villagers/Core_VillagerAdditions.java b/src/main/java/gtPlusPlus/plugin/villagers/Core_VillagerAdditions.java index 09e4c4865f..09e4c4865f 100644 --- a/src/Java/gtPlusPlus/plugin/villagers/Core_VillagerAdditions.java +++ b/src/main/java/gtPlusPlus/plugin/villagers/Core_VillagerAdditions.java diff --git a/src/Java/gtPlusPlus/plugin/villagers/NameLists.java b/src/main/java/gtPlusPlus/plugin/villagers/NameLists.java index 227e786aa5..e9cd254503 100644 --- a/src/Java/gtPlusPlus/plugin/villagers/NameLists.java +++ b/src/main/java/gtPlusPlus/plugin/villagers/NameLists.java @@ -87,7 +87,7 @@ public class NameLists { "Dante", "Danyal", "Danyil", "Danys", "Daood", "Dara", "Darach", "Daragh", "Darcy", "D'arcy", "Dareh", "Daren", "Darien", "Darius", "Darl", "Darn", "Darrach", "Darragh", "Darrel", "Darrell", "Darren", "Darrie", "Darrius", "Darroch", "Darryl", "Darryn", "Darwyn", "Daryl", "Daryn", "Daud", "Daumantas", "Davi", "David", - "David-Jay", "David-Lee", "Davie", "Davis", "Davy", "Dawid", "Dawson", "Dawud", "Dawûd", "Dayem", "Daymian", + "David-Jay", "David-Lee", "Davie", "Davis", "Davy", "Dawid", "Dawson", "Dawud", "Dayem", "Daymian", "Deacon", "Deagan", "Dean", "Deano", "Decklan", "Declain", "Declan", "Declyan", "Declyn", "Dedeniseoluwa", "Deecan", "Deegan", "Deelan", "Deklain-Jaimes", "Del", "Demetrius", "Denis", "Deniss", "Dennan", "Dennin", "Dennis", "Denny", "Dennys", "Denon", "Denton", "Denver", "Denzel", "Deon", "Derek", "Derick", "Derin", diff --git a/src/Java/gtPlusPlus/plugin/villagers/VillagerEventHandler.java b/src/main/java/gtPlusPlus/plugin/villagers/VillagerEventHandler.java index b515f0979e..b515f0979e 100644 --- a/src/Java/gtPlusPlus/plugin/villagers/VillagerEventHandler.java +++ b/src/main/java/gtPlusPlus/plugin/villagers/VillagerEventHandler.java diff --git a/src/Java/gtPlusPlus/plugin/villagers/VillagerObject.java b/src/main/java/gtPlusPlus/plugin/villagers/VillagerObject.java index a5587a1b52..a5587a1b52 100644 --- a/src/Java/gtPlusPlus/plugin/villagers/VillagerObject.java +++ b/src/main/java/gtPlusPlus/plugin/villagers/VillagerObject.java diff --git a/src/Java/gtPlusPlus/plugin/villagers/VillagerUtils.java b/src/main/java/gtPlusPlus/plugin/villagers/VillagerUtils.java index f252ad068d..f252ad068d 100644 --- a/src/Java/gtPlusPlus/plugin/villagers/VillagerUtils.java +++ b/src/main/java/gtPlusPlus/plugin/villagers/VillagerUtils.java diff --git a/src/Java/gtPlusPlus/plugin/villagers/block/BlockGenericSpawner.java b/src/main/java/gtPlusPlus/plugin/villagers/block/BlockGenericSpawner.java index 916f360012..916f360012 100644 --- a/src/Java/gtPlusPlus/plugin/villagers/block/BlockGenericSpawner.java +++ b/src/main/java/gtPlusPlus/plugin/villagers/block/BlockGenericSpawner.java diff --git a/src/Java/gtPlusPlus/plugin/villagers/entity/EntityBaseVillager.java b/src/main/java/gtPlusPlus/plugin/villagers/entity/EntityBaseVillager.java index c29aadb16b..c29aadb16b 100644 --- a/src/Java/gtPlusPlus/plugin/villagers/entity/EntityBaseVillager.java +++ b/src/main/java/gtPlusPlus/plugin/villagers/entity/EntityBaseVillager.java diff --git a/src/Java/gtPlusPlus/plugin/villagers/entity/EntityNativeAustralian.java b/src/main/java/gtPlusPlus/plugin/villagers/entity/EntityNativeAustralian.java index 4f9e2954a4..4f9e2954a4 100644 --- a/src/Java/gtPlusPlus/plugin/villagers/entity/EntityNativeAustralian.java +++ b/src/main/java/gtPlusPlus/plugin/villagers/entity/EntityNativeAustralian.java diff --git a/src/Java/gtPlusPlus/plugin/villagers/entity/trade/BaseVillagerTrade.java b/src/main/java/gtPlusPlus/plugin/villagers/entity/trade/BaseVillagerTrade.java index 61db98e803..61db98e803 100644 --- a/src/Java/gtPlusPlus/plugin/villagers/entity/trade/BaseVillagerTrade.java +++ b/src/main/java/gtPlusPlus/plugin/villagers/entity/trade/BaseVillagerTrade.java diff --git a/src/Java/gtPlusPlus/plugin/villagers/tile/MobSpawnerCustomLogic.java b/src/main/java/gtPlusPlus/plugin/villagers/tile/MobSpawnerCustomLogic.java index 28416793f5..28416793f5 100644 --- a/src/Java/gtPlusPlus/plugin/villagers/tile/MobSpawnerCustomLogic.java +++ b/src/main/java/gtPlusPlus/plugin/villagers/tile/MobSpawnerCustomLogic.java diff --git a/src/Java/gtPlusPlus/plugin/villagers/tile/TileEntityGenericSpawner.java b/src/main/java/gtPlusPlus/plugin/villagers/tile/TileEntityGenericSpawner.java index 45b8c9941b..45b8c9941b 100644 --- a/src/Java/gtPlusPlus/plugin/villagers/tile/TileEntityGenericSpawner.java +++ b/src/main/java/gtPlusPlus/plugin/villagers/tile/TileEntityGenericSpawner.java diff --git a/src/Java/gtPlusPlus/plugin/villagers/trade/TradeHandlerAboriginal.java b/src/main/java/gtPlusPlus/plugin/villagers/trade/TradeHandlerAboriginal.java index 3baca10792..3baca10792 100644 --- a/src/Java/gtPlusPlus/plugin/villagers/trade/TradeHandlerAboriginal.java +++ b/src/main/java/gtPlusPlus/plugin/villagers/trade/TradeHandlerAboriginal.java diff --git a/src/Java/gtPlusPlus/plugin/villagers/trade/TradeHandlerBanker.java b/src/main/java/gtPlusPlus/plugin/villagers/trade/TradeHandlerBanker.java index 215dc0683b..215dc0683b 100644 --- a/src/Java/gtPlusPlus/plugin/villagers/trade/TradeHandlerBanker.java +++ b/src/main/java/gtPlusPlus/plugin/villagers/trade/TradeHandlerBanker.java diff --git a/src/Java/gtPlusPlus/plugin/villagers/trade/TradeHandlerBase.java b/src/main/java/gtPlusPlus/plugin/villagers/trade/TradeHandlerBase.java index b726ebefff..b726ebefff 100644 --- a/src/Java/gtPlusPlus/plugin/villagers/trade/TradeHandlerBase.java +++ b/src/main/java/gtPlusPlus/plugin/villagers/trade/TradeHandlerBase.java diff --git a/src/Java/gtPlusPlus/plugin/villagers/trade/TradeHandlerTechnician.java b/src/main/java/gtPlusPlus/plugin/villagers/trade/TradeHandlerTechnician.java index 922316b136..922316b136 100644 --- a/src/Java/gtPlusPlus/plugin/villagers/trade/TradeHandlerTechnician.java +++ b/src/main/java/gtPlusPlus/plugin/villagers/trade/TradeHandlerTechnician.java diff --git a/src/Java/gtPlusPlus/plugin/villagers/trade/TradeHandlerTrader.java b/src/main/java/gtPlusPlus/plugin/villagers/trade/TradeHandlerTrader.java index 0025c054bd..0025c054bd 100644 --- a/src/Java/gtPlusPlus/plugin/villagers/trade/TradeHandlerTrader.java +++ b/src/main/java/gtPlusPlus/plugin/villagers/trade/TradeHandlerTrader.java diff --git a/src/Java/gtPlusPlus/plugin/waila/Core_WailaPlugin.java b/src/main/java/gtPlusPlus/plugin/waila/Core_WailaPlugin.java index 3317ef6a11..3317ef6a11 100644 --- a/src/Java/gtPlusPlus/plugin/waila/Core_WailaPlugin.java +++ b/src/main/java/gtPlusPlus/plugin/waila/Core_WailaPlugin.java diff --git a/src/Java/gtPlusPlus/preloader/CORE_Preloader.java b/src/main/java/gtPlusPlus/preloader/CORE_Preloader.java index 49209307f7..49209307f7 100644 --- a/src/Java/gtPlusPlus/preloader/CORE_Preloader.java +++ b/src/main/java/gtPlusPlus/preloader/CORE_Preloader.java diff --git a/src/Java/gtPlusPlus/preloader/ChunkDebugger.java b/src/main/java/gtPlusPlus/preloader/ChunkDebugger.java index 06964d31fa..06964d31fa 100644 --- a/src/Java/gtPlusPlus/preloader/ChunkDebugger.java +++ b/src/main/java/gtPlusPlus/preloader/ChunkDebugger.java diff --git a/src/Java/gtPlusPlus/preloader/CustomClassLoader.java b/src/main/java/gtPlusPlus/preloader/CustomClassLoader.java index 56394c11f0..56394c11f0 100644 --- a/src/Java/gtPlusPlus/preloader/CustomClassLoader.java +++ b/src/main/java/gtPlusPlus/preloader/CustomClassLoader.java diff --git a/src/Java/gtPlusPlus/preloader/DevHelper.java b/src/main/java/gtPlusPlus/preloader/DevHelper.java index 70a3c53073..70a3c53073 100644 --- a/src/Java/gtPlusPlus/preloader/DevHelper.java +++ b/src/main/java/gtPlusPlus/preloader/DevHelper.java diff --git a/src/Java/gtPlusPlus/preloader/Preloader_GT_OreDict.java b/src/main/java/gtPlusPlus/preloader/Preloader_GT_OreDict.java index 8e7001903d..8e7001903d 100644 --- a/src/Java/gtPlusPlus/preloader/Preloader_GT_OreDict.java +++ b/src/main/java/gtPlusPlus/preloader/Preloader_GT_OreDict.java diff --git a/src/Java/gtPlusPlus/preloader/Preloader_Logger.java b/src/main/java/gtPlusPlus/preloader/Preloader_Logger.java index 84f0fab012..84f0fab012 100644 --- a/src/Java/gtPlusPlus/preloader/Preloader_Logger.java +++ b/src/main/java/gtPlusPlus/preloader/Preloader_Logger.java diff --git a/src/Java/gtPlusPlus/preloader/asm/AsmConfig.java b/src/main/java/gtPlusPlus/preloader/asm/AsmConfig.java index a5981b15d9..a5981b15d9 100644 --- a/src/Java/gtPlusPlus/preloader/asm/AsmConfig.java +++ b/src/main/java/gtPlusPlus/preloader/asm/AsmConfig.java diff --git a/src/Java/gtPlusPlus/preloader/asm/ClassesToTransform.java b/src/main/java/gtPlusPlus/preloader/asm/ClassesToTransform.java index 1dcbff439f..1dcbff439f 100644 --- a/src/Java/gtPlusPlus/preloader/asm/ClassesToTransform.java +++ b/src/main/java/gtPlusPlus/preloader/asm/ClassesToTransform.java diff --git a/src/Java/gtPlusPlus/preloader/asm/Preloader_DummyContainer.java b/src/main/java/gtPlusPlus/preloader/asm/Preloader_DummyContainer.java index 2a0082754a..2a0082754a 100644 --- a/src/Java/gtPlusPlus/preloader/asm/Preloader_DummyContainer.java +++ b/src/main/java/gtPlusPlus/preloader/asm/Preloader_DummyContainer.java diff --git a/src/Java/gtPlusPlus/preloader/asm/Preloader_FMLLoadingPlugin.java b/src/main/java/gtPlusPlus/preloader/asm/Preloader_FMLLoadingPlugin.java index 8aa449df5d..b52f4eb67e 100644 --- a/src/Java/gtPlusPlus/preloader/asm/Preloader_FMLLoadingPlugin.java +++ b/src/main/java/gtPlusPlus/preloader/asm/Preloader_FMLLoadingPlugin.java @@ -1,11 +1,14 @@ package gtPlusPlus.preloader.asm; import java.io.File; +import java.text.NumberFormat; +import java.util.Locale; import java.util.Map; import cpw.mods.fml.relauncher.IFMLLoadingPlugin; import cpw.mods.fml.relauncher.IFMLLoadingPlugin.MCVersion; import cpw.mods.fml.relauncher.IFMLLoadingPlugin.SortingIndex; +import gtPlusPlus.core.util.reflect.ReflectionUtils; import gtPlusPlus.preloader.CORE_Preloader; import gtPlusPlus.preloader.Preloader_Logger; import gtPlusPlus.preloader.asm.transformers.Preloader_Transformer_Handler; @@ -71,6 +74,11 @@ public class Preloader_FMLLoadingPlugin implements IFMLLoadingPlugin { CORE_Preloader.DEV_ENVIRONMENT = (Boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment"); CORE_Preloader.DEBUG_MODE = AsmConfig.debugMode; Preloader_Logger.INFO("Running on "+gtPlusPlus.preloader.CORE_Preloader.JAVA_VERSION+" | Development Environment: "+CORE_Preloader.DEV_ENVIRONMENT); + Locale aDefaultLocale = Locale.getDefault(); + NumberFormat aFormat = NumberFormat.getInstance(); + Locale aDisplayLocale = ReflectionUtils.getFieldValue(ReflectionUtils.getField(Locale.class, "defaultDisplayLocale")); + Locale aFormatLocale = ReflectionUtils.getFieldValue(ReflectionUtils.getField(Locale.class, "defaultFormatLocale")); + Preloader_Logger.INFO("Locale: "+aDefaultLocale+" | Test: "+aFormat.format(1000000000)+" | Display: "+aDisplayLocale+" | Format: "+aFormatLocale); } }
\ No newline at end of file diff --git a/src/Java/gtPlusPlus/preloader/asm/Preloader_SetupClass.java b/src/main/java/gtPlusPlus/preloader/asm/Preloader_SetupClass.java index a6d2b6c863..a6d2b6c863 100644 --- a/src/Java/gtPlusPlus/preloader/asm/Preloader_SetupClass.java +++ b/src/main/java/gtPlusPlus/preloader/asm/Preloader_SetupClass.java diff --git a/src/Java/gtPlusPlus/preloader/asm/helpers/MethodHelper_CC.java b/src/main/java/gtPlusPlus/preloader/asm/helpers/MethodHelper_CC.java index 664ffe7b2d..664ffe7b2d 100644 --- a/src/Java/gtPlusPlus/preloader/asm/helpers/MethodHelper_CC.java +++ b/src/main/java/gtPlusPlus/preloader/asm/helpers/MethodHelper_CC.java diff --git a/src/Java/gtPlusPlus/preloader/asm/helpers/MethodHelper_GT.java b/src/main/java/gtPlusPlus/preloader/asm/helpers/MethodHelper_GT.java index 8120df81fa..8120df81fa 100644 --- a/src/Java/gtPlusPlus/preloader/asm/helpers/MethodHelper_GT.java +++ b/src/main/java/gtPlusPlus/preloader/asm/helpers/MethodHelper_GT.java diff --git a/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_CC_GuiContainerManager.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_CC_GuiContainerManager.java index 8791d401c8..8791d401c8 100644 --- a/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_CC_GuiContainerManager.java +++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_CC_GuiContainerManager.java diff --git a/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_COFH_OreDictionaryArbiter.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_COFH_OreDictionaryArbiter.java index 6f08dc4ff5..6f08dc4ff5 100644 --- a/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_COFH_OreDictionaryArbiter.java +++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_COFH_OreDictionaryArbiter.java diff --git a/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_Forge_ChunkLoading.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_Forge_ChunkLoading.java index 19648ae60c..19648ae60c 100644 --- a/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_Forge_ChunkLoading.java +++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_Forge_ChunkLoading.java diff --git a/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_Forge_EntityLivingBase_SetHealth.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_Forge_EntityLivingBase_SetHealth.java index d56b9de059..d56b9de059 100644 --- a/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_Forge_EntityLivingBase_SetHealth.java +++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_Forge_EntityLivingBase_SetHealth.java diff --git a/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GC_EntityAutoRocket.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GC_EntityAutoRocket.java index 1e58cbbe9b..1e58cbbe9b 100644 --- a/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GC_EntityAutoRocket.java +++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GC_EntityAutoRocket.java diff --git a/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GC_FluidUtil.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GC_FluidUtil.java index 13681e7e3a..13681e7e3a 100644 --- a/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GC_FluidUtil.java +++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GC_FluidUtil.java diff --git a/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GC_FuelLoader.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GC_FuelLoader.java index 5ef5b75505..5ef5b75505 100644 --- a/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GC_FuelLoader.java +++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GC_FuelLoader.java diff --git a/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_Achievements.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_Achievements.java index 2b9729a8a3..2b9729a8a3 100644 --- a/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_Achievements.java +++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_Achievements.java diff --git a/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_Achievements_CrashFix.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_Achievements_CrashFix.java index fb297ed76e..fb297ed76e 100644 --- a/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_Achievements_CrashFix.java +++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_Achievements_CrashFix.java diff --git a/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_BaseMetaTileEntity.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_BaseMetaTileEntity.java index da5859eb55..da5859eb55 100644 --- a/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_BaseMetaTileEntity.java +++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_BaseMetaTileEntity.java diff --git a/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_BlockMachines_MetaPipeEntity.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_BlockMachines_MetaPipeEntity.java index dce1fa15d2..dce1fa15d2 100644 --- a/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_BlockMachines_MetaPipeEntity.java +++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_BlockMachines_MetaPipeEntity.java diff --git a/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_BlockMachines_NBT.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_BlockMachines_NBT.java index 349bdc3e88..349bdc3e88 100644 --- a/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_BlockMachines_NBT.java +++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_BlockMachines_NBT.java diff --git a/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_CharcoalPit.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_CharcoalPit.java index 1e54bd3632..1e54bd3632 100644 --- a/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_CharcoalPit.java +++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_CharcoalPit.java diff --git a/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_Client.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_Client.java index e2d34c38e7..e2d34c38e7 100644 --- a/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_Client.java +++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_Client.java diff --git a/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_EnergyHatchPatch.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_EnergyHatchPatch.java index 83560eb6c3..83560eb6c3 100644 --- a/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_EnergyHatchPatch.java +++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_EnergyHatchPatch.java diff --git a/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_ItemMachines_Tooltip.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_ItemMachines_Tooltip.java index 4b2a10df07..4b2a10df07 100644 --- a/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_ItemMachines_Tooltip.java +++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_ItemMachines_Tooltip.java diff --git a/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_MetaGenerated_Tool.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_MetaGenerated_Tool.java index b6cd9c8d67..b6cd9c8d67 100644 --- a/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_MetaGenerated_Tool.java +++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_MetaGenerated_Tool.java diff --git a/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_Packet_TileEntity.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_Packet_TileEntity.java index 1f281ce492..1f281ce492 100644 --- a/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_Packet_TileEntity.java +++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_Packet_TileEntity.java diff --git a/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_Utility.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_Utility.java index fa711e5693..fa711e5693 100644 --- a/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_Utility.java +++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GT_Utility.java diff --git a/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_IC2_GetHarvestTool.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_IC2_GetHarvestTool.java index 6aad6831cb..6aad6831cb 100644 --- a/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_IC2_GetHarvestTool.java +++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_IC2_GetHarvestTool.java diff --git a/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_IC2_Hazmat.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_IC2_Hazmat.java index 10f04e7a48..10f04e7a48 100644 --- a/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_IC2_Hazmat.java +++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_IC2_Hazmat.java diff --git a/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_LWJGL_Keyboard.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_LWJGL_Keyboard.java index 3ec4426ec1..3ec4426ec1 100644 --- a/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_LWJGL_Keyboard.java +++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_LWJGL_Keyboard.java diff --git a/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_Railcraft_FluidCartHandling.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_Railcraft_FluidCartHandling.java index bf71582ae7..bf71582ae7 100644 --- a/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_Railcraft_FluidCartHandling.java +++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_Railcraft_FluidCartHandling.java diff --git a/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_Railcraft_FluidHelper.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_Railcraft_FluidHelper.java index 1249df0777..1249df0777 100644 --- a/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_Railcraft_FluidHelper.java +++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_Railcraft_FluidHelper.java diff --git a/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_Railcraft_InvTools.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_Railcraft_InvTools.java index 75896c1c0f..75896c1c0f 100644 --- a/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_Railcraft_InvTools.java +++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_Railcraft_InvTools.java diff --git a/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TC_ItemWispEssence.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TC_ItemWispEssence.java index 8f65709478..8f65709478 100644 --- a/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TC_ItemWispEssence.java +++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TC_ItemWispEssence.java diff --git a/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TT_ThaumicRestorer.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TT_ThaumicRestorer.java index 05b8054ff8..86a22ce4b9 100644 --- a/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TT_ThaumicRestorer.java +++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TT_ThaumicRestorer.java @@ -82,7 +82,7 @@ public class ClassTransformer_TT_ThaumicRestorer { mTookLastTick = ReflectionUtils.getField(mTileRepairerClass, "tookLastTick"); mDamageLastTick = ReflectionUtils.getField(mTileRepairerClass, "dmgLastTick"); mProxyTC = ReflectionUtils.getField(mThaumicTinkerer, "tcProxy"); - repairTConTools = (boolean) ReflectionUtils.getFieldValue(mRepairTiconTools); + repairTConTools = ReflectionUtils.getFieldValue(mRepairTiconTools); mInit = true; } if (mInit) { diff --git a/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TiConFluids.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TiConFluids.java index 083041050d..083041050d 100644 --- a/src/Java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TiConFluids.java +++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TiConFluids.java diff --git a/src/Java/gtPlusPlus/preloader/asm/transformers/Preloader_ClassTransformer.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_ClassTransformer.java index 05a476c1c8..05a476c1c8 100644 --- a/src/Java/gtPlusPlus/preloader/asm/transformers/Preloader_ClassTransformer.java +++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_ClassTransformer.java diff --git a/src/Java/gtPlusPlus/preloader/asm/transformers/Preloader_ClassTransformer2.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_ClassTransformer2.java index 443337bd35..443337bd35 100644 --- a/src/Java/gtPlusPlus/preloader/asm/transformers/Preloader_ClassTransformer2.java +++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_ClassTransformer2.java diff --git a/src/Java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java index 698edf0b56..5cb2eef066 100644 --- a/src/Java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java +++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java @@ -122,8 +122,8 @@ public class Preloader_Transformer_Handler implements IClassTransformer { // Log Handling of CodeChicken if (transformedName.equals("codechicken.nei.guihook.GuiContainerManager")) { - Preloader_Logger.INFO("CodeChicken GuiContainerManager Patch", "Transforming "+transformedName); - return new ClassTransformer_CC_GuiContainerManager(basicClass).getWriter().toByteArray(); + //Preloader_Logger.INFO("CodeChicken GuiContainerManager Patch", "Transforming "+transformedName); + //return new ClassTransformer_CC_GuiContainerManager(basicClass).getWriter().toByteArray(); } // Fix the OreDictionary COFH if (transformedName.equals(COFH_ORE_DICTIONARY_ARBITER) && (AsmConfig.enableCofhPatch || !obfuscated)) { @@ -223,8 +223,8 @@ public class Preloader_Transformer_Handler implements IClassTransformer { //Patching Meta Tile Tooltips if (transformedName.equals(GT_ITEM_MACHINES) && AsmConfig.enableGtTooltipFix) { - Preloader_Logger.INFO("Gregtech Tooltip Patch", "Transforming "+transformedName); - return new ClassTransformer_GT_ItemMachines_Tooltip(basicClass, false).getWriter().toByteArray(); + //Preloader_Logger.INFO("Gregtech Tooltip Patch", "Transforming "+transformedName); + //return new ClassTransformer_GT_ItemMachines_Tooltip(basicClass, false).getWriter().toByteArray(); } diff --git a/src/Java/gtPlusPlus/preloader/keyboard/BetterKeyboard.java b/src/main/java/gtPlusPlus/preloader/keyboard/BetterKeyboard.java index e25c06653c..532d20f1b2 100644 --- a/src/Java/gtPlusPlus/preloader/keyboard/BetterKeyboard.java +++ b/src/main/java/gtPlusPlus/preloader/keyboard/BetterKeyboard.java @@ -68,7 +68,7 @@ public class BetterKeyboard { Field aKeyNameSize = ReflectionUtils.getField(Keyboard.class, "keyName"); Field aKeyMapSize = ReflectionUtils.getField(Keyboard.class, "keyMap"); Field aKeyDownBuffer = ReflectionUtils.getField(Keyboard.class, "keyDownBuffer"); - String[] aOldKeyNameArray = (String[]) ReflectionUtils.getFieldValue(aKeyNameSize); + String[] aOldKeyNameArray = ReflectionUtils.getFieldValue(aKeyNameSize); if (aOldKeyNameArray != null && aOldKeyNameArray.length < Short.MAX_VALUE) { String[] aNewKeyNameArray = new String[Short.MAX_VALUE]; for (int i=0;i<aOldKeyNameArray.length;i++) { @@ -82,7 +82,7 @@ public class BetterKeyboard { FMLRelaunchLog.log("[GT++ ASM] LWJGL Keybinding index out of bounds fix", Level.INFO, "Failed Patching Field: "+aKeyDownBuffer.getName()); } } - Map<String, Integer> aOldKeyMapArray = (Map<String, Integer>) ReflectionUtils.getFieldValue(aKeyMapSize); + Map<String, Integer> aOldKeyMapArray = ReflectionUtils.getFieldValue(aKeyMapSize); if (aOldKeyNameArray != null && aOldKeyMapArray.size() < Short.MAX_VALUE) { Map<String, Integer> aNewKeyMapArray = new HashMap<String, Integer>(Short.MAX_VALUE); aNewKeyMapArray.putAll(aOldKeyMapArray); @@ -94,7 +94,7 @@ public class BetterKeyboard { FMLRelaunchLog.log("[GT++ ASM] LWJGL Keybinding index out of bounds fix", Level.INFO, "Failed Patching Field: "+aKeyDownBuffer.getName()); } } - ByteBuffer aOldByteBuffer = (ByteBuffer) ReflectionUtils.getFieldValue(aKeyDownBuffer); + ByteBuffer aOldByteBuffer = ReflectionUtils.getFieldValue(aKeyDownBuffer); if (aOldByteBuffer != null && aOldByteBuffer.capacity() == Keyboard.KEYBOARD_SIZE) { ByteBuffer aNewByteBuffer = BufferUtils.createByteBuffer(Short.MAX_VALUE); try { diff --git a/src/Java/gtPlusPlus/xmod/bartcrops/HANDLER_CropsPlusPlus.java b/src/main/java/gtPlusPlus/xmod/bartcrops/HANDLER_CropsPlusPlus.java index ce7d919431..ce7d919431 100644 --- a/src/Java/gtPlusPlus/xmod/bartcrops/HANDLER_CropsPlusPlus.java +++ b/src/main/java/gtPlusPlus/xmod/bartcrops/HANDLER_CropsPlusPlus.java diff --git a/src/Java/gtPlusPlus/xmod/bartcrops/LoaderOfTheCrops.java b/src/main/java/gtPlusPlus/xmod/bartcrops/LoaderOfTheCrops.java index 48813310d2..48813310d2 100644 --- a/src/Java/gtPlusPlus/xmod/bartcrops/LoaderOfTheCrops.java +++ b/src/main/java/gtPlusPlus/xmod/bartcrops/LoaderOfTheCrops.java diff --git a/src/Java/gtPlusPlus/xmod/bartcrops/abstracts/BaseAestheticCrop.java b/src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseAestheticCrop.java index f62b429acb..f62b429acb 100644 --- a/src/Java/gtPlusPlus/xmod/bartcrops/abstracts/BaseAestheticCrop.java +++ b/src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseAestheticCrop.java diff --git a/src/Java/gtPlusPlus/xmod/bartcrops/abstracts/BaseCrop.java b/src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseCrop.java index ca2a044564..ca2a044564 100644 --- a/src/Java/gtPlusPlus/xmod/bartcrops/abstracts/BaseCrop.java +++ b/src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseCrop.java diff --git a/src/Java/gtPlusPlus/xmod/bartcrops/abstracts/BaseHarvestableCrop.java b/src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseHarvestableCrop.java index e877233c67..e877233c67 100644 --- a/src/Java/gtPlusPlus/xmod/bartcrops/abstracts/BaseHarvestableCrop.java +++ b/src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseHarvestableCrop.java diff --git a/src/Java/gtPlusPlus/xmod/bartcrops/crops/Crop_Hemp.java b/src/main/java/gtPlusPlus/xmod/bartcrops/crops/Crop_Hemp.java index 95e2766aae..95e2766aae 100644 --- a/src/Java/gtPlusPlus/xmod/bartcrops/crops/Crop_Hemp.java +++ b/src/main/java/gtPlusPlus/xmod/bartcrops/crops/Crop_Hemp.java diff --git a/src/Java/gtPlusPlus/xmod/bop/HANDLER_BiomesOPlenty.java b/src/main/java/gtPlusPlus/xmod/bop/HANDLER_BiomesOPlenty.java index 95067300c8..52f498988c 100644 --- a/src/Java/gtPlusPlus/xmod/bop/HANDLER_BiomesOPlenty.java +++ b/src/main/java/gtPlusPlus/xmod/bop/HANDLER_BiomesOPlenty.java @@ -91,7 +91,7 @@ public class HANDLER_BiomesOPlenty { Field aBopColouredSapling = ReflectionUtils.getField(ReflectionUtils.getClass("biomesoplenty.api.content.BOPCBlocks"), "colorizedSaplings"); if (aBopMiscItem != null) { - Item aMiscItem = (Item) ReflectionUtils.getFieldValue(aBopMiscItem); + Item aMiscItem = ReflectionUtils.getFieldValue(aBopMiscItem); if (aMiscItem != null) { mPineCone = aMiscItem; } @@ -99,25 +99,25 @@ public class HANDLER_BiomesOPlenty { if (aBopBlock1 != null) { - Block aBlock = (Block) ReflectionUtils.getFieldValue(aBopBlock1); + Block aBlock = ReflectionUtils.getFieldValue(aBopBlock1); if (aBlock != null) { logs1 = aBlock; } } if (aBopBlock2 != null) { - Block aBlock = (Block) ReflectionUtils.getFieldValue(aBopBlock2); + Block aBlock = ReflectionUtils.getFieldValue(aBopBlock2); if (aBlock != null) { logs2 = aBlock; } } if (aBopBlock3 != null) { - Block aBlock = (Block) ReflectionUtils.getFieldValue(aBopBlock3); + Block aBlock = ReflectionUtils.getFieldValue(aBopBlock3); if (aBlock != null) { logs3 = aBlock; } } if (aBopBlock4 != null) { - Block aBlock = (Block) ReflectionUtils.getFieldValue(aBopBlock4); + Block aBlock = ReflectionUtils.getFieldValue(aBopBlock4); if (aBlock != null) { logs4 = aBlock; } @@ -125,25 +125,25 @@ public class HANDLER_BiomesOPlenty { if (aBopLeaves1 != null) { - Block aBlock = (Block) ReflectionUtils.getFieldValue(aBopLeaves1); + Block aBlock = ReflectionUtils.getFieldValue(aBopLeaves1); if (aBlock != null) { leaves1 = aBlock; } } if (aBopLeaves2 != null) { - Block aBlock = (Block) ReflectionUtils.getFieldValue(aBopLeaves2); + Block aBlock = ReflectionUtils.getFieldValue(aBopLeaves2); if (aBlock != null) { leaves2 = aBlock; } } if (aBopLeaves3 != null) { - Block aBlock = (Block) ReflectionUtils.getFieldValue(aBopLeaves3); + Block aBlock = ReflectionUtils.getFieldValue(aBopLeaves3); if (aBlock != null) { leaves3 = aBlock; } } if (aBopLeaves4 != null) { - Block aBlock = (Block) ReflectionUtils.getFieldValue(aBopLeaves4); + Block aBlock = ReflectionUtils.getFieldValue(aBopLeaves4); if (aBlock != null) { leaves4 = aBlock; } @@ -151,13 +151,13 @@ public class HANDLER_BiomesOPlenty { if (aBopColouredLeaves1 != null) { - Block aBlock = (Block) ReflectionUtils.getFieldValue(aBopColouredLeaves1); + Block aBlock = ReflectionUtils.getFieldValue(aBopColouredLeaves1); if (aBlock != null) { colorizedLeaves1 = aBlock; } } if (aBopColouredLeaves2 != null) { - Block aBlock = (Block) ReflectionUtils.getFieldValue(aBopColouredLeaves2); + Block aBlock = ReflectionUtils.getFieldValue(aBopColouredLeaves2); if (aBlock != null) { colorizedLeaves2 = aBlock; } @@ -165,13 +165,13 @@ public class HANDLER_BiomesOPlenty { if (aBopSapling != null) { - Block aBlock = (Block) ReflectionUtils.getFieldValue(aBopSapling); + Block aBlock = ReflectionUtils.getFieldValue(aBopSapling); if (aBlock != null) { saplings = aBlock; } } if (aBopColouredSapling != null) { - Block aBlock = (Block) ReflectionUtils.getFieldValue(aBopColouredSapling); + Block aBlock = ReflectionUtils.getFieldValue(aBopColouredSapling); if (aBlock != null) { colorizedSaplings = aBlock; } diff --git a/src/Java/gtPlusPlus/xmod/bop/blocks/BOP_Block_Registrator.java b/src/main/java/gtPlusPlus/xmod/bop/blocks/BOP_Block_Registrator.java index 3716359d7a..3716359d7a 100644 --- a/src/Java/gtPlusPlus/xmod/bop/blocks/BOP_Block_Registrator.java +++ b/src/main/java/gtPlusPlus/xmod/bop/blocks/BOP_Block_Registrator.java diff --git a/src/Java/gtPlusPlus/xmod/bop/blocks/base/LeavesBase.java b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LeavesBase.java index 5c86c45591..5c86c45591 100644 --- a/src/Java/gtPlusPlus/xmod/bop/blocks/base/LeavesBase.java +++ b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LeavesBase.java diff --git a/src/Java/gtPlusPlus/xmod/bop/blocks/base/LogBase.java b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LogBase.java index 8e8ca0ed0a..8e8ca0ed0a 100644 --- a/src/Java/gtPlusPlus/xmod/bop/blocks/base/LogBase.java +++ b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LogBase.java diff --git a/src/Java/gtPlusPlus/xmod/bop/blocks/base/SaplingBase.java b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/SaplingBase.java index c039e1ebac..c039e1ebac 100644 --- a/src/Java/gtPlusPlus/xmod/bop/blocks/base/SaplingBase.java +++ b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/SaplingBase.java diff --git a/src/Java/gtPlusPlus/xmod/bop/blocks/pine/LeavesPineTree.java b/src/main/java/gtPlusPlus/xmod/bop/blocks/pine/LeavesPineTree.java index c942db14cf..c942db14cf 100644 --- a/src/Java/gtPlusPlus/xmod/bop/blocks/pine/LeavesPineTree.java +++ b/src/main/java/gtPlusPlus/xmod/bop/blocks/pine/LeavesPineTree.java diff --git a/src/Java/gtPlusPlus/xmod/bop/blocks/pine/LogPineTree.java b/src/main/java/gtPlusPlus/xmod/bop/blocks/pine/LogPineTree.java index dee5bf02fd..dee5bf02fd 100644 --- a/src/Java/gtPlusPlus/xmod/bop/blocks/pine/LogPineTree.java +++ b/src/main/java/gtPlusPlus/xmod/bop/blocks/pine/LogPineTree.java diff --git a/src/Java/gtPlusPlus/xmod/bop/blocks/pine/SaplingPineTree.java b/src/main/java/gtPlusPlus/xmod/bop/blocks/pine/SaplingPineTree.java index 0ee04de899..0ee04de899 100644 --- a/src/Java/gtPlusPlus/xmod/bop/blocks/pine/SaplingPineTree.java +++ b/src/main/java/gtPlusPlus/xmod/bop/blocks/pine/SaplingPineTree.java diff --git a/src/Java/gtPlusPlus/xmod/bop/blocks/rainforest/LeavesRainforestTree.java b/src/main/java/gtPlusPlus/xmod/bop/blocks/rainforest/LeavesRainforestTree.java index 39e434243a..39e434243a 100644 --- a/src/Java/gtPlusPlus/xmod/bop/blocks/rainforest/LeavesRainforestTree.java +++ b/src/main/java/gtPlusPlus/xmod/bop/blocks/rainforest/LeavesRainforestTree.java diff --git a/src/Java/gtPlusPlus/xmod/bop/blocks/rainforest/LogRainforestTree.java b/src/main/java/gtPlusPlus/xmod/bop/blocks/rainforest/LogRainforestTree.java index 6d30caafb7..6d30caafb7 100644 --- a/src/Java/gtPlusPlus/xmod/bop/blocks/rainforest/LogRainforestTree.java +++ b/src/main/java/gtPlusPlus/xmod/bop/blocks/rainforest/LogRainforestTree.java diff --git a/src/Java/gtPlusPlus/xmod/bop/blocks/rainforest/SaplingRainforestTree.java b/src/main/java/gtPlusPlus/xmod/bop/blocks/rainforest/SaplingRainforestTree.java index 73b916d383..73b916d383 100644 --- a/src/Java/gtPlusPlus/xmod/bop/blocks/rainforest/SaplingRainforestTree.java +++ b/src/main/java/gtPlusPlus/xmod/bop/blocks/rainforest/SaplingRainforestTree.java diff --git a/src/Java/gtPlusPlus/xmod/bop/creative/MiscUtilsBOPTab.java b/src/main/java/gtPlusPlus/xmod/bop/creative/MiscUtilsBOPTab.java index d33b19aaf9..d33b19aaf9 100644 --- a/src/Java/gtPlusPlus/xmod/bop/creative/MiscUtilsBOPTab.java +++ b/src/main/java/gtPlusPlus/xmod/bop/creative/MiscUtilsBOPTab.java diff --git a/src/Java/gtPlusPlus/xmod/bop/world/features/trees/WorldGenPineTree.java b/src/main/java/gtPlusPlus/xmod/bop/world/features/trees/WorldGenPineTree.java index 831108ec99..831108ec99 100644 --- a/src/Java/gtPlusPlus/xmod/bop/world/features/trees/WorldGenPineTree.java +++ b/src/main/java/gtPlusPlus/xmod/bop/world/features/trees/WorldGenPineTree.java diff --git a/src/Java/gtPlusPlus/xmod/bop/world/features/trees/WorldGenRainForestTree_Ex.java b/src/main/java/gtPlusPlus/xmod/bop/world/features/trees/WorldGenRainForestTree_Ex.java index fa29f99655..fa29f99655 100644 --- a/src/Java/gtPlusPlus/xmod/bop/world/features/trees/WorldGenRainForestTree_Ex.java +++ b/src/main/java/gtPlusPlus/xmod/bop/world/features/trees/WorldGenRainForestTree_Ex.java diff --git a/src/Java/gtPlusPlus/xmod/cofh/HANDLER_COFH.java b/src/main/java/gtPlusPlus/xmod/cofh/HANDLER_COFH.java index 7bce4ab173..7bce4ab173 100644 --- a/src/Java/gtPlusPlus/xmod/cofh/HANDLER_COFH.java +++ b/src/main/java/gtPlusPlus/xmod/cofh/HANDLER_COFH.java diff --git a/src/Java/gtPlusPlus/xmod/computronics/HANDLER_Computronics.java b/src/main/java/gtPlusPlus/xmod/computronics/HANDLER_Computronics.java index 9647465711..9647465711 100644 --- a/src/Java/gtPlusPlus/xmod/computronics/HANDLER_Computronics.java +++ b/src/main/java/gtPlusPlus/xmod/computronics/HANDLER_Computronics.java diff --git a/src/Java/gtPlusPlus/xmod/eio/handler/HandlerTooltip_EIO.java b/src/main/java/gtPlusPlus/xmod/eio/handler/HandlerTooltip_EIO.java index 5b3210d58a..5b3210d58a 100644 --- a/src/Java/gtPlusPlus/xmod/eio/handler/HandlerTooltip_EIO.java +++ b/src/main/java/gtPlusPlus/xmod/eio/handler/HandlerTooltip_EIO.java diff --git a/src/Java/gtPlusPlus/xmod/eio/material/MaterialEIO.java b/src/main/java/gtPlusPlus/xmod/eio/material/MaterialEIO.java index a5c87342e7..a5c87342e7 100644 --- a/src/Java/gtPlusPlus/xmod/eio/material/MaterialEIO.java +++ b/src/main/java/gtPlusPlus/xmod/eio/material/MaterialEIO.java diff --git a/src/Java/gtPlusPlus/xmod/forestry/HANDLER_FR.java b/src/main/java/gtPlusPlus/xmod/forestry/HANDLER_FR.java index 05d00b06d9..05d00b06d9 100644 --- a/src/Java/gtPlusPlus/xmod/forestry/HANDLER_FR.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/HANDLER_FR.java diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/blocks/BlockDenseBeeHouse.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/blocks/BlockDenseBeeHouse.java index 77ee15c5d5..77ee15c5d5 100644 --- a/src/Java/gtPlusPlus/xmod/forestry/bees/blocks/BlockDenseBeeHouse.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/blocks/BlockDenseBeeHouse.java diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/blocks/FR_BlockRegistry.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/blocks/FR_BlockRegistry.java index fa36732cb6..fa36732cb6 100644 --- a/src/Java/gtPlusPlus/xmod/forestry/bees/blocks/FR_BlockRegistry.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/blocks/FR_BlockRegistry.java diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/custom/CustomCombs.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/CustomCombs.java index b4d6e4c2fc..b4d6e4c2fc 100644 --- a/src/Java/gtPlusPlus/xmod/forestry/bees/custom/CustomCombs.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/CustomCombs.java diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bee_Definition.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bee_Definition.java index b36508f6aa..b36508f6aa 100644 --- a/src/Java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bee_Definition.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bee_Definition.java diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bees.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bees.java index 49b8da0d1b..49b8da0d1b 100644 --- a/src/Java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bees.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bees.java diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Branch_Definition.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Branch_Definition.java index f59f0c537f..f59f0c537f 100644 --- a/src/Java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Branch_Definition.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Branch_Definition.java diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/custom/ItemCustomComb.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/ItemCustomComb.java index 813ebcbe25..813ebcbe25 100644 --- a/src/Java/gtPlusPlus/xmod/forestry/bees/custom/ItemCustomComb.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/ItemCustomComb.java diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/gui/ContainerBeeHouse.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/gui/ContainerBeeHouse.java index 4aa9de8220..4aa9de8220 100644 --- a/src/Java/gtPlusPlus/xmod/forestry/bees/gui/ContainerBeeHouse.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/gui/ContainerBeeHouse.java diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/gui/GuiBeeHouse.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/gui/GuiBeeHouse.java index 89a2f121d9..89a2f121d9 100644 --- a/src/Java/gtPlusPlus/xmod/forestry/bees/gui/GuiBeeHouse.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/gui/GuiBeeHouse.java diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/inventory/InventoryDenseBeeHouse.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/inventory/InventoryDenseBeeHouse.java index 47c380fdfe..47c380fdfe 100644 --- a/src/Java/gtPlusPlus/xmod/forestry/bees/inventory/InventoryDenseBeeHouse.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/inventory/InventoryDenseBeeHouse.java diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/items/FR_CustomBee.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/FR_CustomBee.java index 7d9a9e231b..7d9a9e231b 100644 --- a/src/Java/gtPlusPlus/xmod/forestry/bees/items/FR_CustomBee.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/FR_CustomBee.java diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java index e1d37ab463..e1d37ab463 100644 --- a/src/Java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/items/FR_StringUtil.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/FR_StringUtil.java index e075bf1eda..e075bf1eda 100644 --- a/src/Java/gtPlusPlus/xmod/forestry/bees/items/FR_StringUtil.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/FR_StringUtil.java diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/items/MB_FrameType.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/MB_FrameType.java index 1016021e44..1016021e44 100644 --- a/src/Java/gtPlusPlus/xmod/forestry/bees/items/MB_FrameType.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/MB_FrameType.java diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/items/MB_ItemFrame.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/MB_ItemFrame.java index 65b6977b8a..65b6977b8a 100644 --- a/src/Java/gtPlusPlus/xmod/forestry/bees/items/MB_ItemFrame.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/MB_ItemFrame.java diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/recipe/FR_Gregtech_Recipes.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/recipe/FR_Gregtech_Recipes.java index ddc401f752..ddc401f752 100644 --- a/src/Java/gtPlusPlus/xmod/forestry/bees/recipe/FR_Gregtech_Recipes.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/recipe/FR_Gregtech_Recipes.java diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/tileentities/TileDenseBeeHouse.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/tileentities/TileDenseBeeHouse.java index 9b3424ef08..9b3424ef08 100644 --- a/src/Java/gtPlusPlus/xmod/forestry/bees/tileentities/TileDenseBeeHouse.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/tileentities/TileDenseBeeHouse.java diff --git a/src/Java/gtPlusPlus/xmod/galacticraft/HANDLER_GalactiCraft.java b/src/main/java/gtPlusPlus/xmod/galacticraft/HANDLER_GalactiCraft.java index d5c7a7e4e5..d5c7a7e4e5 100644 --- a/src/Java/gtPlusPlus/xmod/galacticraft/HANDLER_GalactiCraft.java +++ b/src/main/java/gtPlusPlus/xmod/galacticraft/HANDLER_GalactiCraft.java diff --git a/src/Java/gtPlusPlus/xmod/galacticraft/handler/HandlerTooltip_GC.java b/src/main/java/gtPlusPlus/xmod/galacticraft/handler/HandlerTooltip_GC.java index 3b59b58cab..3b59b58cab 100644 --- a/src/Java/gtPlusPlus/xmod/galacticraft/handler/HandlerTooltip_GC.java +++ b/src/main/java/gtPlusPlus/xmod/galacticraft/handler/HandlerTooltip_GC.java diff --git a/src/Java/gtPlusPlus/xmod/galacticraft/util/GalacticUtils.java b/src/main/java/gtPlusPlus/xmod/galacticraft/util/GalacticUtils.java index f237aed335..f237aed335 100644 --- a/src/Java/gtPlusPlus/xmod/galacticraft/util/GalacticUtils.java +++ b/src/main/java/gtPlusPlus/xmod/galacticraft/util/GalacticUtils.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java b/src/main/java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java index a375f77cda..a375f77cda 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/energy/IC2ElectricItem.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/energy/IC2ElectricItem.java index 4ec4589c03..4ec4589c03 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/energy/IC2ElectricItem.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/energy/IC2ElectricItem.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/energy/IC2ElectricItemManager.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/energy/IC2ElectricItemManager.java index 8bf42578cc..8bf42578cc 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/energy/IC2ElectricItemManager.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/energy/IC2ElectricItemManager.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/CustomGtTextures.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/CustomGtTextures.java index 554983c41c..554983c41c 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/CustomGtTextures.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/CustomGtTextures.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/CustomOrePrefix.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/CustomOrePrefix.java index 9647b00578..9647b00578 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/CustomOrePrefix.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/CustomOrePrefix.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java index fd5ceed89b..a8ee2e24ad 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java @@ -396,13 +396,26 @@ public enum GregtechItemList implements GregtechItemContainer { // Flotation Cell Controller_Flotation_Cell, + Casing_Flotation_Cell, + + // Sparge Tower + Controller_Sparge_Tower, + Casing_Sparge_Tower_Exterior, + Casing_Sparge_Tower_Interior, // Elemental Duplicator - /*Controller_ElementalDuplicator,*/ + Controller_ElementalDuplicator, Casing_ElementalDuplicator, // Big Steam Macerator Controller_SteamMaceratorMulti, + + // Industrial Rock Breaker + Controller_IndustrialRockBreaker, + + // Industrial Chisel + Controller_IndustrialAutoChisel, + Casing_IndustrialAutoChisel, // Custom Machine Casings Casing_Machine_Custom_1, @@ -425,6 +438,10 @@ public enum GregtechItemList implements GregtechItemContainer { //Air Intake hatch Hatch_Air_Intake, + Hatch_Air_Intake_Extreme, + + //Reservoir Hatch + Hatch_Reservoir, //XL Turbine Rotor Hatch /*Hatch_Turbine_Rotor,*/ @@ -452,7 +469,7 @@ public enum GregtechItemList implements GregtechItemContainer { Hatch_Output_Bus_Steam, //Elemental Duplicator Data Orb Bus - /*Hatch_Input_Elemental_Duplicator,*/ + Hatch_Input_Elemental_Duplicator, //RTG Hatch Hatch_RTG_LV, @@ -585,9 +602,13 @@ public enum GregtechItemList implements GregtechItemContainer { Machine_ZPM_Component_Maker, Machine_UV_Component_Maker, - // Fluid Reactor - FluidReactor_LV, FluidReactor_HV, - FluidReactor_IV, FluidReactor_ZPM, + // Reactor Processing Unit + ReactorProcessingUnit_IV, + ReactorProcessingUnit_ZPM, + + // Cold Trap + ColdTrap_IV, + ColdTrap_ZPM, //Breakers BreakerBox_ULV, BreakerBox_LV, BreakerBox_MV, @@ -695,6 +716,12 @@ public enum GregtechItemList implements GregtechItemContainer { //GT RTG RTG, + + // Chisel Machines + GT_Chisel_LV, + GT_Chisel_MV, + GT_Chisel_HV, + //Plasma Tank /*Plasma_Tank,*/ diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOreDictNames.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOreDictNames.java index 7ef6b5701e..7ef6b5701e 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOreDictNames.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOreDictNames.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java index b17b4a26ff..b17b4a26ff 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechTextureSet.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechTextureSet.java index 26ee2bd401..26ee2bd401 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechTextureSet.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechTextureSet.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechTextures.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechTextures.java index 5b1a34590f..5b1a34590f 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechTextures.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechTextures.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechToolDictNames.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechToolDictNames.java index 105023065c..105023065c 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechToolDictNames.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechToolDictNames.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_AdvancedBoiler.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_AdvancedBoiler.java index 04d8d91201..04d8d91201 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_AdvancedBoiler.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_AdvancedBoiler.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_Cyclotron.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_Cyclotron.java index 6d0eb6b14c..6d0eb6b14c 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_Cyclotron.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_Cyclotron.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_DeluxeTank.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_DeluxeTank.java index a4508781aa..a4508781aa 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_DeluxeTank.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_DeluxeTank.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_Hatch_Muffler_Advanced.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_Hatch_Muffler_Advanced.java index 17226a399e..17226a399e 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_Hatch_Muffler_Advanced.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_Hatch_Muffler_Advanced.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_IndustrialCentrifuge.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_IndustrialCentrifuge.java index df8df2f775..df8df2f775 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_IndustrialCentrifuge.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_IndustrialCentrifuge.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_IronBlastFurnace.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_IronBlastFurnace.java index 78150aedbe..78150aedbe 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_IronBlastFurnace.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_IronBlastFurnace.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_MatterFab.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_MatterFab.java index 808eb90728..808eb90728 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_MatterFab.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_MatterFab.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_MetaTileMachineLong.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_MetaTileMachineLong.java index 6a3322ab2e..6a3322ab2e 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_MetaTileMachineLong.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_MetaTileMachineLong.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_MultiMachine.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_MultiMachine.java index 88b9661c95..88b9661c95 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_MultiMachine.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_MultiMachine.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_MultiMachine_NoPlayerInventory.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_MultiMachine_NoPlayerInventory.java index 2d63a13d60..2d63a13d60 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_MultiMachine_NoPlayerInventory.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_MultiMachine_NoPlayerInventory.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_PowerSubStation.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_PowerSubStation.java index 937513751b..937513751b 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_PowerSubStation.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_PowerSubStation.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_SafeBlock.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_SafeBlock.java index 9a84ba66ab..9a84ba66ab 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_SafeBlock.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_SafeBlock.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_SolarGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_SolarGenerator.java index a3f58836e3..a3f58836e3 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_SolarGenerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_SolarGenerator.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_SteamCondenser.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_SteamCondenser.java index 6fcd53b139..6fcd53b139 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_SteamCondenser.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_SteamCondenser.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_SuperChest.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_SuperChest.java index dcab57c380..dcab57c380 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_SuperChest.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_SuperChest.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_TreeFarmer.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_TreeFarmer.java index bf4dffb904..bf4dffb904 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_TreeFarmer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_TreeFarmer.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_AdvancedBoiler.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_AdvancedBoiler.java index d532a98030..d532a98030 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_AdvancedBoiler.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_AdvancedBoiler.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_Cyclotron.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_Cyclotron.java index 0be44fa616..0be44fa616 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_Cyclotron.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_Cyclotron.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_DeluxeTank.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_DeluxeTank.java index c6d8d4ef7e..c6d8d4ef7e 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_DeluxeTank.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_DeluxeTank.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_Hatch_Muffler_Advanced.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_Hatch_Muffler_Advanced.java index 4b998f6487..4b998f6487 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_Hatch_Muffler_Advanced.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_Hatch_Muffler_Advanced.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_IndustrialCentrifuge.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_IndustrialCentrifuge.java index 2e1f76f362..2e1f76f362 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_IndustrialCentrifuge.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_IndustrialCentrifuge.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_IronBlastFurnace.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_IronBlastFurnace.java index b44ad916b7..b44ad916b7 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_IronBlastFurnace.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_IronBlastFurnace.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_MatterFab.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_MatterFab.java index 95bde9fd9f..95bde9fd9f 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_MatterFab.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_MatterFab.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_MultiMachine.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_MultiMachine.java index c78e7789b8..c78e7789b8 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_MultiMachine.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_MultiMachine.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_MultiMachine_Default.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_MultiMachine_Default.java index 0cfab4e71e..0cfab4e71e 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_MultiMachine_Default.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_MultiMachine_Default.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_Multi_Basic_Slotted.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_Multi_Basic_Slotted.java index 0756effa26..0756effa26 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_Multi_Basic_Slotted.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_Multi_Basic_Slotted.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_PowerSubStation.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_PowerSubStation.java index 65ba8610dd..65ba8610dd 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_PowerSubStation.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_PowerSubStation.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_SafeBlock.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_SafeBlock.java index c18d58b4b6..c18d58b4b6 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_SafeBlock.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_SafeBlock.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_SolarGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_SolarGenerator.java index f0b3a0c879..f0b3a0c879 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_SolarGenerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_SolarGenerator.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_SteamCondenser.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_SteamCondenser.java index 88a3e00bb5..88a3e00bb5 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_SteamCondenser.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_SteamCondenser.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_SuperChest.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_SuperChest.java index d324c50dd0..d324c50dd0 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_SuperChest.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_SuperChest.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_TreeFarmer.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_TreeFarmer.java index b236b0ff32..b236b0ff32 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_TreeFarmer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_TreeFarmer.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/basic/CONTAINER_PollutionCleaner.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/basic/CONTAINER_PollutionCleaner.java index 79d1033bd0..79d1033bd0 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/basic/CONTAINER_PollutionCleaner.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/basic/CONTAINER_PollutionCleaner.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/basic/GUI_PollutionCleaner.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/basic/GUI_PollutionCleaner.java index 7a9417eeb6..3b96731f00 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/basic/GUI_PollutionCleaner.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/basic/GUI_PollutionCleaner.java @@ -47,7 +47,7 @@ public class GUI_PollutionCleaner extends GT_GUIContainerMetaTile_Machine { //Do Dumb shit CONTAINER_PollutionCleaner aContainerCast = (CONTAINER_PollutionCleaner) this.mContainer; mReduction = aContainerCast.mReduction; - list.add("Reduction: "+mReduction); + list.add("Reduction: "+mReduction+"/s"); } } if (!list.isEmpty()) { diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/fluidreactor/Container_FluidReactor.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/fluidreactor/Container_FluidReactor.java index cdca065e60..cdca065e60 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/fluidreactor/Container_FluidReactor.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/fluidreactor/Container_FluidReactor.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/fluidreactor/GUI_FluidReactor.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/fluidreactor/GUI_FluidReactor.java index 1be79b40cc..1be79b40cc 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/fluidreactor/GUI_FluidReactor.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/fluidreactor/GUI_FluidReactor.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/hatches/CONTAINER_1by1_Turbine.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/hatches/CONTAINER_1by1_Turbine.java index e6203823b6..e6203823b6 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/hatches/CONTAINER_1by1_Turbine.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/hatches/CONTAINER_1by1_Turbine.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/hatches/CONTAINER_2by2.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/hatches/CONTAINER_2by2.java index 1d396811c1..1d396811c1 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/hatches/CONTAINER_2by2.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/hatches/CONTAINER_2by2.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/hatches/CONTAINER_4by4.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/hatches/CONTAINER_4by4.java index 8efe60a06e..8efe60a06e 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/hatches/CONTAINER_4by4.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/hatches/CONTAINER_4by4.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/hatches/CONTAINER_HatchNbtConsumable.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/hatches/CONTAINER_HatchNbtConsumable.java index 9596d41387..9596d41387 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/hatches/CONTAINER_HatchNbtConsumable.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/hatches/CONTAINER_HatchNbtConsumable.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/hatches/GUI_1by1_Turbine.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/hatches/GUI_1by1_Turbine.java index 5623f0e224..5623f0e224 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/hatches/GUI_1by1_Turbine.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/hatches/GUI_1by1_Turbine.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/hatches/GUI_2by2.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/hatches/GUI_2by2.java index b427a632f7..b427a632f7 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/hatches/GUI_2by2.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/hatches/GUI_2by2.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/hatches/GUI_4by4.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/hatches/GUI_4by4.java index aced4342b3..aced4342b3 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/hatches/GUI_4by4.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/hatches/GUI_4by4.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/hatches/GUI_HatchNbtConsumable.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/hatches/GUI_HatchNbtConsumable.java index dd19571646..dd19571646 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/hatches/GUI_HatchNbtConsumable.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/hatches/GUI_HatchNbtConsumable.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/hatches/charge/CONTAINER_Electric_2by2.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/hatches/charge/CONTAINER_Electric_2by2.java index 00d022c481..00d022c481 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/hatches/charge/CONTAINER_Electric_2by2.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/hatches/charge/CONTAINER_Electric_2by2.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/hatches/charge/CONTAINER_Electric_4by4.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/hatches/charge/CONTAINER_Electric_4by4.java index 1f833eb3cb..1f833eb3cb 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/hatches/charge/CONTAINER_Electric_4by4.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/hatches/charge/CONTAINER_Electric_4by4.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/hatches/charge/GUI_Electric_2by2.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/hatches/charge/GUI_Electric_2by2.java index 9be7104bbc..9be7104bbc 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/hatches/charge/GUI_Electric_2by2.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/hatches/charge/GUI_Electric_2by2.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/hatches/charge/GUI_Electric_4by4.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/hatches/charge/GUI_Electric_4by4.java index ed3fce5e2c..ed3fce5e2c 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/hatches/charge/GUI_Electric_4by4.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/hatches/charge/GUI_Electric_4by4.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/power/CONTAINER_BasicTank.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/power/CONTAINER_BasicTank.java index 9a58e74ec4..9a58e74ec4 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/power/CONTAINER_BasicTank.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/power/CONTAINER_BasicTank.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/power/GUI_BasicTank.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/power/GUI_BasicTank.java index a03aac346b..a03aac346b 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/power/GUI_BasicTank.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/power/GUI_BasicTank.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/GregtechItemContainer.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/GregtechItemContainer.java index 3c29b34e27..3c29b34e27 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/GregtechItemContainer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/GregtechItemContainer.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/IHeatEntity.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/IHeatEntity.java index 824bb258d8..824bb258d8 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/IHeatEntity.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/IHeatEntity.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/IHeatSink.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/IHeatSink.java index 80adcf0d51..80adcf0d51 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/IHeatSink.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/IHeatSink.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/IMetaTileEntityHeatPipe.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/IMetaTileEntityHeatPipe.java index 770f249648..770f249648 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/IMetaTileEntityHeatPipe.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/IMetaTileEntityHeatPipe.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java index 229bc234e9..dfc1e58975 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java @@ -1,6 +1,8 @@ package gtPlusPlus.xmod.gregtech.api.interfaces.internal; +import gregtech.api.GregTech_API; import gregtech.api.enums.Materials; +import gregtech.api.util.GT_Recipe; import gtPlusPlus.core.material.Material; import net.minecraft.item.ItemStack; @@ -22,6 +24,13 @@ public interface IGregtech_RecipeAdder { //public boolean addCokeOvenRecipe(boolean aOptimize, ItemStack[] aInputs, ItemStack[] aOutputs, Object aSpecial, FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs, int aDuration, int aEUt, int aSpecialValue); public boolean addCokeOvenRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput, int aDuration, int aEUt); + + public boolean addCokeOvenRecipe(int aCircuit, ItemStack aInput2, FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs, ItemStack[] aOutputs, int aDuration, int aEUt); + + + public boolean addCokeOvenRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs, ItemStack[] aOutputs, int aDuration, int aEUt); + + public boolean addFuel(ItemStack aInput1, ItemStack aOutput1, int aEU, int aType); @@ -62,7 +71,7 @@ public interface IGregtech_RecipeAdder { * @return true if the Recipe got added, otherwise false. */ - public boolean addDehydratorRecipe(ItemStack aInput, FluidStack aFluid, ItemStack[] aOutputItems, int aDuration, int aEUt); + //public boolean addDehydratorRecipe(ItemStack aInput, FluidStack aFluid, ItemStack[] aOutputItems, int aDuration, int aEUt); /*public boolean addDehydratorRecipe(FluidStack aFluid, FluidStack aOutputFluid, ItemStack[] aOutputItems, int aDuration, int aEUt);*/ /*public boolean addDehydratorRecipe(ItemStack aItemA, ItemStack aItemB, ItemStack[] aOutputItems, int aDuration, int aEUt); public boolean addDehydratorRecipe(ItemStack aItemA, ItemStack aItemB, FluidStack aFluid, ItemStack[] aOutputItems, FluidStack aOutputFluid, int aDuration, int aEUt);*/ @@ -124,16 +133,16 @@ public interface IGregtech_RecipeAdder { public boolean addBlastSmelterRecipe(ItemStack[] aInput, FluidStack aInputFluid, FluidStack aOutput, int aChance, int aDuration, int aEUt, int aSpecialValue); /** - * Adds a Recipe for the Alloy Blast Smelter. (up to 9 Inputs) + * Adds a Recipe for the LFTRr. (up to 9 Inputs) * * @param aInput = ItemStack[] (not null, and respects StackSize) * @param aFluidInput = Input of a fluid (can be null, and respects StackSize) - * @param aFluidOutput = Output of the Molten Metal (not null, and respects StackSize) + * @param aFluidOutput = Output of the Molten Salts (not null, and respects StackSize) * @param aOutputStack = Item Output (Can be null) * @param aChances = Output Chance (can be == 0) * @param aDuration = Duration (must be >= 0) * @param aEUt = EU per tick needed for heating up (must be >= 0) - * @param aSpecialValue = Stores the Required Temp for the Recipe + * @param aSpecialValue = Power produced in EU/t per dynamo * @return true if the Recipe got added, otherwise false. */ public boolean addBlastSmelterRecipe(ItemStack[] aInput, FluidStack aInputFluid, FluidStack aOutput, ItemStack[] aOutputStack, int[] aChance, int aDuration, int aEUt, int aSpecialValue); @@ -166,6 +175,14 @@ public interface IGregtech_RecipeAdder { FluidStack aInput7, FluidStack aInput8, FluidStack aInput9, FluidStack aOutput1, FluidStack aOutput2, int aDuration, int aEUt); + + public boolean addFissionFuel( + boolean aOptimise, + FluidStack aInput1, FluidStack aInput2, FluidStack aInput3, + FluidStack aInput4, FluidStack aInput5, FluidStack aInput6, + FluidStack aInput7, FluidStack aInput8, FluidStack aInput9, + FluidStack aOutput1, FluidStack aOutput2, + int aDuration, int aEUt); public boolean addCyclotronRecipe(ItemStack aInput, FluidStack aFluidInput, ItemStack[] aOutputs, FluidStack aFluidOutput, int[] aChances, int aDuration, int aEUt, int aSpecialValue); @@ -200,9 +217,27 @@ public interface IGregtech_RecipeAdder { public boolean addAssemblerRecipeWithOreDict(Object aInput1, int aAmount1, Object aInput2, int aAmount2, FluidStack aInputFluid, ItemStack aOutput, int a1, int a2); public boolean addSixSlotAssemblingRecipe(ItemStack[] aInputs, FluidStack aInputFluid, ItemStack aOutput1, int aDuration, int aEUt); - + /** + * Adds an Assemblyline Recipe + * + * @param aInputs must be != null, 4-16 inputs + * @param aFluidInputs 0-4 fluids + * @param aOutput1 must be != null + * @param aDuration must be > 0 + * @param aEUt should be > 0 + */ public boolean addAssemblylineRecipe(ItemStack aResearchItem, int aResearchTime, ItemStack[] aInputs, FluidStack[] aFluidInputs, ItemStack aOutput, int aDuration, int aEUt); + /** + * Adds a Assemblyline Recipe + * + * @param aInputs elements should be: ItemStack for single item; + * ItemStack[] for multiple equivalent items; + * {OreDict, amount} for oredict. + */ + boolean addAssemblylineRecipe(ItemStack aResearchItem, int aResearchTime, Object[] aInputs, FluidStack[] aFluidInputs, ItemStack aOutput1, int aDuration, int aEUt); + + public boolean addChemicalRecipe(ItemStack input1, ItemStack input2, FluidStack inputFluid, FluidStack outputFluid, ItemStack output, int time, int eu); public boolean addChemicalRecipe(ItemStack input1, ItemStack input2, FluidStack inputFluid, FluidStack outputFluid, ItemStack output, Object object, int time, int eu); public boolean addChemicalRecipe(ItemStack input1, ItemStack input2, FluidStack inputFluid, FluidStack outputFluid, ItemStack output, ItemStack object, int time); @@ -271,8 +306,8 @@ public interface IGregtech_RecipeAdder { public boolean addVacuumFurnaceRecipe(ItemStack[] aInputs, FluidStack[] aFluidInputs, ItemStack[] aOutputs, FluidStack[] aFluidOutputs, int aDuration, int aEUt, int aLevel); - public boolean addUvLaserRecipe(ItemStack aInput1, ItemStack aInput2, ItemStack aOutput, int time, long eu); - public boolean addIrLaserRecipe(ItemStack aInput1, ItemStack aInput2, ItemStack aOutput, int time, long eu); + public boolean addUvLaserRecipe(ItemStack aInput1, ItemStack aOutput, int time, long eu); + public boolean addIrLaserRecipe(ItemStack aInput1, ItemStack aOutput, int time, long eu); public boolean addChemicalPlantRecipe(ItemStack[] aInputs, FluidStack[] aInputFluids, ItemStack[] aOutputs, FluidStack[] aFluidOutputs, int time, long eu, int aTier); public boolean addChemicalPlantRecipe(ItemStack[] aInputs, FluidStack[] aInputFluids, ItemStack[] aOutputs, FluidStack[] aFluidOutputs, int[] aChances, int time, long eu, int aTier); @@ -297,5 +332,12 @@ public interface IGregtech_RecipeAdder { public boolean addFuelForRTG(ItemStack aFuelPellet, int aFuelDays, int aVoltage); + public boolean addColdTrapRecipe(int aCircuit, ItemStack aInput, FluidStack aFluidInput, ItemStack[] aOutputs, int[] aChances, FluidStack aFluidOutput, int aTime, int aEU); + + public boolean addReactorProcessingUnitRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput, ItemStack[] aOutputs, int[] aChances, FluidStack aFluidOutput, int aTime, int aEU); + + public boolean addFluidHeaterRecipe(ItemStack aCircuit, FluidStack aInput, FluidStack aOutput, int aDuration, int aEUt); + + public boolean addVacuumFreezerRecipe(ItemStack aInput, ItemStack aOutput, int aDuration, int aEU); } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_IconContainer.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_IconContainer.java index b6c36483af..b6c36483af 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_IconContainer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_IconContainer.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_ItemBehaviour.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_ItemBehaviour.java index e874258a7a..e874258a7a 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_ItemBehaviour.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_ItemBehaviour.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_OreRecipeRegistrator.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_OreRecipeRegistrator.java index c997f14c9e..c997f14c9e 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_OreRecipeRegistrator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_OreRecipeRegistrator.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_OreRecipeRegistrator_GT.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_OreRecipeRegistrator_GT.java index 6037424d1f..6037424d1f 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_OreRecipeRegistrator_GT.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_OreRecipeRegistrator_GT.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_Texture.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_Texture.java index 74c996d116..74c996d116 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_Texture.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_Texture.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_ToolStats.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_ToolStats.java index ca167e4c7f..ca167e4c7f 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_ToolStats.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_ToolStats.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_Generic_Item.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_Generic_Item.java index 43998577c9..43998577c9 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_Generic_Item.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_Generic_Item.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem.java index 12b90c9a6c..12b90c9a6c 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem_Base.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem_Base.java index ec1c90186a..ec1c90186a 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem_Base.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem_Base.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem_X32.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem_X32.java index a5430846a9..a5430846a9 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem_X32.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem_X32.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaTool.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaTool.java index ae84afb056..ae84afb056 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaTool.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaTool.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/items/tools/GT_MetaGenTool.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/tools/GT_MetaGenTool.java index 6f4202fdd8..6f4202fdd8 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/items/tools/GT_MetaGenTool.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/tools/GT_MetaGenTool.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/items/types/ToolType_Base.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/types/ToolType_Base.java index cefd72332b..cefd72332b 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/items/types/ToolType_Base.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/types/ToolType_Base.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/items/types/ToolType_HardHammer.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/types/ToolType_HardHammer.java index d4f5a87006..d4f5a87006 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/items/types/ToolType_HardHammer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/types/ToolType_HardHammer.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/items/types/ToolType_Pump.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/types/ToolType_Pump.java index f62d9e5cfa..f62d9e5cfa 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/items/types/ToolType_Pump.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/types/ToolType_Pump.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/items/types/ToolType_Wrench.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/types/ToolType_Wrench.java index d0ef6a535c..d0ef6a535c 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/items/types/ToolType_Wrench.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/types/ToolType_Wrench.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/BaseCustomTileEntity.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/BaseCustomTileEntity.java index 6967c8eb33..6967c8eb33 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/BaseCustomTileEntity.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/BaseCustomTileEntity.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/BaseCustomPower_MTE.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/BaseCustomPower_MTE.java index a4440114e8..a4440114e8 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/BaseCustomPower_MTE.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/BaseCustomPower_MTE.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/GTPP_MTE_BasicLosslessGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/GTPP_MTE_BasicLosslessGenerator.java index e1b329c07f..e1b329c07f 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/GTPP_MTE_BasicLosslessGenerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/GTPP_MTE_BasicLosslessGenerator.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/GTPP_MTE_BasicMachine.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/GTPP_MTE_BasicMachine.java index 2eb1d36791..2eb1d36791 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/GTPP_MTE_BasicMachine.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/GTPP_MTE_BasicMachine.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/GTPP_MTE_BasicTank.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/GTPP_MTE_BasicTank.java index 9c6840e33c..9c6840e33c 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/GTPP_MTE_BasicTank.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/GTPP_MTE_BasicTank.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/GTPP_MTE_TieredMachineBlock.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/GTPP_MTE_TieredMachineBlock.java index 785c4698db..785c4698db 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/GTPP_MTE_TieredMachineBlock.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/GTPP_MTE_TieredMachineBlock.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/MetaTileEntityCustomPower.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/MetaTileEntityCustomPower.java index 8b7ccc202a..8b7ccc202a 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/MetaTileEntityCustomPower.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/MetaTileEntityCustomPower.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicBreaker.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicBreaker.java index e6bf4b8486..e6bf4b8486 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicBreaker.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicBreaker.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GTPP_Recipe.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GTPP_Recipe.java index 18665538d0..18665538d0 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GTPP_Recipe.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GTPP_Recipe.java diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Dehydrator.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Dehydrator.java new file mode 100644 index 0000000000..aebf188fc0 --- /dev/null +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Dehydrator.java @@ -0,0 +1,163 @@ +package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations; + +import static gregtech.api.enums.Textures.BlockIcons.MACHINE_CASINGS; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_PIPE_OUT; + +import gregtech.api.enums.Textures; +import gregtech.api.enums.Textures.BlockIcons.CustomIcon; +import gregtech.api.interfaces.ITexture; +import gregtech.api.interfaces.metatileentity.IMetaTileEntity; +import gregtech.api.interfaces.tileentity.IGregTechTileEntity; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_GT_Recipe; +import gregtech.api.objects.GT_RenderedTexture; +import gregtech.api.render.TextureFactory; +import gregtech.api.util.GTPP_Recipe; +import gregtech.api.util.GT_Recipe; +import gregtech.api.util.GT_Recipe.GT_Recipe_Map; +import gtPlusPlus.core.lib.CORE; + +@SuppressWarnings("deprecation") +public class GT_MetaTileEntity_Dehydrator extends GT_MetaTileEntity_BasicMachine_GT_Recipe { + + private static final CustomIcon[] sDehydratorOverlays = new CustomIcon[10]; + static { + sDehydratorOverlays[0] = new CustomIcon("basicmachines/microwave/OVERLAY_FRONT"); + sDehydratorOverlays[2] = new CustomIcon("basicmachines/plasma_arc_furnace/OVERLAY_BOTTOM"); + sDehydratorOverlays[3] = new CustomIcon("basicmachines/fluid_heater/OVERLAY_SIDE"); + sDehydratorOverlays[4] = new CustomIcon("basicmachines/chemical_bath/OVERLAY_FRONT"); + sDehydratorOverlays[5] = new CustomIcon("basicmachines/microwave/OVERLAY_FRONT_ACTIVE"); + sDehydratorOverlays[7] = new CustomIcon("basicmachines/plasma_arc_furnace/OVERLAY_BOTTOM_ACTIVE"); + sDehydratorOverlays[8] = new CustomIcon("basicmachines/fluid_heater/OVERLAY_SIDE_ACTIVE"); + sDehydratorOverlays[9] = new CustomIcon("basicmachines/chemical_bath/OVERLAY_FRONT_ACTIVE"); + //3 8 + } + + private GT_Recipe_Map xRecipes; + private int xTankCapacity; + + public GT_MetaTileEntity_Dehydrator(int aID, String aName, String aNameRegional, int aTier, String aDescription, int aTankCapacity) { + super(aID, aName, aNameRegional, aTier, aDescription, GTPP_Recipe.GTPP_Recipe_Map.sChemicalDehydratorRecipes, 2, 9, aTankCapacity, 2, 5, "Dehydrator.png", "UNBOXINATOR", false, false, 0, "", null); + xRecipes = GTPP_Recipe.GTPP_Recipe_Map.sChemicalDehydratorRecipes; + xTankCapacity = aTankCapacity; + } + + public GT_MetaTileEntity_Dehydrator(String aName, int aTier, String[] aDescription, GT_Recipe.GT_Recipe_Map aRecipes, int aTankCapacity, int aAmperage, ITexture[][][] aTextures, String aGUIName, String aNEIName) { + super(aName, aTier, aDescription, aRecipes, 2, 9, aTankCapacity, aAmperage, 2, 5, aTextures, aGUIName, aNEIName, "", false, false, 0); + + } + + @Override + public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { + return new GT_MetaTileEntity_Dehydrator(this.mName, this.mTier, this.mDescriptionArray, this.xRecipes, this.xTankCapacity, this.mAmperage, this.mTextures, this.mGUIName, this.mNEIName); + } + + @Override + public String[] getDescription() { + String[] S = super.getDescription(); + final String[] desc = new String[S.length + 1]; + System.arraycopy(S, 0, desc, 0, S.length); + desc[S.length] = CORE.GT_Tooltip; + return desc; + } + + @Override + public ITexture[][][] getTextureSet(final ITexture[] aTextures) { + final ITexture[][][] rTextures = new ITexture[15][17][]; + for (byte i = -1; i < 16; i++) { + rTextures[0][i + 1] = getSideFacingActive(i); + rTextures[1][i + 1] = getSideFacingInactive(i); + rTextures[2][i + 1] = getFrontFacingActive(i); + rTextures[3][i + 1] = getFrontFacingInactive(i); + rTextures[4][i + 1] = getTopFacingActive(i); + rTextures[5][i + 1] = getTopFacingInactive(i); + rTextures[6][i + 1] = getBottomFacingActive(i); + rTextures[7][i + 1] = getBottomFacingInactive(i); + rTextures[8][i + 1] = getBottomFacingPipeActive(i); + rTextures[9][i + 1] = getBottomFacingPipeInactive(i); + rTextures[10][i + 1] = getTopFacingPipeActive(i); + rTextures[11][i + 1] = getTopFacingPipeInactive(i); + rTextures[12][i + 1] = getSideFacingPipeActive(i); + rTextures[13][i + 1] = getSideFacingPipeInactive(i); + } + return rTextures; + } + + + + @Override + public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte aFacing, final byte aColorIndex, final boolean aActive, final boolean aRedstone) { + return super.getTexture(aBaseMetaTileEntity, aSide, aFacing, aColorIndex, aActive, aRedstone); + //return this.mTextures[(aActive ? 5 : 0) + (aSide == aFacing ? 0 : aSide == GT_Utility.getOppositeSide(aFacing) ? 1 : aSide == 0 ? 2 : aSide == 1 ? 3 : 4)][aColorIndex + 1]; + } + + @Override + public ITexture[] getFrontFacingInactive(final byte aColor) { + return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], new GT_RenderedTexture(sDehydratorOverlays[0])}; + } + + @Override + public ITexture[] getBottomFacingInactive(final byte aColor) { + return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], new GT_RenderedTexture(sDehydratorOverlays[2])}; + } + + @Override + public ITexture[] getTopFacingInactive(final byte aColor) { + return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], new GT_RenderedTexture(sDehydratorOverlays[3])}; + } + + @Override + public ITexture[] getSideFacingInactive(final byte aColor) { + return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], new GT_RenderedTexture(sDehydratorOverlays[4])}; + } + + @Override + public ITexture[] getFrontFacingActive(final byte aColor) { + return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], new GT_RenderedTexture(sDehydratorOverlays[5])}; + } + + @Override + public ITexture[] getBottomFacingActive(final byte aColor) { + return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], new GT_RenderedTexture(sDehydratorOverlays[7])}; + } + + @Override + public ITexture[] getTopFacingActive(final byte aColor) { + return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], new GT_RenderedTexture(sDehydratorOverlays[8])}; + } + + @Override + public ITexture[] getSideFacingActive(final byte aColor) { + return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], new GT_RenderedTexture(sDehydratorOverlays[9])}; + } + + @Override + public ITexture[] getBottomFacingPipeActive(byte aColor) { + return new ITexture[]{MACHINE_CASINGS[mTier][aColor + 1], TextureFactory.of(OVERLAY_PIPE_OUT)}; + } + + @Override + public ITexture[] getBottomFacingPipeInactive(byte aColor) { + return new ITexture[]{MACHINE_CASINGS[mTier][aColor + 1], TextureFactory.of(OVERLAY_PIPE_OUT)}; + } + + @Override + public ITexture[] getTopFacingPipeActive(byte aColor) { + return new ITexture[]{MACHINE_CASINGS[mTier][aColor + 1], TextureFactory.of(OVERLAY_PIPE_OUT)}; + } + + @Override + public ITexture[] getTopFacingPipeInactive(byte aColor) { + return new ITexture[]{MACHINE_CASINGS[mTier][aColor + 1], TextureFactory.of(OVERLAY_PIPE_OUT)}; + } + + @Override + public ITexture[] getSideFacingPipeActive(byte aColor) { + return new ITexture[]{MACHINE_CASINGS[mTier][aColor + 1], TextureFactory.of(OVERLAY_PIPE_OUT)}; + } + + @Override + public ITexture[] getSideFacingPipeInactive(byte aColor) { + return new ITexture[]{MACHINE_CASINGS[mTier][aColor + 1], TextureFactory.of(OVERLAY_PIPE_OUT)}; + } + +} diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_DeluxeMachine.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_DeluxeMachine.java index 79238240d2..79238240d2 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_DeluxeMachine.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_DeluxeMachine.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_DeluxeTank.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_DeluxeTank.java index 1e367d4f15..1e367d4f15 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_DeluxeTank.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_DeluxeTank.java diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_AirIntake.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_AirIntake.java new file mode 100644 index 0000000000..02b7a03f3b --- /dev/null +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_AirIntake.java @@ -0,0 +1,110 @@ +package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations; + +import gregtech.api.interfaces.ITexture; +import gregtech.api.interfaces.tileentity.IGregTechTileEntity; +import gregtech.api.metatileentity.MetaTileEntity; +import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.util.minecraft.FluidUtils; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.Fluid; + +public class GT_MetaTileEntity_Hatch_AirIntake extends GT_MetaTileEntity_Hatch_FluidGenerator { + + public GT_MetaTileEntity_Hatch_AirIntake(final int aID, final String aName, final String aNameRegional, final int aTier) { + super(aID, aName, aNameRegional, aTier); + } + + public GT_MetaTileEntity_Hatch_AirIntake(final String aName, final int aTier, final String aDescription, final ITexture[][][] aTextures) { + super(aName, aTier, aDescription, aTextures); + } + + + public MetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { + return new GT_MetaTileEntity_Hatch_AirIntake(this.mName, this.mTier, this.mDescription, this.mTextures); + } + + @Override + public String[] getCustomTooltip() { + String[] aTooltip = new String[3]; + aTooltip[0] = "DO NOT OBSTRUCT THE INPUT!"; + aTooltip[1] = "Draws in Air from the surrounding environment"; + aTooltip[2] = "Creates "+getAmountOfFluidToGenerate()+"L of Air every "+getMaxTickTime()+" ticks"; + return aTooltip; + } + + @Override + public Fluid getFluidToGenerate() { + return FluidUtils.getAir(1).getFluid(); + } + + @Override + public int getAmountOfFluidToGenerate() { + return 1000; + } + + @Override + public int getMaxTickTime() { + return 4; + } + + @Override + public int getCapacity() { + return 128000; + } + + @Override + public boolean doesHatchMeetConditionsToGenerate() { + return this.getBaseMetaTileEntity().getAirAtSide(this.getBaseMetaTileEntity().getFrontFacing()); + } + + @Override + public void generateParticles(World aWorld, String name) { + if (this.getBaseMetaTileEntity().isServerSide()) { + return; + } + final float ran1 = GT_MetaTileEntity_Hatch_AirIntake.floatGen.nextFloat(); + float ran2 = 0.0f; + float ran3 = 0.0f; + ran2 = GT_MetaTileEntity_Hatch_AirIntake.floatGen.nextFloat(); + ran3 = GT_MetaTileEntity_Hatch_AirIntake.floatGen.nextFloat(); + + final IGregTechTileEntity aMuffler = this.getBaseMetaTileEntity(); + final ForgeDirection aDir = ForgeDirection.getOrientation((int) aMuffler.getFrontFacing()); + final float xPos = aDir.offsetX * 0.76f + aMuffler.getXCoord() + 0.25f; + float yPos = aDir.offsetY * 0.76f + aMuffler.getYCoord() + 0.65f; + final float zPos = aDir.offsetZ * 0.76f + aMuffler.getZCoord() + 0.25f; + float ySpd = aDir.offsetY * 0.1f + 0.2f + 0.1f * GT_MetaTileEntity_Hatch_AirIntake.floatGen.nextFloat(); + float xSpd; + float zSpd; + if (aDir.offsetY == -1) { + //Logger.INFO("Y = -1"); + final float temp = GT_MetaTileEntity_Hatch_AirIntake.floatGen.nextFloat() * 2.0f * CORE.PI; + xSpd = (float) Math.sin(temp) * 0.1f; + zSpd = (float) Math.cos(temp) * 0.1f; + ySpd = -ySpd; + yPos = yPos - 0.8f; + } + else { + xSpd = aDir.offsetX * (0.1f + 0.2f * GT_MetaTileEntity_Hatch_AirIntake.floatGen.nextFloat()); + zSpd = aDir.offsetZ * (0.1f + 0.2f * GT_MetaTileEntity_Hatch_AirIntake.floatGen.nextFloat()); + + xSpd = -xSpd; + zSpd = -zSpd; + } + + aWorld.spawnParticle(name, (double) (xPos + ran1 * 0.5f), + (double) (yPos + GT_MetaTileEntity_Hatch_AirIntake.floatGen.nextFloat() * 0.5f), + (double) (zPos + GT_MetaTileEntity_Hatch_AirIntake.floatGen.nextFloat() * 0.5f), (double) xSpd, + (double) -ySpd, (double) zSpd); + aWorld.spawnParticle(name, (double) (xPos + ran2 * 0.5f), + (double) (yPos + GT_MetaTileEntity_Hatch_AirIntake.floatGen.nextFloat() * 0.5f), + (double) (zPos + GT_MetaTileEntity_Hatch_AirIntake.floatGen.nextFloat() * 0.5f), (double) xSpd, + (double) -ySpd, (double) zSpd); + aWorld.spawnParticle(name, (double) (xPos + ran3 * 0.5f), + (double) (yPos + GT_MetaTileEntity_Hatch_AirIntake.floatGen.nextFloat() * 0.5f), + (double) (zPos + GT_MetaTileEntity_Hatch_AirIntake.floatGen.nextFloat() * 0.5f), (double) xSpd, + (double) -ySpd, (double) zSpd); + } + +} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_AirIntake_Extreme.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_AirIntake_Extreme.java new file mode 100644 index 0000000000..45611d9e05 --- /dev/null +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_AirIntake_Extreme.java @@ -0,0 +1,32 @@ +package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations; + +import gregtech.api.interfaces.ITexture; +import gregtech.api.interfaces.tileentity.IGregTechTileEntity; +import gregtech.api.metatileentity.MetaTileEntity; + +public class GT_MetaTileEntity_Hatch_AirIntake_Extreme extends GT_MetaTileEntity_Hatch_AirIntake { + + public GT_MetaTileEntity_Hatch_AirIntake_Extreme(final int aID, final String aName, final String aNameRegional, final int aTier) { + super(aID, aName, aNameRegional, aTier); + } + + public GT_MetaTileEntity_Hatch_AirIntake_Extreme(final String aName, final int aTier, final String aDescription, final ITexture[][][] aTextures) { + super(aName, aTier, aDescription, aTextures); + } + + + public MetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { + return new GT_MetaTileEntity_Hatch_AirIntake_Extreme(this.mName, this.mTier, this.mDescription, this.mTextures); + } + + @Override + public int getAmountOfFluidToGenerate() { + return 8000; + } + + @Override + public int getCapacity() { + return 256000; + } + +} diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ControlCore.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ControlCore.java index 7a532807c8..5347b2e4f7 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ControlCore.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ControlCore.java @@ -10,6 +10,7 @@ import gregtech.api.util.GT_Recipe.GT_Recipe_Map; import gregtech.api.util.GT_Utility; import gtPlusPlus.api.objects.minecraft.BlockPos; import gtPlusPlus.core.item.general.ItemControlCore; +import gtPlusPlus.core.lib.CORE; import gtPlusPlus.xmod.gregtech.common.StaticFields59; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; import net.minecraft.entity.player.EntityPlayer; @@ -34,6 +35,13 @@ public class GT_MetaTileEntity_Hatch_ControlCore extends GT_MetaTileEntity_Hatch public GT_MetaTileEntity_Hatch_ControlCore(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, aTier < 1 ? 1 : aTier == 1 ? 4 : aTier == 2 ? 9 : 16, aDescription[0], aTextures); } + + @Override + public String[] getDescription() { + return new String[]{ + this.mDescription, + CORE.GT_Tooltip}; + } @Override public ITexture[] getTexturesActive(ITexture aBaseTexture) { diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_DynamoBuffer.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_DynamoBuffer.java index 5fef0f1088..39f477b173 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_DynamoBuffer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_DynamoBuffer.java @@ -53,11 +53,21 @@ public class GT_MetaTileEntity_Hatch_DynamoBuffer extends GT_MetaTileEntity_Hatc public String[] getDescription() { String[] g; if (CORE.GTNH || (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK && Utils.getGregtechVersionAsInt() >= 50932)) { - g = new String[]{"Dynamo with internal storage and additional Amp capacity", "Capacity: "+maxEUStore()+"EU", "Voltage: "+this.maxEUOutput(), "Amperage In: 4", "Amperage Out: 4"}; + g = new String[]{ + "Dynamo with internal storage and additional Amp capacity", + "Does not accept more than "+(this.maxEUOutput() * this.maxAmperesIn())+"EU/t as input", + CORE.GT_Tooltip}; } else { - g = new String[]{"Dynamo with internal storage and additional Amp capacity", "Stores "+maxEUStore()+"EU", "Amperage In: 4", "Amperage Out: 4", "Does not accept more than "+this.maxEUOutput()+"EU/t as input", "Large Turbines only supply 1A to this, other Multiblocks can inject more amps"}; + g = new String[]{ + "Dynamo with internal storage and additional Amp capacity", + "Stores "+maxEUStore()+"EU", + "Amperage In: 4", + "Amperage Out: 4", + "Does not accept more than "+(this.maxEUOutput() * this.maxAmperesIn())+"EU/t as input", + "Large Turbines only supply 1A to this, other Multiblocks can inject more amps", + CORE.GT_Tooltip}; } return g; } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ElementalDataOrbHolder.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ElementalDataOrbHolder.java index a98c57eb30..a892346463 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ElementalDataOrbHolder.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ElementalDataOrbHolder.java @@ -1,5 +1,7 @@ package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations; +import java.util.ArrayList; + import gregtech.api.gui.GT_Container_4by4; import gregtech.api.gui.GT_GUIContainer_4by4; import gregtech.api.interfaces.ITexture; @@ -9,6 +11,7 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_LanguageManager; import gregtech.api.util.GT_Recipe.GT_Recipe_Map; +import gtPlusPlus.core.lib.CORE; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; @@ -17,13 +20,12 @@ import net.minecraft.nbt.NBTTagCompound; public class GT_MetaTileEntity_Hatch_ElementalDataOrbHolder extends GT_MetaTileEntity_Hatch { public GT_Recipe_Map mRecipeMap = null; - public boolean disableSort; public GT_MetaTileEntity_Hatch_ElementalDataOrbHolder(int aID, String aName, String aNameRegional, int aTier) { super(aID, aName, aNameRegional, aTier, 16, new String[]{ "Holds Data Orbs for the Elemental Duplicator", - }); - disableSort = true; + CORE.GT_Tooltip + }); } public GT_MetaTileEntity_Hatch_ElementalDataOrbHolder(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { @@ -83,7 +85,7 @@ public class GT_MetaTileEntity_Hatch_ElementalDataOrbHolder extends GT_MetaTileE @Override public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) { - return new GT_GUIContainer_4by4(aPlayerInventory, aBaseMetaTileEntity, "Steam Input Bus"); + return new GT_GUIContainer_4by4(aPlayerInventory, aBaseMetaTileEntity, "Data Orb Repository"); } @Override @@ -100,28 +102,26 @@ public class GT_MetaTileEntity_Hatch_ElementalDataOrbHolder extends GT_MetaTileE } protected void fillStacksIntoFirstSlots() { - if (disableSort) { - for (int i = 0; i < mInventory.length; i++) - if (mInventory[i] != null && mInventory[i].stackSize <= 0) - mInventory[i] = null; - } + for (int i = 0; i < mInventory.length; i++) { + if (mInventory[i] != null && mInventory[i].stackSize <= 0) { + mInventory[i] = null; + } + } } @Override public void saveNBTData(NBTTagCompound aNBT) { super.saveNBTData(aNBT); - aNBT.setBoolean("disableSort", disableSort); } @Override public void loadNBTData(NBTTagCompound aNBT) { super.loadNBTData(aNBT); - disableSort = aNBT.getBoolean("disableSort"); } @Override public void onScrewdriverRightClick(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) { - + } public String trans(String aKey, String aEnglish) { @@ -137,5 +137,13 @@ public class GT_MetaTileEntity_Hatch_ElementalDataOrbHolder extends GT_MetaTileE public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) { return aSide == getBaseMetaTileEntity().getFrontFacing() && (mRecipeMap == null || mRecipeMap.containsInput(aStack)); } + + public ArrayList<ItemStack> getInventory(){ + ArrayList<ItemStack> aContents = new ArrayList<ItemStack>(); + for (int i=0;i<this.getSizeInventory();i++) { + aContents.add(this.getStackInSlot(i)); + } + return aContents; + } } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Energy_RTG.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Energy_RTG.java index 7b52b9449f..93e6274508 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Energy_RTG.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Energy_RTG.java @@ -12,6 +12,7 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy; import gtPlusPlus.api.objects.Logger; +import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.minecraft.InventoryUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.reflect.ReflectionUtils; @@ -37,8 +38,12 @@ public class GT_MetaTileEntity_Hatch_Energy_RTG extends GT_MetaTileEntity_Hatch_ } @Override - public String[] getDescription() { - return super.getDescription(); + public String[] getDescription() { + String[] S = super.getDescription(); + final String[] desc = new String[S.length + 1]; + System.arraycopy(S, 0, desc, 0, S.length); + desc[S.length] = CORE.GT_Tooltip; + return desc; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_FluidGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_FluidGenerator.java new file mode 100644 index 0000000000..d4b8b3a064 --- /dev/null +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_FluidGenerator.java @@ -0,0 +1,252 @@ +package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations; + +import java.lang.reflect.Field; + +import gregtech.api.enums.Textures; +import gregtech.api.interfaces.IIconContainer; +import gregtech.api.interfaces.ITexture; +import gregtech.api.interfaces.tileentity.IGregTechTileEntity; +import gregtech.api.metatileentity.MetaTileEntity; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input; +import gregtech.api.objects.GT_RenderedTexture; +import gtPlusPlus.api.objects.Logger; +import gtPlusPlus.api.objects.random.XSTR; +import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.util.minecraft.FluidUtils; +import gtPlusPlus.core.util.reflect.ReflectionUtils; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; + +public abstract class GT_MetaTileEntity_Hatch_FluidGenerator extends GT_MetaTileEntity_Hatch_Input { + + protected static XSTR floatGen = new XSTR(); + public int mProgresstime = 0, mMaxProgresstime = 0; + + public GT_MetaTileEntity_Hatch_FluidGenerator(final int aID, final String aName, final String aNameRegional, final int aTier) { + super(aID, aName, aNameRegional, aTier); + } + + public GT_MetaTileEntity_Hatch_FluidGenerator(final String aName, final int aTier, final String aDescription, final ITexture[][][] aTextures) { + super(aName, aTier, aDescription, aTextures); + } + + private static String[] S; + private static Field F; + + public abstract String[] getCustomTooltip(); + + public abstract Fluid getFluidToGenerate(); + + public abstract int getAmountOfFluidToGenerate(); + + public abstract int getMaxTickTime(); + + public synchronized String[] getDescription() { + try { + if (F == null || S == null) { + Field t = ReflectionUtils.getField(this.getClass(), "mDescriptionArray"); + if (t != null) { + F = t; + } + else { + F = ReflectionUtils.getField(this.getClass(), "mDescription"); + } + if (S == null && F != null) { + Object o = F.get(this); + if (o instanceof String[]) { + S = (String[]) o; + } + else if (o instanceof String) { + S = new String[] {(String) o}; + } + } + + } + } + catch (Throwable t) { + Logger.INFO("1"); + t.printStackTrace(); + } + try { + if (S != null) { + String[] aCustomTips = getCustomTooltip(); + final String[] desc = new String[S.length + aCustomTips.length + 1]; + System.arraycopy(S, 0, desc, 0, S.length); + for (int i=0;i<aCustomTips.length;i++) { + desc[S.length + i] = aCustomTips[i]; + } + desc[S.length + aCustomTips.length] = CORE.GT_Tooltip; + return desc; + } + } + catch (Throwable t) { + Logger.INFO("2"); + t.printStackTrace(); + } + + return new String[] {"Broken Tooltip - Report on Github"}; + + } + + public ITexture[] getTexturesActive(final ITexture aBaseTexture) { + return new ITexture[]{aBaseTexture, + new GT_RenderedTexture((IIconContainer) Textures.BlockIcons.OVERLAY_MUFFLER)}; + } + + public ITexture[] getTexturesInactive(final ITexture aBaseTexture) { + return new ITexture[]{aBaseTexture, + new GT_RenderedTexture((IIconContainer) Textures.BlockIcons.OVERLAY_MUFFLER)}; + } + + public boolean isSimpleMachine() { + return true; + } + + public boolean isFacingValid(final byte aFacing) { + return true; + } + + public boolean isAccessAllowed(final EntityPlayer aPlayer) { + return true; + } + + public boolean isValidSlot(final int aIndex) { + return false; + } + + public abstract MetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity); + + public boolean allowPullStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide, + final ItemStack aStack) { + return false; + } + + public boolean allowPutStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide, + final ItemStack aStack) { + return false; + } + + public void onPostTick(final IGregTechTileEntity aBaseMetaTileEntity, final long aTick) { + super.onPostTick(aBaseMetaTileEntity, aTick); + + if (!aBaseMetaTileEntity.isAllowedToWork()) { + aBaseMetaTileEntity.setActive(false); + mProgresstime = 0; + mMaxProgresstime = 0; + } + else { + aBaseMetaTileEntity.setActive(true); + mMaxProgresstime = getMaxTickTime(); + if (++mProgresstime >= mMaxProgresstime) { + addFluidToHatch(aTick); + mProgresstime = 0; + } + } + } + + @Override + public int getProgresstime() { + return mProgresstime; + } + + @Override + public int maxProgresstime() { + return mMaxProgresstime; + } + + @Override + public int increaseProgress(int aProgress) { + mProgresstime += aProgress; + return mMaxProgresstime - mProgresstime; + } + + public abstract void generateParticles(final World aWorld, final String name); + + public int getTankPressure() { + return 100; + } + + public abstract int getCapacity(); + + @Override + public boolean canTankBeEmptied() { + return true; + } + + public abstract boolean doesHatchMeetConditionsToGenerate(); + + public boolean addFluidToHatch(long aTick) { + if (!doesHatchMeetConditionsToGenerate()) { + return false; + } + boolean didFill = false; + if (canTankBeFilled()) { + didFill = this.fill(FluidUtils.getFluidStack(getFluidToGenerate(), getAmountOfFluidToGenerate()), true) > 0; + if (didFill) { + this.generateParticles(this.getBaseMetaTileEntity().getWorld(), "cloud"); + } + } + return didFill; + } + + @Override + public boolean canTankBeFilled() { + //Logger.INFO("Total Space: "+this.getCapacity()); + //Logger.INFO("Current capacity: "+this.getFluidAmount()); + //Logger.INFO("To add: "+this.getAmountOfFluidToGenerate()); + //Logger.INFO("Space Free: "+(this.getCapacity()-this.getFluidAmount())); + if (this.mFluid == null || (this.mFluid != null && (this.getCapacity() - this.getFluidAmount() >= this.getAmountOfFluidToGenerate()))) { + return true; + } + return false; + } + + @Override + public boolean doesEmptyContainers() { + return false; + } + + @Override + public boolean doesFillContainers() { + return true; + } + + @Override + public int fill(FluidStack aFluid, boolean doFill) { + return super.fill(aFluid, doFill); + } + + @Override + public boolean canFill(ForgeDirection aSide, Fluid aFluid) { + return false; + } + + @Override + public int fill(ForgeDirection arg0, FluidStack arg1, boolean arg2) { + return 0; + } + + @Override + public int fill_default(ForgeDirection aSide, FluidStack aFluid, boolean doFill) { + return 0; + } + + @Override + public void saveNBTData(NBTTagCompound aNBT) { + aNBT.setInteger("mProgresstime", mProgresstime); + aNBT.setInteger("mMaxProgresstime", mMaxProgresstime); + super.saveNBTData(aNBT); + } + + @Override + public void loadNBTData(NBTTagCompound aNBT) { + mProgresstime = aNBT.getInteger("mProgresstime"); + mMaxProgresstime = aNBT.getInteger("mMaxProgresstime"); + super.loadNBTData(aNBT); + } +} diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_InputBattery.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_InputBattery.java index 01134817ae..57f8b722c3 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_InputBattery.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_InputBattery.java @@ -51,7 +51,8 @@ GT_MetaTileEntity_Hatch { } return new String[]{ this.mDescription, - "Capacity: " + mSlots + " slots"}; + "Capacity: " + mSlots + " slots", + CORE.GT_Tooltip}; } @Override diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler_Adv.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler_Adv.java index 5303a42bf6..ba4e394114 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler_Adv.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler_Adv.java @@ -62,15 +62,15 @@ public class GT_MetaTileEntity_Hatch_Muffler_Adv extends GT_MetaTileEntity_Hatch public String[] getDescription() { if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) { String[] mDescArray = StaticFields59.getDescriptionArray(this); - String[] desc = new String[mDescArray.length + 6]; + String[] desc = new String[mDescArray.length + 7]; System.arraycopy(mDescArray, 0, desc, 0, mDescArray.length); desc[mDescArray.length] = "DO NOT OBSTRUCT THE OUTPUT!"; desc[mDescArray.length + 1] = "Requires 3 Air on the exhaust face"; desc[mDescArray.length + 2] = "Requires Air Filters"; desc[mDescArray.length + 3] = "Mufflers require T2 Filters from IV-"+GT_Values.VN[9]; desc[mDescArray.length + 4] = "Reduces Pollution to " + this.calculatePollutionReductionForTooltip(100) + "%"; - desc[mDescArray.length + 5] = "Recovers " + (105 - this.calculatePollutionReductionForTooltip(100)) - + "% of CO2/CO/SO2"; + desc[mDescArray.length + 5] = "Recovers " + (105 - this.calculatePollutionReductionForTooltip(100)) + "% of CO2/CO/SO2"; + desc[mDescArray.length + 6] = CORE.GT_Tooltip; return desc; } else { diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Naquadah.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Naquadah.java index 0d4d8b6cdd..d0f1d8e03f 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Naquadah.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Naquadah.java @@ -12,6 +12,7 @@ import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input; import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_Utility; +import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.reflect.ReflectionUtils; import gtPlusPlus.xmod.gregtech.common.StaticFields59; import net.minecraft.item.ItemStack; @@ -115,7 +116,8 @@ public class GT_MetaTileEntity_Hatch_Naquadah extends GT_MetaTileEntity_Hatch_In "Capacity: " + getCapacity()+"L", "Accepted Fluid: " + aNaq, "Accepted Fluid: " + aEnrNaq, - "Accepted Fluid: " + aNaquad + "Accepted Fluid: " + aNaquad, + CORE.GT_Tooltip }; return s2; } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_OutputBattery.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_OutputBattery.java index 8cb7c943c0..ba97cc38eb 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_OutputBattery.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_OutputBattery.java @@ -49,7 +49,8 @@ GT_MetaTileEntity_Hatch { } return new String[]{ this.mDescription, - "Capacity: " + mSlots + " slots"}; + "Capacity: " + mSlots + " slots", + CORE.GT_Tooltip}; } @Override diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Plasma.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Plasma.java index b395bbbabe..1251c42ae3 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Plasma.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Plasma.java @@ -11,6 +11,7 @@ import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output; import gregtech.api.util.GT_Utility; import gtPlusPlus.api.objects.data.AutoMap; +import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.reflect.ReflectionUtils; import gtPlusPlus.xmod.gregtech.common.StaticFields59; import net.minecraft.item.ItemStack; @@ -159,7 +160,7 @@ public class GT_MetaTileEntity_Hatch_Plasma extends GT_MetaTileEntity_Hatch_Outp String[] s2 = new String[]{ - a1, a2, a3 + a1, a2, a3, CORE.GT_Tooltip }; return s2; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Reservoir.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Reservoir.java new file mode 100644 index 0000000000..75c5dbb9ee --- /dev/null +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Reservoir.java @@ -0,0 +1,123 @@ +package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations; + +import cpw.mods.fml.common.registry.GameRegistry; +import gregtech.api.interfaces.ITexture; +import gregtech.api.interfaces.tileentity.IGregTechTileEntity; +import gregtech.api.metatileentity.MetaTileEntity; +import gregtech.api.objects.GT_RenderedTexture; +import gtPlusPlus.core.lib.LoadedMods; +import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; +import net.minecraft.block.Block; +import net.minecraft.init.Blocks; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.IFluidHandler; + +public class GT_MetaTileEntity_Hatch_Reservoir extends GT_MetaTileEntity_Hatch_FluidGenerator { + + private static Block sBlock_EIO; + private static Block sBlock_RIO; + + public GT_MetaTileEntity_Hatch_Reservoir(final int aID, final String aName, final String aNameRegional, final int aTier) { + super(aID, aName, aNameRegional, aTier); + } + + public GT_MetaTileEntity_Hatch_Reservoir(final String aName, final int aTier, final String aDescription, final ITexture[][][] aTextures) { + super(aName, aTier, aDescription, aTextures); + } + + + public MetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { + return new GT_MetaTileEntity_Hatch_Reservoir(this.mName, this.mTier, this.mDescription, this.mTextures); + } + + @Override + public String[] getCustomTooltip() { + String[] aTooltip = new String[3]; + aTooltip[0] = "Requires a Block of water facing the intake"; + aTooltip[1] = "Infinite water supply hatch"; + aTooltip[2] = "Creates 8000L of Water every 4 ticks"; + return aTooltip; + } + + @Override + public Fluid getFluidToGenerate() { + return FluidRegistry.WATER; + } + + @Override + public int getAmountOfFluidToGenerate() { + return 8000; + } + + @Override + public int getMaxTickTime() { + return 4; + } + + @Override + public int getCapacity() { + return 256000; + } + + private static void setCrossModData() { + if (LoadedMods.EnderIO && sBlock_EIO == null) { + sBlock_EIO = GameRegistry.findBlock("EnderIO", "blockReservoir"); + } + if (LoadedMods.RemoteIO && sBlock_RIO == null) { + sBlock_RIO = GameRegistry.findBlock("RIO", "machine"); + } + } + + public static boolean isTileValid(TileEntity aTile) { + if (aTile != null) { + if (aTile instanceof IFluidHandler) { + IFluidHandler aFluidHandler = (IFluidHandler) aTile; + return aFluidHandler.canDrain(ForgeDirection.UNKNOWN, FluidRegistry.WATER); + } + } + return false; + } + + @Override + public boolean doesHatchMeetConditionsToGenerate() { + Block aWater = this.getBaseMetaTileEntity().getBlockAtSide(this.getBaseMetaTileEntity().getFrontFacing()); + if (aWater != null && aWater != Blocks.air) { + if (!this.canTankBeFilled()) { + return false; + } + setCrossModData(); + if (LoadedMods.EnderIO) { + if (aWater == sBlock_EIO) { + return isTileValid(this.getBaseMetaTileEntity().getTileEntityAtSide(this.getBaseMetaTileEntity().getFrontFacing())); + } + } + if (LoadedMods.RemoteIO) { + if (aWater == sBlock_RIO && this.getBaseMetaTileEntity().getMetaIDAtSide(this.getBaseMetaTileEntity().getFrontFacing()) == 0) { + return isTileValid(this.getBaseMetaTileEntity().getTileEntityAtSide(this.getBaseMetaTileEntity().getFrontFacing())); + } + } + return aWater == Blocks.water || aWater == Blocks.flowing_water; + } + return false; + } + + @Override + public void generateParticles(World aWorld, String name) { + + } + + public ITexture[] getTexturesActive(final ITexture aBaseTexture) { + return new ITexture[]{aBaseTexture, + new GT_RenderedTexture(TexturesGtBlock.Overlay_Water)}; + } + + public ITexture[] getTexturesInactive(final ITexture aBaseTexture) { + return new ITexture[]{aBaseTexture, + new GT_RenderedTexture(TexturesGtBlock.Overlay_Water)}; + } + +} diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Steam_BusInput.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Steam_BusInput.java index fb67b48e7f..f1dd131a67 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Steam_BusInput.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Steam_BusInput.java @@ -10,6 +10,7 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_LanguageManager; import gregtech.api.util.GT_Recipe.GT_Recipe_Map; +import gtPlusPlus.core.lib.CORE; import gregtech.api.util.GT_Utility; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; @@ -25,7 +26,8 @@ public class GT_MetaTileEntity_Hatch_Steam_BusInput extends GT_MetaTileEntity_Ha "Item Input for Steam Multiblocks", "Shift + right click with screwdriver to toggle automatic item shuffling", "Capacity: 4 stacks", - "Does not work with non-steam multiblocks"}); + "Does not work with non-steam multiblocks", + CORE.GT_Tooltip}); } public GT_MetaTileEntity_Hatch_Steam_BusInput(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Steam_BusOutput.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Steam_BusOutput.java index fb626cb817..2fb3fea084 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Steam_BusOutput.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Steam_BusOutput.java @@ -8,6 +8,7 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; import gregtech.api.objects.GT_RenderedTexture; +import gtPlusPlus.core.lib.CORE; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemStack; @@ -16,7 +17,8 @@ public class GT_MetaTileEntity_Hatch_Steam_BusOutput extends GT_MetaTileEntity_H public GT_MetaTileEntity_Hatch_Steam_BusOutput(int aID, String aName, String aNameRegional, int aTier) { super(aID, aName, aNameRegional, aTier, 4, new String[]{"Item Output for Steam Multiblocks", "Capacity: 4 stacks", - "Does not work with non-steam multiblocks"}); + "Does not work with non-steam multiblocks", + CORE.GT_Tooltip}); } public GT_MetaTileEntity_Hatch_Steam_BusOutput(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Turbine.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Turbine.java index a9cd179214..a9cd179214 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Turbine.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Turbine.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_TurbineProvider.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_TurbineProvider.java index 752321506d..0b84f676f4 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_TurbineProvider.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_TurbineProvider.java @@ -8,6 +8,7 @@ import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_InputBus; import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_LargeTurbine; import gtPlusPlus.api.objects.Logger; +import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.PlayerUtils; import gtPlusPlus.core.util.sys.KeyboardUtils; @@ -49,7 +50,14 @@ public class GT_MetaTileEntity_Hatch_TurbineProvider extends GT_MetaTileEntity_H @Override public String[] getDescription() { return new String[]{ - "An automation port for Large Turbines", "Will attempt once per 1200 ticks to fill the turbine slot of it's parent turbine", "You may adjust this with a screwdriver", "Hold shift to adjust in finer amounts", "Hold control to adjust direction", "Left Click with Screwdriver to reset", "This module assumes the entire turbine is in the same Chunk"}; + "An automation port for Large Turbines", + "Will attempt once per 1200 ticks to fill the turbine slot of it's parent turbine", + "You may adjust this with a screwdriver", + "Hold shift to adjust in finer amounts", + "Hold control to adjust direction", + "Left Click with Screwdriver to reset", + "This module assumes the entire turbine is in the same Chunk", + CORE.GT_Tooltip}; } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_SuperBus_Input.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_SuperBus_Input.java index d503452022..b27cb95ca4 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_SuperBus_Input.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_SuperBus_Input.java @@ -8,6 +8,7 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_Utility; import gregtech.api.util.extensions.ArrayExt; +import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.PlayerUtils; import net.minecraft.entity.player.EntityPlayer; @@ -125,6 +126,7 @@ public class GT_MetaTileEntity_SuperBus_Input extends GT_MetaTileEntity_Hatch_In "Item Input for Multiblocks", "This bus has no GUI, but can have items extracted", ""+getSlots(this.mTier)+" Slots", + CORE.GT_Tooltip }; return aDesc; } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_SuperBus_Output.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_SuperBus_Output.java index 66bfbea8b1..37aa57298a 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_SuperBus_Output.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_SuperBus_Output.java @@ -6,6 +6,7 @@ import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_OutputBus; import gregtech.api.util.GT_Utility; import gregtech.api.util.extensions.ArrayExt; +import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.PlayerUtils; import net.minecraft.entity.player.EntityPlayer; @@ -93,6 +94,7 @@ public class GT_MetaTileEntity_SuperBus_Output extends GT_MetaTileEntity_Hatch_O "Item Output for Multiblocks", "This bus has no GUI", ""+getSlots(this.mTier)+" Slots", + CORE.GT_Tooltip }; return aDesc; } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntityFluid.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntityFluid.java index f6e778f989..f6e778f989 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntityFluid.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntityFluid.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntity_Cable.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntity_Cable.java index 98722a2b96..98722a2b96 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntity_Cable.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntity_Cable.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaTreeFarmerStructural.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaTreeFarmerStructural.java index d05a254bf7..d05a254bf7 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaTreeFarmerStructural.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaTreeFarmerStructural.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/CustomMetaTileBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/CustomMetaTileBase.java index 422837fa46..422837fa46 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/CustomMetaTileBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/CustomMetaTileBase.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GT_MetaTileEntity_Hatch_CustomFluidBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GT_MetaTileEntity_Hatch_CustomFluidBase.java index e0ff04763d..124f8695f5 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GT_MetaTileEntity_Hatch_CustomFluidBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GT_MetaTileEntity_Hatch_CustomFluidBase.java @@ -2,6 +2,7 @@ package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base; import gregtech.api.util.GT_Utility; import gtPlusPlus.api.objects.Logger; +import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.minecraft.FluidUtils; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; @@ -114,7 +115,8 @@ public class GT_MetaTileEntity_Hatch_CustomFluidBase extends GT_MetaTileEntity_H String[] s2 = new String[]{ "Fluid Input for "+(isSteam ? "Steam " : "")+"Multiblocks", "Capacity: " + getCapacity()+"L", - aFluidName + aFluidName, + CORE.GT_Tooltip }; return s2; } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaPipeEntityBase_Cable.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaPipeEntityBase_Cable.java index 4dd5bf25d6..4dd5bf25d6 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaPipeEntityBase_Cable.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaPipeEntityBase_Cable.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaTileEntity.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaTileEntity.java index c9201471a4..c9201471a4 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaTileEntity.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaTileEntity.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaTransformerHiAmp.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaTransformerHiAmp.java index ccf31673e7..768a57f8b2 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaTransformerHiAmp.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaTransformerHiAmp.java @@ -85,7 +85,9 @@ public class GregtechMetaTransformerHiAmp extends GT_MetaTileEntity_Transformer @Override public String[] getDescription() { - return new String[] { this.mDescription, "Accepts 4A and outputs 16A"}; + return new String[] { this.mDescription, + "Accepts 4A and outputs 16A", + CORE.GT_Tooltip}; } @Override diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java index 0b8182c64a..356f96f7cc 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java @@ -30,6 +30,7 @@ import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; +import gtPlusPlus.core.util.minecraft.PlayerUtils; import gtPlusPlus.core.util.reflect.ReflectionUtils; import gtPlusPlus.preloader.CORE_Preloader; import gtPlusPlus.preloader.asm.AsmConfig; @@ -38,6 +39,7 @@ import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEn import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_ControlCore; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_InputBattery; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_OutputBattery; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Steam_BusInput; import gtPlusPlus.xmod.gregtech.api.objects.MultiblockRequirements; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; @@ -51,6 +53,8 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.oredict.OreDictionary; + import org.apache.commons.lang3.ArrayUtils; import java.lang.reflect.InvocationTargetException; @@ -63,6 +67,10 @@ import java.util.function.Function; import static gtPlusPlus.core.util.data.ArrayUtils.removeNulls; +// Glee8e - 11/12/21 - 2:15pm +// Yeah, now I see what's wrong. Someone inherited from GregtechMeta_MultiBlockBase instead of GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialDehydrator> as it should have been +// so any method in GregtechMetaTileEntity_IndustrialDehydrator would see generic field declared in GregtechMeta_MultiBlockBase without generic parameter + public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_EnhancedMultiBlockBase<T>> extends GT_MetaTileEntity_EnhancedMultiBlockBase<T> { public static final boolean DEBUG_DISABLE_CORES_TEMPORARILY = true; @@ -91,14 +99,15 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_En protected long mTotalRunTime = 0; protected boolean mVoidExcess = false; - //Control Core Hatch public ArrayList<GT_MetaTileEntity_Hatch_ControlCore> mControlCoreBus = new ArrayList<GT_MetaTileEntity_Hatch_ControlCore>(); public ArrayList<GT_MetaTileEntity_Hatch_AirIntake> mAirIntakes = new ArrayList<GT_MetaTileEntity_Hatch_AirIntake>(); public ArrayList<GT_MetaTileEntity_Hatch_InputBattery> mChargeHatches = new ArrayList<GT_MetaTileEntity_Hatch_InputBattery>(); public ArrayList<GT_MetaTileEntity_Hatch_OutputBattery> mDischargeHatches = new ArrayList<GT_MetaTileEntity_Hatch_OutputBattery>(); + public ArrayList<GT_MetaTileEntity_Hatch> mAllEnergyHatches = new ArrayList<GT_MetaTileEntity_Hatch>(); + public ArrayList<GT_MetaTileEntity_Hatch> mAllDynamoHatches = new ArrayList<GT_MetaTileEntity_Hatch>(); // Custom Behaviour Map - private static final HashMap<String, SpecialMultiBehaviour> mCustomBehviours = new HashMap<String, SpecialMultiBehaviour>();; + private static final HashMap<String, SpecialMultiBehaviour> mCustomBehviours = new HashMap<String, SpecialMultiBehaviour>(); public GregtechMeta_MultiBlockBase(final int aID, final String aName, @@ -1464,6 +1473,8 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_En this.mAirIntakes.clear(); this.mTecTechEnergyHatches.clear(); this.mTecTechDynamoHatches.clear(); + this.mAllEnergyHatches.clear(); + this.mAllDynamoHatches.clear(); } } @@ -1654,8 +1665,11 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_En return mMaintenanceHatches.size() <= 1 && !mMufflerHatches.isEmpty(); } - public <E> boolean addToMachineListInternal(ArrayList<E> aList, final IMetaTileEntity aTileEntity, - final int aBaseCasingIndex) { + public <E> boolean addToMachineListInternal(ArrayList<E> aList, final IGregTechTileEntity aTileEntity, final int aBaseCasingIndex) { + return addToMachineListInternal(aList, getMetaTileEntity(aTileEntity), aBaseCasingIndex); + } + + public <E> boolean addToMachineListInternal(ArrayList<E> aList, final IMetaTileEntity aTileEntity, final int aBaseCasingIndex) { if (aTileEntity == null) { return false; } @@ -1665,7 +1679,20 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_En * Class <?> aHatchType = ReflectionUtils.getTypeOfGenericObject(aList); if * (!aHatchType.isInstance(aTileEntity)) { return false; } */ + + // Try setRecipeMap + try { + if (aTileEntity instanceof GT_MetaTileEntity_Hatch_Input) { + resetRecipeMapForHatch((GT_MetaTileEntity_Hatch) aTileEntity, getRecipeMap()); + } + if (aTileEntity instanceof GT_MetaTileEntity_Hatch_InputBus) { + resetRecipeMapForHatch((GT_MetaTileEntity_Hatch) aTileEntity, getRecipeMap()); + } + } + catch (Throwable t) { + t.printStackTrace(); + } if (aList.isEmpty()) { if (aTileEntity instanceof GT_MetaTileEntity_Hatch) { @@ -1675,8 +1702,13 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_En updateTexture(aTileEntity, aBaseCasingIndex); return aList.add((E) aTileEntity); } - } else { + } + else { IGregTechTileEntity aCur = aTileEntity.getBaseMetaTileEntity(); + if (aList.contains(aTileEntity)) { + log("Found Duplicate "+aTileEntity.getInventoryName()+" @ " + new BlockPos(aCur).getLocationString()); + return false; + } BlockPos aCurPos = new BlockPos(aCur); boolean aExists = false; for (E m : aList) { @@ -1742,33 +1774,35 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_En //mControlCoreBus public boolean addControlCoreToMachineList(final IGregTechTileEntity aTileEntity, final int aBaseCasingIndex) { - final IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); - if (aMetaTileEntity == null) { - log("Tried to add null module entity."); - return false; - } if (!mControlCoreBus.isEmpty()) { log("Tried to add a secondary control core module."); return false; } - - GT_MetaTileEntity_Hatch_ControlCore Module = (GT_MetaTileEntity_Hatch_ControlCore) aMetaTileEntity; - + GT_MetaTileEntity_Hatch_ControlCore Module = (GT_MetaTileEntity_Hatch_ControlCore) getMetaTileEntity(aTileEntity); if (Module != null) { if (Module.setOwner(aTileEntity)) { log("Adding control core module."); - return addToMachineListInternal(mControlCoreBus, aMetaTileEntity, aBaseCasingIndex); + return addToMachineListInternal(mControlCoreBus, Module, aBaseCasingIndex); } } return false; } - @Override - public boolean addToMachineList(final IGregTechTileEntity aTileEntity, final int aBaseCasingIndex) { + private IMetaTileEntity getMetaTileEntity(final IGregTechTileEntity aTileEntity) { if (aTileEntity == null) { - return false; + return null; } final IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); + return aMetaTileEntity; + } + + + @Override + public boolean addToMachineList(final IGregTechTileEntity aTileEntity, final int aBaseCasingIndex) { + return addToMachineList(getMetaTileEntity(aTileEntity), aBaseCasingIndex); + } + + public boolean addToMachineList(final IMetaTileEntity aMetaTileEntity, final int aBaseCasingIndex) { if (aMetaTileEntity == null) { return false; } @@ -1776,10 +1810,14 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_En //Use this to determine the correct value, then update the hatch texture after. boolean aDidAdd = false; - //Handle Custom Hustoms + //Handle Custom Hatches if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_ControlCore) { log("Found GT_MetaTileEntity_Hatch_ControlCore"); - aDidAdd = addControlCoreToMachineList(aTileEntity, aBaseCasingIndex); + if (!mControlCoreBus.isEmpty()) { + log("Tried to add a secondary control core module."); + return false; + } + aDidAdd = addToMachineListInternal(this.mControlCoreBus, aMetaTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBattery) { log("Found GT_MetaTileEntity_Hatch_InputBattery"); @@ -1789,17 +1827,22 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_En log("Found GT_MetaTileEntity_Hatch_OutputBattery"); aDidAdd = addToMachineListInternal(mDischargeHatches, aMetaTileEntity, aBaseCasingIndex); } + else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_AirIntake) { + aDidAdd = addToMachineListInternal(mAirIntakes, aMetaTileEntity, aBaseCasingIndex); + } //Handle TT Multi-A Energy Hatches else if (LoadedMods.TecTech && isThisHatchMultiEnergy(aMetaTileEntity)) { log("Found isThisHatchMultiEnergy"); aDidAdd = addToMachineListInternal(mTecTechEnergyHatches, aMetaTileEntity, aBaseCasingIndex); + updateMasterEnergyHatchList(aMetaTileEntity); } //Handle TT Multi-A Dynamos else if (LoadedMods.TecTech && isThisHatchMultiDynamo(aMetaTileEntity)) { log("Found isThisHatchMultiDynamo"); aDidAdd = addToMachineListInternal(mTecTechDynamoHatches, aMetaTileEntity, aBaseCasingIndex); + updateMasterDynamoHatchList(aMetaTileEntity); } //Handle Fluid Hatches using seperate logic @@ -1813,10 +1856,14 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_En aDidAdd = addToMachineListInternal(mInputBusses, aMetaTileEntity, aBaseCasingIndex); else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_OutputBus) aDidAdd = addToMachineListInternal(mOutputBusses, aMetaTileEntity, aBaseCasingIndex); - else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Energy) + else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Energy) { aDidAdd = addToMachineListInternal(mEnergyHatches, aMetaTileEntity, aBaseCasingIndex); - else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Dynamo) + updateMasterEnergyHatchList(aMetaTileEntity); + } + else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Dynamo) { aDidAdd = addToMachineListInternal(mDynamoHatches, aMetaTileEntity, aBaseCasingIndex); + updateMasterDynamoHatchList(aMetaTileEntity); + } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance) aDidAdd = addToMachineListInternal(mMaintenanceHatches, aMetaTileEntity, aBaseCasingIndex); else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Muffler) @@ -1830,57 +1877,54 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_En @Override public boolean addMaintenanceToMachineList(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) { - return addToMachineList(aTileEntity, aBaseCasingIndex); + IMetaTileEntity aMetaTileEntity = getMetaTileEntity(aTileEntity); + if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance) { + return addToMachineList(aMetaTileEntity, aBaseCasingIndex); + } + return false; } @Override public boolean addMufflerToMachineList(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) { - return addToMachineList(aTileEntity, aBaseCasingIndex); + IMetaTileEntity aMetaTileEntity = getMetaTileEntity(aTileEntity); + if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Muffler) { + return addToMachineList(aMetaTileEntity, aBaseCasingIndex); + } + return false; } @Override public boolean addInputToMachineList(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) { - return addToMachineList(aTileEntity, aBaseCasingIndex); + IMetaTileEntity aMetaTileEntity = getMetaTileEntity(aTileEntity); + if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input || aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBus) { + return addToMachineList(aMetaTileEntity, aBaseCasingIndex); + } + return false; } @Override public boolean addOutputToMachineList(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) { - return addToMachineList(aTileEntity, aBaseCasingIndex); + IMetaTileEntity aMetaTileEntity = getMetaTileEntity(aTileEntity); + if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Output || aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_OutputBus) { + return addToMachineList(aMetaTileEntity, aBaseCasingIndex); + } + return false; } - public boolean addAirIntakeToMachineList(final IGregTechTileEntity aTileEntity, final int aBaseCasingIndex) { - if (aTileEntity == null) { - return false; - } - final IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); - if (aMetaTileEntity == null) { - return false; - } + public boolean addAirIntakeToMachineList(final IGregTechTileEntity aMetaTileEntity, final int aBaseCasingIndex) { if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_AirIntake) { - this.mAirIntakes.add((GT_MetaTileEntity_Hatch_AirIntake)aMetaTileEntity); + return addToMachineList(aMetaTileEntity, aBaseCasingIndex); } - return addToMachineList(aTileEntity, aBaseCasingIndex); + return false; } public boolean addFluidInputToMachineList(final IGregTechTileEntity aTileEntity, final int aBaseCasingIndex) { - if (aTileEntity == null) { - return false; - } - final IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); - if (aMetaTileEntity == null) { - return false; - } - return addFluidInputToMachineList(aMetaTileEntity, aBaseCasingIndex); + return addFluidInputToMachineList(getMetaTileEntity(aTileEntity), aBaseCasingIndex); } - public boolean addFluidInputToMachineList(final IMetaTileEntity aTileEntity, final int aBaseCasingIndex) { - if (aTileEntity == null) { - return false; - } - final IMetaTileEntity aMetaTileEntity = aTileEntity; + public boolean addFluidInputToMachineList(final IMetaTileEntity aMetaTileEntity, final int aBaseCasingIndex) { if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input) { - ((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity).mRecipeMap = this.getRecipeMap(); - return addToMachineListInternal(mInputHatches, aMetaTileEntity, aBaseCasingIndex); + return addToMachineList(aMetaTileEntity, aBaseCasingIndex); } return false; } @@ -1909,14 +1953,11 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_En } public boolean resetRecipeMapForHatch(IGregTechTileEntity aTileEntity, GT_Recipe_Map aMap) { try { - if (aTileEntity == null) { - return false; - } - final IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); + final IMetaTileEntity aMetaTileEntity = getMetaTileEntity(aTileEntity); if (aMetaTileEntity == null) { return false; } - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input || aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBus) { + if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input || aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBus || aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Steam_BusInput) { return resetRecipeMapForHatch((GT_MetaTileEntity_Hatch)aMetaTileEntity, aMap); } else { @@ -1924,6 +1965,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_En } } catch (Throwable t) { + t.printStackTrace(); return false; } } @@ -1933,7 +1975,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_En return false; } final IMetaTileEntity aMetaTileEntity = aTileEntity; - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input || aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBus) { + if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input || aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBus || aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Steam_BusInput) { if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input){ ((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity).mRecipeMap = null; ((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity).mRecipeMap = aMap; @@ -1944,7 +1986,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_En log("Cleared Input Hatch."); } } - else { + else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBus) { ((GT_MetaTileEntity_Hatch_InputBus) aMetaTileEntity).mRecipeMap = null; ((GT_MetaTileEntity_Hatch_InputBus) aMetaTileEntity).mRecipeMap = aMap; if (aMap != null && aMap.mNEIName != null) { @@ -1954,6 +1996,16 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_En log("Cleared Input Bus."); } } + else { + ((GT_MetaTileEntity_Hatch_Steam_BusInput) aMetaTileEntity).mRecipeMap = null; + ((GT_MetaTileEntity_Hatch_Steam_BusInput) aMetaTileEntity).mRecipeMap = aMap; + if (aMap != null && aMap.mNEIName != null) { + log("Remapped Input Bus to "+aMap.mNEIName+"."); + } + else { + log("Cleared Input Bus."); + } + } return true; } else { @@ -1982,11 +2034,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_En */ public boolean updateTexture(final IGregTechTileEntity aTileEntity, int aCasingID){ - final IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); - if (aMetaTileEntity == null) { - return false; - } - return updateTexture(aMetaTileEntity, aCasingID); + return updateTexture(getMetaTileEntity(aTileEntity), aCasingID); } /** @@ -2006,7 +2054,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_En if (GT_MetaTileEntity_Hatch.class.isInstance(aMetaTileEntity)){ mProper.setAccessible(true); mProper.invoke(aMetaTileEntity, aCasingID); - log("Good Method Call for updateTexture."); + //log("Good Method Call for updateTexture."); return true; } } @@ -2071,22 +2119,21 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_En */ public boolean addMultiAmpDynamoToMachineList(final IGregTechTileEntity aTileEntity, final int aBaseCasingIndex){ - //GT_MetaTileEntity_Hatch_DynamoMulti - if (aTileEntity == null) { - return false; - } - final IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); + final IMetaTileEntity aMetaTileEntity = getMetaTileEntity(aTileEntity); if (aMetaTileEntity == null) { return false; } if (isThisHatchMultiDynamo(aTileEntity)) { - updateTexture(aTileEntity, aBaseCasingIndex); - return this.mTecTechDynamoHatches.add((GT_MetaTileEntity_Hatch) aMetaTileEntity); + return addToMachineListInternal(mTecTechDynamoHatches, aMetaTileEntity, aBaseCasingIndex); } return false; } - public boolean isThisHatchMultiDynamo(Object aMetaTileEntity){ + public boolean isThisHatchMultiDynamo(IGregTechTileEntity aTileEntity){ + return isThisHatchMultiDynamo(getMetaTileEntity(aTileEntity)); + } + + public boolean isThisHatchMultiDynamo(IMetaTileEntity aMetaTileEntity){ Class<?> mDynamoClass; mDynamoClass = ReflectionUtils.getClass("com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_DynamoMulti"); if (mDynamoClass != null){ @@ -2099,13 +2146,22 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_En @Override public boolean addDynamoToMachineList(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) { - if (LoadedMods.TecTech){ - if (isThisHatchMultiDynamo(aTileEntity)) { - return addMultiAmpDynamoToMachineList(aTileEntity, aBaseCasingIndex); - } - + IMetaTileEntity aMetaTileEntity = getMetaTileEntity(aTileEntity); + if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Dynamo || isThisHatchMultiDynamo(aMetaTileEntity)) { + return addToMachineList(aMetaTileEntity, aBaseCasingIndex); + } + return false; + } + + private boolean updateMasterDynamoHatchList(IMetaTileEntity aMetaTileEntity) { + if (aMetaTileEntity == null) { + return false; + } + if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch) { + GT_MetaTileEntity_Hatch aHatch = (GT_MetaTileEntity_Hatch) aMetaTileEntity; + return mAllDynamoHatches.add(aHatch); } - return addToMachineList(aTileEntity, aBaseCasingIndex); + return false; } @@ -2117,22 +2173,21 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_En */ public boolean addMultiAmpEnergyToMachineList(final IGregTechTileEntity aTileEntity, final int aBaseCasingIndex){ - //GT_MetaTileEntity_Hatch_DynamoMulti - if (aTileEntity == null) { - return false; - } - final IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); + final IMetaTileEntity aMetaTileEntity = getMetaTileEntity(aTileEntity); if (aMetaTileEntity == null) { return false; } - if (isThisHatchMultiEnergy(aTileEntity)) { - updateTexture(aTileEntity, aBaseCasingIndex); - return this.mTecTechEnergyHatches.add((GT_MetaTileEntity_Hatch) aMetaTileEntity); + if (isThisHatchMultiEnergy(aMetaTileEntity)) { + return addToMachineListInternal(mTecTechEnergyHatches, aMetaTileEntity, aBaseCasingIndex); } return false; + } + + public boolean isThisHatchMultiEnergy(IGregTechTileEntity aTileEntity){ + return isThisHatchMultiEnergy(getMetaTileEntity(aTileEntity)); } - public boolean isThisHatchMultiEnergy(Object aMetaTileEntity){ + public boolean isThisHatchMultiEnergy(IMetaTileEntity aMetaTileEntity){ Class<?> mDynamoClass; mDynamoClass = ReflectionUtils.getClass("com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_EnergyMulti"); if (mDynamoClass != null){ @@ -2145,13 +2200,22 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_En @Override public boolean addEnergyInputToMachineList(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) { - if (LoadedMods.TecTech){ - if (isThisHatchMultiEnergy(aTileEntity)) { - return addMultiAmpEnergyToMachineList(aTileEntity, aBaseCasingIndex); - } - + IMetaTileEntity aMetaTileEntity = getMetaTileEntity(aTileEntity); + if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Energy || isThisHatchMultiEnergy(aMetaTileEntity)) { + return addToMachineList(aMetaTileEntity, aBaseCasingIndex); } - return super.addEnergyInputToMachineList(aTileEntity, aBaseCasingIndex); + return false; + } + + private boolean updateMasterEnergyHatchList(IMetaTileEntity aMetaTileEntity) { + if (aMetaTileEntity == null) { + return false; + } + if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch) { + GT_MetaTileEntity_Hatch aHatch = (GT_MetaTileEntity_Hatch) aMetaTileEntity; + return mAllEnergyHatches.add(aHatch); + } + return false; } @@ -2388,20 +2452,43 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_En @Override public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer, byte aSide, float aX, float aY, float aZ) { - //Do Super - boolean aSuper = super.onRightclick(aBaseMetaTileEntity, aPlayer, aSide, aX, aY, aZ); // Do Things if (this.getBaseMetaTileEntity().isServerSide()) { + //Logger.INFO("Right Clicked Controller."); ItemStack tCurrentItem = aPlayer.inventory.getCurrentItem(); - if (tCurrentItem != null) { - if (GT_Utility.isStackInList(tCurrentItem, GregTech_API.sSoftHammerList)) { - - } + if (tCurrentItem != null) { + //Logger.INFO("Holding Item."); + if (tCurrentItem.getItem() instanceof GT_MetaGenerated_Tool) { + //Logger.INFO("Is GT_MetaGenerated_Tool."); + int[] aOreID = OreDictionary.getOreIDs(tCurrentItem); + for (int id : aOreID) { + // Plunger + if (OreDictionary.getOreName(id).equals("craftingToolPlunger")) { + //Logger.INFO("Is Plunger."); + return onPlungerRightClick(aPlayer, aSide, aX, aY, aZ); + } + } + } } } + //Do Super + boolean aSuper = super.onRightclick(aBaseMetaTileEntity, aPlayer, aSide, aX, aY, aZ); return aSuper; } + public boolean onPlungerRightClick(EntityPlayer aPlayer, byte aSide, float aX, float aY, float aZ) { + int aHatchIndex = 0; + PlayerUtils.messagePlayer(aPlayer, "Trying to clear "+mOutputHatches.size()+" output hatches."); + for (GT_MetaTileEntity_Hatch_Output hatch : this.mOutputHatches) { + if (hatch.mFluid != null) { + PlayerUtils.messagePlayer(aPlayer, "Clearing "+hatch.mFluid.amount+"L of "+hatch.mFluid.getLocalizedName()+" from hatch "+aHatchIndex+"."); + hatch.mFluid = null; + } + aHatchIndex++; + } + return aHatchIndex > 0; + } + @Override public boolean onSolderingToolRightClick(byte aSide, byte aWrenchingSide, EntityPlayer aPlayer, float aX, float aY, float aZ) { boolean tSuper = super.onSolderingToolRightClick(aSide, aWrenchingSide, aPlayer, aX, aY, aZ); diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_SteamMultiBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_SteamMultiBase.java index 36e68f6438..7bc8e4733d 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_SteamMultiBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_SteamMultiBase.java @@ -282,27 +282,33 @@ public abstract class GregtechMeta_SteamMultiBase extends GregtechMeta_MultiBloc @Override public boolean addToMachineList(final IGregTechTileEntity aTileEntity, final int aBaseCasingIndex) { if (aTileEntity == null) { + log("Invalid IGregTechTileEntity"); return false; } final IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); if (aMetaTileEntity == null) { + log("Invalid IMetaTileEntity"); return false; } //Use this to determine the correct value, then update the hatch texture after. - boolean aDidAdd = false; + boolean aDidAdd = false; - //Handle Custom Hustoms - - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_CustomFluidBase) + if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_CustomFluidBase) { + log("Adding Steam Input Hatch"); aDidAdd = addToMachineListInternal(mSteamInputFluids, aMetaTileEntity, aBaseCasingIndex); - - else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Steam_BusInput) - aDidAdd = addToMachineListInternal(mSteamInputs, aMetaTileEntity, aBaseCasingIndex); - - else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Steam_BusOutput) + } + else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Steam_BusInput) { + log("Trying to set recipe map. Type: "+(getRecipeMap() != null ? getRecipeMap().mNEIName : "Null")); + this.resetRecipeMapForHatch(aTileEntity, getRecipeMap()); + log("Adding Steam Input Bus"); + aDidAdd = addToMachineListInternal(mSteamInputs, aMetaTileEntity, aBaseCasingIndex); + } + else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Steam_BusOutput) { + log("Adding Steam Output Bus"); aDidAdd = addToMachineListInternal(mSteamOutputs, aMetaTileEntity, aBaseCasingIndex); - + } + return aDidAdd; } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechDoubleFuelGeneratorBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechDoubleFuelGeneratorBase.java index 287d2105ac..287d2105ac 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechDoubleFuelGeneratorBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechDoubleFuelGeneratorBase.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechMetaBoilerBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechMetaBoilerBase.java index 99ad81a4a9..99ad81a4a9 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechMetaBoilerBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechMetaBoilerBase.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechMetaSolarGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechMetaSolarGenerator.java index e692530963..e692530963 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechMetaSolarGenerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechMetaSolarGenerator.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechRocketFuelGeneratorBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechRocketFuelGeneratorBase.java index 885069693d..f9105dceb1 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechRocketFuelGeneratorBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechRocketFuelGeneratorBase.java @@ -12,7 +12,6 @@ import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Recipe.GT_Recipe_Map; import gregtech.api.util.GT_Utility; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils; import net.minecraft.entity.player.EntityPlayer; @@ -63,16 +62,16 @@ public abstract class GregtechRocketFuelGeneratorBase extends GT_MetaTileEntity_ @Override public String[] getDescription() { - int pollMin = mTier == 4 ? 250 : (mTier == 5 ? 500 : 750); - int pollMax = mTier == 4 ? 2000 : (mTier == 5 ? 4000 : 6000); - String aPollution = "Causes between "+pollMin+" and "+pollMax+ " Pollution per second"; - return new String[]{ - this.mDescription, - "Fuel Efficiency: " + this.getEfficiency() + "%", - aPollution}; + String aPollution = "Causes between "+pollMin+" and "+pollMax+ " Pollution per second"; + return new String[]{ + this.mDescription, + "Fuel Efficiency: " + this.getEfficiency() + "%", + aPollution, + CORE.GT_Tooltip}; } + @Override public boolean onRightclick(final IGregTechTileEntity aBaseMetaTileEntity, final EntityPlayer aPlayer) { if (aBaseMetaTileEntity.isClientSide()) { @@ -199,8 +198,8 @@ public abstract class GregtechRocketFuelGeneratorBase extends GT_MetaTileEntity_ @Override public void onPostTick(final IGregTechTileEntity aBaseMetaTileEntity, final long aTick) { - - + + //super.onPostTick(aBaseMetaTileEntity, aTick); /*if (aBaseMetaTileEntity.isServerSide() && aBaseMetaTileEntity.isAllowedToWork() && aTick % 10L == 0L) { @@ -251,9 +250,9 @@ public abstract class GregtechRocketFuelGeneratorBase extends GT_MetaTileEntity_ .getUniversalEnergyStored() >= this.maxEUOutput() + this.getMinimumStoredEU()); }*/ - - - + + + if (aBaseMetaTileEntity.isServerSide() && aBaseMetaTileEntity.isAllowedToWork() && ((aTick % 10) == 0)) { if (this.mFluid == null) { if (aBaseMetaTileEntity.getUniversalEnergyStored() < (this.maxEUOutput() + this.getMinimumStoredEU())) { diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaSafeBlockBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaSafeBlockBase.java index 34b3e86c70..34b3e86c70 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaSafeBlockBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaSafeBlockBase.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaTreeFarmerBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaTreeFarmerBase.java index df838f012a..df838f012a 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaTreeFarmerBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaTreeFarmerBase.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_Catalysts.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_Catalysts.java index ea74e650dd..5e0918059d 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_Catalysts.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_Catalysts.java @@ -3,6 +3,7 @@ package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.nbthandlers; import gregtech.api.interfaces.ITexture; import gregtech.api.objects.GT_RenderedTexture; import gtPlusPlus.api.objects.data.AutoMap; +import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; import net.minecraft.item.ItemStack; @@ -30,6 +31,13 @@ public class GT_MetaTileEntity_Hatch_Catalysts extends GT_MetaTileEntity_Hatch_N public ITexture[] getTexturesInactive(ITexture aBaseTexture) { return new ITexture[]{aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Bus_Catalyst)}; } + + @Override + public String[] getDescription() { + return new String[]{ + this.mDescription, + CORE.GT_Tooltip}; + } @Override public boolean isFacingValid(byte aFacing) { diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_MillingBalls.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_MillingBalls.java index 6c28ab2e27..7514855a2c 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_MillingBalls.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_MillingBalls.java @@ -3,6 +3,7 @@ package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.nbthandlers; import gregtech.api.interfaces.ITexture; import gregtech.api.objects.GT_RenderedTexture; import gtPlusPlus.api.objects.data.AutoMap; +import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; import net.minecraft.item.ItemStack; @@ -30,6 +31,13 @@ public class GT_MetaTileEntity_Hatch_MillingBalls extends GT_MetaTileEntity_Hatc public ITexture[] getTexturesInactive(ITexture aBaseTexture) { return new ITexture[]{aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Bus_Milling_Balls)}; } + + @Override + public String[] getDescription() { + return new String[]{ + this.mDescription, + CORE.GT_Tooltip}; + } @Override public boolean isFacingValid(byte aFacing) { diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_NbtConsumable.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_NbtConsumable.java index 56dff1b1e3..56dff1b1e3 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_NbtConsumable.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_NbtConsumable.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/objects/GregtechFluid.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechFluid.java index 9cc0e3a315..9cc0e3a315 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/objects/GregtechFluid.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechFluid.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/objects/GregtechItemData.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechItemData.java index eb5939caca..eb5939caca 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/objects/GregtechItemData.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechItemData.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/objects/GregtechMaterialStack.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechMaterialStack.java index 6ec5907256..6ec5907256 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/objects/GregtechMaterialStack.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechMaterialStack.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/objects/MultiblockBlueprint.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/MultiblockBlueprint.java index 7af6af2ffd..7af6af2ffd 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/objects/MultiblockBlueprint.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/MultiblockBlueprint.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/objects/MultiblockLayer.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/MultiblockLayer.java index c5554a6679..c5554a6679 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/objects/MultiblockLayer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/MultiblockLayer.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/objects/MultiblockRequirements.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/MultiblockRequirements.java index 10909081d1..10909081d1 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/objects/MultiblockRequirements.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/MultiblockRequirements.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/recipe/ProcessingSkookumChoocherToolRecipes.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/recipe/ProcessingSkookumChoocherToolRecipes.java index 976f21c329..976f21c329 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/recipe/ProcessingSkookumChoocherToolRecipes.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/recipe/ProcessingSkookumChoocherToolRecipes.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/util/GTPP_Config.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/util/GTPP_Config.java index dcdc1220d0..dcdc1220d0 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/util/GTPP_Config.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/util/GTPP_Config.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/util/GregtechOreDictUnificator.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/util/GregtechOreDictUnificator.java index 3e0084139e..3e0084139e 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/util/GregtechOreDictUnificator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/util/GregtechOreDictUnificator.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/util/SpecialBehaviourTooltipHandler.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/util/SpecialBehaviourTooltipHandler.java index 74655fb744..74655fb744 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/util/SpecialBehaviourTooltipHandler.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/util/SpecialBehaviourTooltipHandler.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen.java index 795fd18826..795fd18826 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Boulder.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Boulder.java index ca78a72e04..ca78a72e04 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Boulder.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Boulder.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_GT_Ore_Layer.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_GT_Ore_Layer.java index 7cd215aa4e..7cd215aa4e 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_GT_Ore_Layer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_GT_Ore_Layer.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Handler.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Handler.java index aae3bdd48a..aae3bdd48a 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Handler.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Handler.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Ore.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Ore.java index 2d7f817060..2d7f817060 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Ore.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Ore.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Ore_Normal.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Ore_Normal.java index e66106ad4a..e66106ad4a 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Ore_Normal.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Ore_Normal.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/world/GT_OreVein_Object.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GT_OreVein_Object.java index 770083fee8..770083fee8 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/world/GT_OreVein_Object.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GT_OreVein_Object.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/world/WorldGenUtils.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/world/WorldGenUtils.java index fd0738596a..fd0738596a 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/world/WorldGenUtils.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/world/WorldGenUtils.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/Meta_GT_Proxy.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/Meta_GT_Proxy.java index 091ee734e6..091ee734e6 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/Meta_GT_Proxy.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/Meta_GT_Proxy.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/StaticFields59.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/StaticFields59.java index 44c580fe4f..44c580fe4f 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/StaticFields59.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/StaticFields59.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GTPP_Block_Machines.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GTPP_Block_Machines.java index 01f655c355..01f655c355 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GTPP_Block_Machines.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GTPP_Block_Machines.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GTPP_Item_Machines.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GTPP_Item_Machines.java index ba3b05ff8e..ba3b05ff8e 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GTPP_Item_Machines.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GTPP_Item_Machines.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java index c4b2e4f738..c4b2e4f738 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks2.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks2.java index 596643e06c..596643e06c 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks2.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks2.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java index 8cd6dd0ca8..76bd57b3fa 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java @@ -46,6 +46,10 @@ extends GregtechMetaCasingBlocksAbstract { public GregtechMetaCasingBlocks3() { super(GregtechMetaCasingItemBlocks3.class, "gtplusplus.blockcasings.3", GT_Material_Casings.INSTANCE); for (byte i = 0; i < 16; i = (byte) (i + 1)) { + // Free up Redox casing in TAE + if (i >= 4 && i <= 8) { + continue; + } TAE.registerTexture(2, i, new GT_CopiedBlockTexture(this, 6, i)); } GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".0.name", "Aquatic Casing"); diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks4.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks4.java index 419b5f3d30..419b5f3d30 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks4.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks4.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks5.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks5.java index 832ee2b56e..3d15e5cf58 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks5.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks5.java @@ -18,7 +18,8 @@ import net.minecraft.world.IBlockAccess; public class GregtechMetaCasingBlocks5 extends GregtechMetaCasingBlocksAbstract { - //84, 90, 91, 92, 94, 114, 116, 117, 118, 119, 120, 121, 124, 125, 126, 127 + // Free Indexes within TAE: 91, 92, 94, 100, 101, 102, 103, 104, 114, 116, 117, 118, 119, 120, 121, 124, 125, 126, 127 + // 19 Free Indexes private static final TexturesGrinderMultiblock mGrinderOverlayHandler = new TexturesGrinderMultiblock(); public GregtechMetaCasingBlocks5() { @@ -29,8 +30,10 @@ extends GregtechMetaCasingBlocksAbstract { GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".2.name", "IsaMill Gearbox"); // IsaMill Gearbox GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".3.name", "Elemental Confinement Shell"); // Duplicator Casing TAE.registerTexture(0, 3, new GT_CopiedBlockTexture(this, 6, 3)); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".4.name", ""); // Unused - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".5.name", ""); // Unused + GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".4.name", "Sparge Tower Exterior Casing"); // Sparge Tower Casing + TAE.registerTexture(0, 4, new GT_CopiedBlockTexture(this, 6, 4)); + GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".5.name", "Sturdy Printer Casing"); // Unused + TAE.registerTexture(1, 10, new GT_CopiedBlockTexture(this, 6, 5)); GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".6.name", ""); // Unused GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".7.name", ""); // Unused GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".8.name", ""); // Unused @@ -45,7 +48,9 @@ extends GregtechMetaCasingBlocksAbstract { GregtechItemList.Casing_IsaMill_Casing.set(new ItemStack(this, 1, 0)); GregtechItemList.Casing_IsaMill_Pipe.set(new ItemStack(this, 1, 1)); GregtechItemList.Casing_IsaMill_Gearbox.set(new ItemStack(this, 1, 2)); - GregtechItemList.Casing_ElementalDuplicator.set(new ItemStack(this, 1, 2)); + GregtechItemList.Casing_ElementalDuplicator.set(new ItemStack(this, 1, 3)); + GregtechItemList.Casing_Sparge_Tower_Exterior.set(new ItemStack(this, 1, 4)); + GregtechItemList.Casing_IndustrialAutoChisel.set(new ItemStack(this, 1, 5)); } @Override @@ -58,13 +63,17 @@ extends GregtechMetaCasingBlocksAbstract { if ((aMeta >= 0) && (aMeta < 16)) { switch (aMeta) { case 0: - return TexturesGtBlock.TEXTURE_CASING_GRINDING_MILL.getIcon(); - case 1: return TexturesGtBlock.TEXTURE_PIPE_GRINDING_MILL.getIcon(); + case 1: + return TexturesGtBlock.TEXTURE_CASING_GRINDING_MILL.getIcon(); case 2: return TexturesGtBlock.TEXTURE_GEARBOX_GRINDING_MILL.getIcon(); case 3: return TexturesGtBlock.TEXTURE_TECH_PANEL_D.getIcon(); + case 4: + return TexturesGtBlock.Casing_Machine_Metal_Sheet_H.getIcon(); + case 5: + return TexturesGtBlock.Casing_Machine_Metal_Sheet_I.getIcon(); } } return Textures.BlockIcons.RENDERING_ERROR.getIcon(); diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocksAbstract.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocksAbstract.java index ea59eb50ba..ea59eb50ba 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocksAbstract.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocksAbstract.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingItems.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingItems.java index de51cb164b..de51cb164b 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingItems.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingItems.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaItemCasings1.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaItemCasings1.java index 7fb344a4ec..7fb344a4ec 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaItemCasings1.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaItemCasings1.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaItemCasingsAbstract.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaItemCasingsAbstract.java index 62e0f0acdf..62e0f0acdf 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaItemCasingsAbstract.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaItemCasingsAbstract.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMachineCasings.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMachineCasings.java index 8f5dff592a..8f5dff592a 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMachineCasings.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMachineCasings.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings.java index a4a396e4cf..5a5c923d10 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings.java @@ -64,7 +64,8 @@ public class GregtechMetaSpecialMultiCasings extends GregtechMetaCasingBlocksAbs GregtechItemList.Casing_SolarTower_Structural.set(new ItemStack(this, 1, 6)); GregtechItemList.Casing_SolarTower_SaltContainment.set(new ItemStack(this, 1, 7)); GregtechItemList.Casing_SolarTower_HeatContainment.set(new ItemStack(this, 1, 8)); - GregtechItemList.Casing_Reinforced_Engine_Casing.set(new ItemStack(this, 1, 9)); + GregtechItemList.Casing_Flotation_Cell.set(new ItemStack(this, 1, 9)); + GregtechItemList.Casing_Reinforced_Engine_Casing.set(new ItemStack(this, 1, 10)); } public IIcon getIcon(int aSide, int aMeta) { diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaTieredCasingBlocks1.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaTieredCasingBlocks1.java index cbd585e50d..cbd585e50d 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaTieredCasingBlocks1.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaTieredCasingBlocks1.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java index 3e4b9a3fee..3e4b9a3fee 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler.java index 123df8fe0f..123df8fe0f 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler2.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler2.java index c980997c64..c980997c64 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler2.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler2.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java index 019a432013..019a432013 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesCentrifugeMultiblock.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesCentrifugeMultiblock.java index 6326dd2c29..6326dd2c29 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesCentrifugeMultiblock.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesCentrifugeMultiblock.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGregtech58.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGregtech58.java index e772f0f48c..e772f0f48c 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGregtech58.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGregtech58.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGregtech59.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGregtech59.java index ac721d81c3..ac721d81c3 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGregtech59.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGregtech59.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGrinderMultiblock.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGrinderMultiblock.java index 962f981d3b..b254fdbc1e 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGrinderMultiblock.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGrinderMultiblock.java @@ -85,7 +85,7 @@ public class TexturesGrinderMultiblock { public IIcon handleCasingsGT(final IBlockAccess aWorld, final int xCoord, final int yCoord, final int zCoord, final int aSide, final GregtechMetaCasingBlocks5 ii) { final int tMeta = aWorld.getBlockMetadata(xCoord, yCoord, zCoord); - if (tMeta != 0) { + if (tMeta != 1) { return GregtechMetaCasingBlocks5.getStaticIcon(aSide, tMeta); } int tInvertLeftRightMod = aSide % 2 * 2 - 1; diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java index d4221f064a..8b372dff0c 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java @@ -276,6 +276,26 @@ public class TexturesGtBlock { public static final CustomIcon Casing_Machine_Metal_Sheet_A = Internal_Casing_Machine_Metal_Sheet_A; private static final CustomIcon Internal_Casing_Machine_Metal_Sheet_B = new CustomIcon("chrono/MetalSheet2"); public static final CustomIcon Casing_Machine_Metal_Sheet_B = Internal_Casing_Machine_Metal_Sheet_B; + private static final CustomIcon Internal_Casing_Machine_Metal_Sheet_C = new CustomIcon("chrono/MetalSheet3"); + public static final CustomIcon Casing_Machine_Metal_Sheet_C = Internal_Casing_Machine_Metal_Sheet_C; + private static final CustomIcon Internal_Casing_Machine_Metal_Sheet_D = new CustomIcon("chrono/MetalSheet4"); + public static final CustomIcon Casing_Machine_Metal_Sheet_D = Internal_Casing_Machine_Metal_Sheet_D; + private static final CustomIcon Internal_Casing_Machine_Metal_Sheet_E = new CustomIcon("chrono/MetalSheet5"); + public static final CustomIcon Casing_Machine_Metal_Sheet_E = Internal_Casing_Machine_Metal_Sheet_E; + private static final CustomIcon Internal_Casing_Machine_Metal_Sheet_F = new CustomIcon("chrono/MetalSheet6"); + public static final CustomIcon Casing_Machine_Metal_Sheet_F = Internal_Casing_Machine_Metal_Sheet_F; + private static final CustomIcon Internal_Casing_Machine_Metal_Sheet_G = new CustomIcon("chrono/MetalSheet7"); + public static final CustomIcon Casing_Machine_Metal_Sheet_G = Internal_Casing_Machine_Metal_Sheet_G; + private static final CustomIcon Internal_Casing_Machine_Metal_Sheet_H = new CustomIcon("chrono/MetalSheet8"); + public static final CustomIcon Casing_Machine_Metal_Sheet_H = Internal_Casing_Machine_Metal_Sheet_H; + private static final CustomIcon Internal_Casing_Machine_Metal_Sheet_I = new CustomIcon("chrono/MetalSheet9"); + public static final CustomIcon Casing_Machine_Metal_Sheet_I = Internal_Casing_Machine_Metal_Sheet_I; + private static final CustomIcon Internal_Casing_Machine_Metal_Sheet_J = new CustomIcon("chrono/MetalSheet10"); + public static final CustomIcon Casing_Machine_Metal_Sheet_J = Internal_Casing_Machine_Metal_Sheet_J; + private static final CustomIcon Internal_Casing_Machine_Metal_Sheet_K = new CustomIcon("chrono/MetalSheet11"); + public static final CustomIcon Casing_Machine_Metal_Sheet_K = Internal_Casing_Machine_Metal_Sheet_K; + private static final CustomIcon Internal_Casing_Machine_Metal_Sheet_L = new CustomIcon("chrono/MetalSheet12"); + public static final CustomIcon Casing_Machine_Metal_Sheet_L = Internal_Casing_Machine_Metal_Sheet_L; private static final CustomIcon Internal_Overlay_Machine_Cyber_A = new CustomIcon("chrono/CyberPanel"); public static final CustomIcon Overlay_Machine_Cyber_A = Internal_Overlay_Machine_Cyber_A; private static final CustomIcon Internal_Overlay_Machine_Cyber_B = new CustomIcon("chrono/CyberPanel2"); @@ -425,6 +445,8 @@ public class TexturesGtBlock { private static final CustomIcon Internal_Overlay_Oil = new CustomIcon("TileEntities/adv_machine_oil"); public static final CustomIcon Overlay_Oil = Internal_Overlay_Oil; + private static final CustomIcon Internal_Overlay_Water = new CustomIcon("TileEntities/adv_machine_water"); + public static final CustomIcon Overlay_Water = Internal_Overlay_Water; private static final CustomIcon Internal_Overlay_UU_Matter = new CustomIcon("TileEntities/adv_machine_uum"); public static final CustomIcon Overlay_UU_Matter = Internal_Overlay_UU_Matter; @@ -477,6 +499,21 @@ public class TexturesGtBlock { public static final CustomIcon TEXTURE_TECH_PANEL_RADIOACTIVE = new CustomIcon("TileEntities/DecayablesChest_bottom"); public static final CustomIcon TEXTURE_TECH_PANEL_RADIOACTIVE_ALT = new CustomIcon("TileEntities/DecayablesChest_top"); + + // LFTR Single blocks + public static final CustomIcon OVERLAY_REACTOR_COLDTRAP_FRONT = new CustomIcon("TileEntities/ReactorColdTrap/OVERLAY_FRONT"); + public static final CustomIcon OVERLAY_REACTOR_COLDTRAP_FRONT_ACTIVE = new CustomIcon("TileEntities/ReactorColdTrap/OVERLAY_FRONT_ACTIVE"); + public static final CustomIcon OVERLAY_REACTOR_COLDTRAP_SIDE = new CustomIcon("TileEntities/ReactorColdTrap/OVERLAY_SIDE"); + public static final CustomIcon OVERLAY_REACTOR_COLDTRAP_SIDE_ACTIVE = new CustomIcon("TileEntities/ReactorColdTrap/OVERLAY_SIDE_ACTIVE"); + public static final CustomIcon OVERLAY_REACTOR_COLDTRAP_TOP = new CustomIcon("TileEntities/ReactorColdTrap/OVERLAY_TOP"); + public static final CustomIcon OVERLAY_REACTOR_COLDTRAP_TOP_ACTIVE = new CustomIcon("TileEntities/ReactorColdTrap/OVERLAY_TOP_ACTIVE"); + + public static final CustomIcon OVERLAY_REACTOR_PROCESSINGUNIT_FRONT = new CustomIcon("TileEntities/ReactorProcessingUnit/OVERLAY_FRONT"); + public static final CustomIcon OVERLAY_REACTOR_PROCESSINGUNIT_FRONT_ACTIVE = new CustomIcon("TileEntities/ReactorProcessingUnit/OVERLAY_FRONT_ACTIVE"); + public static final CustomIcon OVERLAY_REACTOR_PROCESSINGUNIT_SIDE = new CustomIcon("TileEntities/ReactorProcessingUnit/OVERLAY_SIDE"); + public static final CustomIcon OVERLAY_REACTOR_PROCESSINGUNIT_SIDE_ACTIVE = new CustomIcon("TileEntities/ReactorProcessingUnit/OVERLAY_SIDE_ACTIVE"); + public static final CustomIcon OVERLAY_REACTOR_PROCESSINGUNIT_TOP = new CustomIcon("TileEntities/ReactorProcessingUnit/OVERLAY_TOP"); + public static final CustomIcon OVERLAY_REACTOR_PROCESSINGUNIT_TOP_ACTIVE = new CustomIcon("TileEntities/ReactorProcessingUnit/OVERLAY_TOP_ACTIVE"); //Overlay Arrays diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtCutomCovers.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtCutomCovers.java index cc5cf3d55e..cc5cf3d55e 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtCutomCovers.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtCutomCovers.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtTools.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtTools.java index ee104eaca3..ee104eaca3 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtTools.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtTools.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/turbine/LargeTurbineTextureHandler.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/turbine/LargeTurbineTextureHandler.java index c3d6a655c3..c3d6a655c3 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/turbine/LargeTurbineTextureHandler.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/turbine/LargeTurbineTextureHandler.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blueprint/Blueprint_Generic_3x3.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blueprint/Blueprint_Generic_3x3.java index ca7cbca5f8..ca7cbca5f8 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/blueprint/Blueprint_Generic_3x3.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blueprint/Blueprint_Generic_3x3.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blueprint/Blueprint_LFTR.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blueprint/Blueprint_LFTR.java index 3551172904..3551172904 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/blueprint/Blueprint_LFTR.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blueprint/Blueprint_LFTR.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/covers/CoverManager.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/CoverManager.java index 2fba1b0448..2fba1b0448 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/covers/CoverManager.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/CoverManager.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_Overflow.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_Overflow.java index a88fbc0d66..a88fbc0d66 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_Overflow.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_Overflow.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_Overflow_Item.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_Overflow_Item.java index 0299447694..0299447694 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_Overflow_Item.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_Overflow_Item.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_ToggleVisual.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_ToggleVisual.java index 65b59ce151..65b59ce151 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_ToggleVisual.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_ToggleVisual.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/ChargingHelper.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/ChargingHelper.java index 70c7b2da23..70c7b2da23 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/ChargingHelper.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/ChargingHelper.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/CraftingHelper.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/CraftingHelper.java index e06636e168..e06636e168 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/CraftingHelper.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/CraftingHelper.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/FlotationRecipeHandler.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/FlotationRecipeHandler.java index 333939d800..333939d800 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/FlotationRecipeHandler.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/FlotationRecipeHandler.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/GT_MethodHelper.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/GT_MethodHelper.java index d51107bbf0..d51107bbf0 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/GT_MethodHelper.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/GT_MethodHelper.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/MachineUpdateHandler.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/MachineUpdateHandler.java index 0b52560e0d..0b52560e0d 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/MachineUpdateHandler.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/MachineUpdateHandler.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/TreeFarmHelper.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/TreeFarmHelper.java index 2ff2712952..2ff2712952 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/TreeFarmHelper.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/TreeFarmHelper.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/VolumetricFlaskHelper.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/VolumetricFlaskHelper.java index 84bb52d064..575e094696 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/VolumetricFlaskHelper.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/VolumetricFlaskHelper.java @@ -152,6 +152,26 @@ public class VolumetricFlaskHelper { nbt.setInteger("Capacity", aCapacity); return true; } + + public static int fillFlask(ItemStack stack, FluidStack resource, boolean doFill) { + if (stack.stackSize != 1) + return 0; + if ((resource == null) || (resource.amount <= 0)) { + return 0; + } + FluidStack fluidStack = getFlaskFluid(stack); + if (fluidStack == null) { + fluidStack = new FluidStack(resource, 0); + } else if (!fluidStack.isFluidEqual(resource)) { + return 0; + } + int amount = Math.min(getMaxFlaskCapacity(stack) - fluidStack.amount, resource.amount); + if ((doFill) && (amount > 0)) { + fluidStack.amount += amount; + setFluid(stack, fluidStack); + } + return amount; + } public static Item generateNewFlask(String unlocalized, String english, int maxCapacity) { Constructor aFlask = ReflectionUtils.getConstructor(sClassVolumetricFlask, new Class[] {String.class, String.class, int.class}); diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/autocrafter/AC_Helper_Container.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/autocrafter/AC_Helper_Container.java index 29dabaf084..29dabaf084 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/autocrafter/AC_Helper_Container.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/autocrafter/AC_Helper_Container.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/autocrafter/AC_Helper_Utils.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/autocrafter/AC_Helper_Utils.java index 772ece96aa..772ece96aa 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/autocrafter/AC_Helper_Utils.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/autocrafter/AC_Helper_Utils.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/tesseract/TesseractHelper.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/tesseract/TesseractHelper.java index a3a116fea6..a3a116fea6 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/tesseract/TesseractHelper.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/tesseract/TesseractHelper.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/treefarm/TreeGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/treefarm/TreeGenerator.java index bb40c9b379..bb40c9b379 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/treefarm/TreeGenerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/treefarm/TreeGenerator.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaCustomCoverItem.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaCustomCoverItem.java index 7c3f764794..7c3f764794 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaCustomCoverItem.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaCustomCoverItem.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java index ce8b6eaf62..ce8b6eaf62 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechTools.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechTools.java index bc11cb6a11..14100d1599 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechTools.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechTools.java @@ -10,7 +10,7 @@ import gregtech.api.objects.GT_HashSet; import gregtech.api.objects.GT_ItemStack; import gtPlusPlus.core.util.reflect.ReflectionUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechToolDictNames; -import gtPlusPlus.xmod.gregtech.common.tools.TOOL_Gregtech_AngelGrinder; +import gtPlusPlus.xmod.gregtech.common.tools.TOOL_Gregtech_AngleGrinder; import gtPlusPlus.xmod.gregtech.common.tools.TOOL_Gregtech_Choocher; import gtPlusPlus.xmod.gregtech.common.tools.TOOL_Gregtech_ElectricButcherKnife; import gtPlusPlus.xmod.gregtech.common.tools.TOOL_Gregtech_ElectricLighter; @@ -47,7 +47,7 @@ public class MetaGeneratedGregtechTools extends GT_MetaGenerated_Tool { // Electric File this.addTool(ANGLE_GRINDER, "Angle Grinder", "Hand-held electric filing device", - new TOOL_Gregtech_AngelGrinder(), + new TOOL_Gregtech_AngleGrinder(), new Object[] { GregtechToolDictNames.craftingToolAngleGrinder, ToolDictNames.craftingToolFile, new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 2L), diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Choocher.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Choocher.java index f82e0e5cb0..f82e0e5cb0 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Choocher.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Choocher.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Electric_Lighter.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Electric_Lighter.java index 422a29c34e..422a29c34e 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Electric_Lighter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Electric_Lighter.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Grinder.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Grinder.java index 9012bb8cd8..9012bb8cd8 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Grinder.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Grinder.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Prospecting_Ex.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Prospecting_Ex.java index f320bfc77d..f320bfc77d 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Prospecting_Ex.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Prospecting_Ex.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/items/covers/MetaItemCoverCasings.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/covers/MetaItemCoverCasings.java index 7af057bc59..7af057bc59 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/items/covers/MetaItemCoverCasings.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/covers/MetaItemCoverCasings.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/render/GTPP_CapeRenderer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_CapeRenderer.java index 49537ab559..49537ab559 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/render/GTPP_CapeRenderer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_CapeRenderer.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/render/GTPP_FlaskRenderer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_FlaskRenderer.java index 1561ba9f73..1561ba9f73 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/render/GTPP_FlaskRenderer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_FlaskRenderer.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/render/GTPP_Render_MachineBlock.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_Render_MachineBlock.java index 35d78008c5..35d78008c5 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/render/GTPP_Render_MachineBlock.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_Render_MachineBlock.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/requirements/RequirementsBasicCubic.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/requirements/RequirementsBasicCubic.java index e53a7e4738..e53a7e4738 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/requirements/RequirementsBasicCubic.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/requirements/RequirementsBasicCubic.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java index c97723b042..9c856840b0 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java @@ -629,7 +629,8 @@ public class GT_MetaTileEntity_TesseractGenerator extends GT_MetaTileEntity_Basi "Generates a Tesseract for the attached Inventory", "Connect with pipes to insert items", "Consumes "+TESSERACT_ENERGY_COST+"EU/t for same dimension transfers", - "Consumes "+TESSERACT_ENERGY_COST_DIMENSIONAL+"EU/t for cross dimensional transfers", }; + "Consumes "+TESSERACT_ENERGY_COST_DIMENSIONAL+"EU/t for cross dimensional transfers", + CORE.GT_Tooltip}; } @Override diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractTerminal.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractTerminal.java index ed8b2db41f..088a596410 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractTerminal.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractTerminal.java @@ -498,7 +498,8 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic "Connect with pipes to extract items or fluids", "Outputs from the back face", "Consumes "+TESSERACT_ENERGY_COST+"EU/t for same dimension transfers", - "Consumes "+TESSERACT_ENERGY_COST_DIMENSIONAL+"EU/t for cross dimensional transfers", }; + "Consumes "+TESSERACT_ENERGY_COST_DIMENSIONAL+"EU/t for cross dimensional transfers", + CORE.GT_Tooltip}; } @Override diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java index b38cff5e19..4173489be6 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java @@ -46,7 +46,8 @@ public class GT_MetaTileEntity_Boiler_Base extends GT_MetaTileEntity_Boiler { "Produces " + getPollution() + " pollution/sec", "Consumes fuel only when temperature is less than 100C", "Fuel with burn time greater than 500 is more efficient.", - "Doesn't explode if there's no water" + "Doesn't explode if there's no water", + CORE.GT_Tooltip }; } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_HV.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_HV.java index dfbd254897..dfbd254897 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_HV.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_HV.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_LV.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_LV.java index e2b9046c68..e2b9046c68 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_LV.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_LV.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_MV.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_MV.java index 7ef781da17..7ef781da17 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_MV.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_MV.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Solar.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Solar.java index babba5afe9..f9cf904cc2 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Solar.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Solar.java @@ -1,5 +1,6 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.generators; +import gtPlusPlus.core.lib.CORE; import gtPlusPlus.xmod.gregtech.api.gui.CONTAINER_AdvancedBoiler; import gtPlusPlus.xmod.gregtech.api.gui.GUI_AdvancedBoiler; import net.minecraft.entity.player.InventoryPlayer; @@ -29,6 +30,14 @@ extends GT_MetaTileEntity_Boiler { public GT_MetaTileEntity_Boiler_Solar(final String aName, final int aTier, final String aDescription, final ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); } + + @Override + public String[] getDescription() { + return new String[]{ + this.mDescription, + "Produces "+(this.getPollution()*20)+" pollution/sec", + CORE.GT_Tooltip}; + } @Override public ITexture[][][] getTextureSet(final ITexture[] aTextures) { diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_RfConvertor.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_RfConvertor.java index 08356dd6ef..c6f368f0c0 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_RfConvertor.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_RfConvertor.java @@ -54,7 +54,11 @@ public class GT_MetaTileEntity_RfConvertor extends GregtechMetaEnergyBuffer impl @Override public String[] getDescription() { - return new String[] {"Use Screwdriver to change voltage", "Hold Shift while using Screwdriver to change amperage", EnumChatFormatting.DARK_AQUA+"Variable Output Voltage"}; + return new String[] { + "Use Screwdriver to change voltage", + "Hold Shift while using Screwdriver to change amperage", + EnumChatFormatting.DARK_AQUA+"Variable Output Voltage", + CORE.GT_Tooltip}; } @Override diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_SemiFluidGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_SemiFluidGenerator.java index 1ace02ce3a..d1628bdb59 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_SemiFluidGenerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_SemiFluidGenerator.java @@ -67,7 +67,11 @@ public class GT_MetaTileEntity_SemiFluidGenerator extends GT_MetaTileEntity_Basi @Override public String[] getDescription() { - return new String[]{this.mDescription, "Produces "+(this.getPollution())+" pollution/sec", "Fuel Efficiency: "+this.getEfficiency() + "%"}; + return new String[]{ + this.mDescription, + "Produces "+(this.getPollution())+" pollution/sec", + "Fuel Efficiency: "+this.getEfficiency() + "%", + CORE.GT_Tooltip}; } @Override diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityDoubleFuelGeneratorBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityDoubleFuelGeneratorBase.java index facba4fb57..2a0133245e 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityDoubleFuelGeneratorBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityDoubleFuelGeneratorBase.java @@ -14,7 +14,7 @@ import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_Recipe; - +import gtPlusPlus.core.lib.CORE; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.generators.GregtechRocketFuelGeneratorBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; @@ -32,6 +32,15 @@ extends GregtechRocketFuelGeneratorBase { super(aName, aTier, aDescription, aTextures); this.onConfigLoad(); } + + @Override + public String[] getDescription() { + return new String[]{this.mDescription, + "Generates power at " + this.getEfficiency() + "% Efficiency per tick", + "Output Voltage: "+this.getOutputTier()+" EU/t", + CORE.GT_Tooltip + }; + } @Override public boolean isOutputFacing(final byte aSide) { diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityGeothermalGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityGeothermalGenerator.java index a3c882a4af..a392ae5a58 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityGeothermalGenerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityGeothermalGenerator.java @@ -38,8 +38,12 @@ extends GT_MetaTileEntity_BasicGenerator @Override public String[] getDescription() { - String aPollution = "Causes "+this.getPollution()+ " Pollution per second"; - return new String[]{this.mDescription, "Generates power at " + this.getEfficiency() + "% Efficiency per tick", aPollution}; + String aPollution = "Causes "+this.getPollution()+ " Pollution per second"; + return new String[]{ + this.mDescription, + "Generates power at " + this.getEfficiency() + "% Efficiency per tick", + aPollution, + CORE.GT_Tooltip}; } @Override diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityRocketFuelGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityRocketFuelGenerator.java index c05c7ae3ff..c05c7ae3ff 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityRocketFuelGenerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityRocketFuelGenerator.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntitySolarGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntitySolarGenerator.java index 1d1c4fbfab..68dbc4fb61 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntitySolarGenerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntitySolarGenerator.java @@ -13,6 +13,7 @@ import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.objects.GT_RenderedTexture; import gtPlusPlus.api.objects.Logger; +import gtPlusPlus.core.lib.CORE; import gtPlusPlus.xmod.gregtech.api.gui.CONTAINER_SolarGenerator; import gtPlusPlus.xmod.gregtech.api.gui.GUI_SolarGenerator; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.generators.GregtechMetaSolarGenerator; @@ -28,6 +29,15 @@ public class GregtechMetaTileEntitySolarGenerator extends GregtechMetaSolarGener super(aName, aTier, aDescription, aTextures); this.onConfigLoad(); } + + @Override + public String[] getDescription() { + return new String[]{this.mDescription, + "Generates power at " + this.getEfficiency() + "% Efficiency per tick", + "Output Voltage: "+this.getOutputTier()+" EU/t", + CORE.GT_Tooltip + }; + } @Override public boolean isOutputFacing(final byte aSide) { diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntity_RTG.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntity_RTG.java index 14417cb921..ab000b98d4 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntity_RTG.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntity_RTG.java @@ -173,6 +173,7 @@ public class GregtechMetaTileEntity_RTG extends GT_MetaTileEntity_BasicGenerator "RTG changes output voltage depending on fuel", "Generates power at " + this.getEfficiency() + "% Efficiency per tick", "Output Voltage: "+this.getOutputTier()+" EU/t", + CORE.GT_Tooltip }; } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_CombustionGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_CombustionGenerator.java index b92a9ce06b..58919f0954 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_CombustionGenerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_CombustionGenerator.java @@ -1,11 +1,14 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.generators.ULV; +import static gregtech.api.enums.GT_Values.V; + import gregtech.api.GregTech_API; import gregtech.api.enums.ConfigCategories; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; import gregtech.common.tileentities.generators.GT_MetaTileEntity_DieselGenerator; +import gtPlusPlus.core.lib.CORE; public class GT_MetaTileEntity_ULV_CombustionGenerator extends GT_MetaTileEntity_DieselGenerator { public GT_MetaTileEntity_ULV_CombustionGenerator(int aID, String aName, String aNameRegional, int aTier) { @@ -15,8 +18,22 @@ public class GT_MetaTileEntity_ULV_CombustionGenerator extends GT_MetaTileEntity public GT_MetaTileEntity_ULV_CombustionGenerator(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); } + + @Override + public String[] getDescription() { + return new String[]{ + this.mDescription, + "Produces "+(this.getPollution()*20)+" pollution/sec", + "Fuel Efficiency: "+this.getEfficiency() + "%", + CORE.GT_Tooltip}; + } @Override + public long maxEUStore() { + return Math.max(getEUVar(), V[1] * 80L + getMinimumStoredEU()); + } + + @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { return new GT_MetaTileEntity_ULV_CombustionGenerator(this.mName, this.mTier, this.mDescription, this.mTextures); } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_GasTurbine.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_GasTurbine.java index c53436b059..17bb4463c4 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_GasTurbine.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_GasTurbine.java @@ -1,5 +1,7 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.generators.ULV; +import static gregtech.api.enums.GT_Values.V; + import gregtech.api.GregTech_API; import gregtech.api.enums.ConfigCategories; import gregtech.api.interfaces.IIconContainer; @@ -8,7 +10,7 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.objects.GT_RenderedTexture; import gregtech.common.tileentities.generators.GT_MetaTileEntity_GasTurbine; - +import gtPlusPlus.core.lib.CORE; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; public class GT_MetaTileEntity_ULV_GasTurbine extends GT_MetaTileEntity_GasTurbine { @@ -19,6 +21,20 @@ public class GT_MetaTileEntity_ULV_GasTurbine extends GT_MetaTileEntity_GasTurbi public GT_MetaTileEntity_ULV_GasTurbine(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); } + + @Override + public String[] getDescription() { + return new String[]{ + this.mDescription, + "Produces "+(this.getPollution()*20)+" pollution/sec", + "Fuel Efficiency: "+this.getEfficiency() + "%", + CORE.GT_Tooltip}; + } + + @Override + public long maxEUStore() { + return Math.max(getEUVar(), V[1] * 80L + getMinimumStoredEU()); + } public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { return new GT_MetaTileEntity_ULV_GasTurbine(this.mName, this.mTier, this.mDescription, this.mTextures); diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_SteamTurbine.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_SteamTurbine.java index 11bdc01823..ef3310c6fc 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_SteamTurbine.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_SteamTurbine.java @@ -1,15 +1,16 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.generators.ULV; +import static gregtech.api.enums.GT_Values.V; + import gregtech.api.GregTech_API; import gregtech.api.enums.ConfigCategories; -import gregtech.api.enums.Textures; import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.objects.GT_RenderedTexture; import gregtech.common.tileentities.generators.GT_MetaTileEntity_SteamTurbine; - +import gtPlusPlus.core.lib.CORE; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; public class GT_MetaTileEntity_ULV_SteamTurbine extends GT_MetaTileEntity_SteamTurbine { @@ -20,7 +21,20 @@ public class GT_MetaTileEntity_ULV_SteamTurbine extends GT_MetaTileEntity_SteamT public GT_MetaTileEntity_ULV_SteamTurbine(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); } + + @Override + public String[] getDescription() { + return new String[]{ + this.mDescription, + "Produces "+(this.getPollution()*20)+" pollution/sec", + "Fuel Efficiency: "+this.getEfficiency() + "%", + CORE.GT_Tooltip}; + } + @Override + public long maxEUStore() { + return Math.max(getEUVar(), V[1] * 80L + getMinimumStoredEU()); + } public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { return new GT_MetaTileEntity_ULV_SteamTurbine(this.mName, this.mTier, this.mDescription, this.mTextures); diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/creative/GregtechMetaCreativeEnergyBuffer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/creative/GregtechMetaCreativeEnergyBuffer.java index faaabbd159..a62a5d16c8 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/creative/GregtechMetaCreativeEnergyBuffer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/creative/GregtechMetaCreativeEnergyBuffer.java @@ -49,7 +49,11 @@ public class GregtechMetaCreativeEnergyBuffer extends GregtechMetaEnergyBuffer { @Override public String[] getDescription() { - return new String[] {this.mDescription, "Use Screwdriver to change voltage", "Hold Shift while using Screwdriver to change amperage", EnumChatFormatting.GREEN+"CREATIVE MACHINE"}; + return new String[] {this.mDescription, + "Use Screwdriver to change voltage", + "Hold Shift while using Screwdriver to change amperage", + EnumChatFormatting.GREEN+"CREATIVE MACHINE", + CORE.GT_Tooltip}; } /* diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_WorldAccelerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_WorldAccelerator.java index 129446c40d..129446c40d 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_WorldAccelerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_WorldAccelerator.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaAtmosphericReconditioner.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaAtmosphericReconditioner.java index eb01823151..33ffd1f118 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaAtmosphericReconditioner.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaAtmosphericReconditioner.java @@ -1,7 +1,6 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic; import static gregtech.api.enums.GT_Values.V; -import static gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils.mPollution; import org.apache.commons.lang3.ArrayUtils; @@ -42,14 +41,14 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi protected int mBaseEff = 2500; protected int mOptimalAirFlow = 0; protected boolean mHasPollution = false; - protected int SLOT_ROTOR = 4; - protected int SLOT_FILTER = 5; + protected int SLOT_ROTOR = 5; + protected int SLOT_FILTER = 6; protected static boolean mPollutionEnabled = true; protected boolean mSaveRotor = false; public GregtechMetaAtmosphericReconditioner(int aID, String aName, String aNameRegional, int aTier) { - super(aID, aName, aNameRegional, aTier, 2, "Making sure you don't live in Gwalior - Uses 2A", 2, 0, "Recycler.png", "", + super(aID, aName, aNameRegional, aTier, 2, "Making sure you don't live in Gwalior - Uses 2A", 3, 0, "Recycler.png", "", new ITexture[]{ new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_MASSFAB_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_MASSFAB), @@ -60,12 +59,12 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_MASSFAB_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_MASSFAB) }); - mPollutionEnabled = PollutionUtils.mPollution(); + mPollutionEnabled = PollutionUtils.isPollutionEnabled(); } public GregtechMetaAtmosphericReconditioner(String aName, int aTier, String aDescription, ITexture[][][] aTextures, String aGUIName, String aNEIName) { super(aName, aTier, 2, aDescription, aTextures, 2, 0, aGUIName, aNEIName); - mPollutionEnabled = PollutionUtils.mPollution(); + mPollutionEnabled = PollutionUtils.isPollutionEnabled(); } /*public GregtechMetaAtmosphericReconditioner(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures, String aGUIName, String aNEIName) { @@ -152,8 +151,8 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi //Get Inventory Item ItemStack stackRotor = this.mInventory[SLOT_ROTOR]; - ItemStack stackFilter = this.mInventory[SLOT_FILTER]; - + ItemStack stackFilter = this.mInventory[SLOT_FILTER]; + //Power Drain long drainEU = maxEUInput() * maxAmperesIn(); if (aBaseMetaTileEntity.isActive() && aBaseMetaTileEntity.getStoredEU() >= drainEU){ @@ -181,34 +180,61 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi //Only try once/sec. if (!isIdle && aTick % 20L == 0L){ + + + + for (int i=0;i<this.mInventory.length;i++) { + ItemStack aSlotContent = this.mInventory[i]; + if (aSlotContent != null) { + Logger.INFO("Found "+aSlotContent.getDisplayName()+" in slot "+i); + } + } + + for (int i=0;i<this.mInventory.length;i++) { + if (hasRotor(this.mInventory[i])) { + Logger.INFO("Found Rotor in slot "+i); + break; + } + } + for (int i=0;i<this.mInventory.length;i++) { + if (hasAirFilter(this.mInventory[i])) { + Logger.INFO("Found Filter in slot "+i); + break; + } + } //Check if machine can work. if ((aBaseMetaTileEntity.isAllowedToWork())){ + Logger.INFO("Can work."); //Enable machine animation/graphic if (hasRotor(stackRotor) && hasAirFilter(stackFilter) && this.mHasPollution){ if (!this.getBaseMetaTileEntity().isActive()) { + Logger.INFO("Set Active."); aBaseMetaTileEntity.setActive(true); } } else if (!this.mHasPollution || mCurrentPollution <= 0 || stackRotor == null || stackFilter == null || !hasRotor(stackRotor) || !hasAirFilter(stackFilter)){ if (!this.getBaseMetaTileEntity().isActive()) { + Logger.INFO("Set Inactive."); aBaseMetaTileEntity.setActive(false); this.sendSound((byte) -122); } } //If Active. - if (aBaseMetaTileEntity.isActive()){ + if (aBaseMetaTileEntity.isActive()){ + Logger.INFO("Doing something."); //Do nothing if there is no pollution. if(this.mHasPollution && mCurrentPollution > 0){ + Logger.INFO("Has Pollution? "+mHasPollution+", Current Pollution: "+mCurrentPollution); //Only check every 30s. if (!isIdle && aTick % (20L * 30) == 0L){ - mPollutionEnabled = PollutionUtils.mPollution(); + mPollutionEnabled = PollutionUtils.isPollutionEnabled(); //Clear out pollution if it's disabled, because I am a nice gal. - if (!mPollution()) { + if (!PollutionUtils.isPollutionEnabled()) { PollutionUtils.nullifyPollution(this.getBaseMetaTileEntity()); } } @@ -218,18 +244,18 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi //Use a Turbine if(hasRotor(stackRotor) && hasAirFilter(stackFilter)){ - Logger.WARNING("Found Turbine."); - mBaseEff = (int) ((50.0F + (10.0F * ((GT_MetaGenerated_Tool) stackRotor.getItem()).getToolCombatDamage(stackRotor))) * 100); - mOptimalAirFlow = (int) Math.max(Float.MIN_NORMAL, ((GT_MetaGenerated_Tool) stackRotor.getItem()).getToolStats(stackRotor).getSpeedMultiplier() - * GT_MetaGenerated_Tool.getPrimaryMaterial(stackRotor).mToolSpeed * 50); + Logger.INFO("Found Turbine."); + + mBaseEff = getBaseEfficiency(stackRotor); + mOptimalAirFlow = getOptimalAirFlow(stackRotor); //Make sure we have a valid Turbine and Eff/Airflow if (this.mBaseEff > 0 && this.mOptimalAirFlow > 0){ //Utils.LOG_WARNING("Pollution Cleaner [5]"); //Log Debug information. - Logger.WARNING("mBaseEff[1]:"+mBaseEff); - Logger.WARNING("mOptimalAirFlow[1]:"+mOptimalAirFlow); + Logger.INFO("mBaseEff[1]:"+mBaseEff); + Logger.INFO("mOptimalAirFlow[1]:"+mOptimalAirFlow); //Calculate The Voltage we are running long tVoltage = drainEU; @@ -244,20 +270,21 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi //If no sides are free, how will you process the atmosphere? if (mAirSides > 0){ reduction += (((Math.max((tTier-2), 1)*2)*50)*mAirSides); //Was originally *100 - Logger.WARNING("mPollutionReduction[1]:"+reduction); + Logger.INFO("mPollutionReduction[1]:"+reduction); //I stole this code reduction = (MathUtils.safeInt((long)reduction*this.mBaseEff)/100000)*mAirSides*Math.max((tTier-2), 1); - Logger.WARNING("reduction[2]:"+reduction); + Logger.INFO("reduction[2]:"+reduction); reduction = MathUtils.safeInt(((long)reduction/100)*this.mOptimalAirFlow); - Logger.WARNING("reduction[3]:"+reduction); + Logger.INFO("reduction[3]:"+reduction); mPollutionReduction = reduction; //Set a temp to remove variable to aleviate duplicate code. int toRemove = 0; - Logger.WARNING("mCurrentPollution[4]:"+mCurrentPollution); + Logger.INFO("mCurrentPollution[4]:"+mCurrentPollution); + Logger.INFO("mCurrentPollution[5]:"+reduction); if (reduction <= mCurrentPollution){ //Clean some Air. toRemove = reduction; @@ -265,17 +292,20 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi else { //Makes sure we don't get negative pollution. toRemove = mCurrentPollution; - } + } + + toRemove = toRemove/2; + Logger.INFO("mCurrentPollution[6]:"+toRemove); //We are good to clean if (toRemove > 0){ if (damageTurbineRotor() && damageAirFilter()){ Logger.INFO("Removing "+toRemove+" pollution"); removePollution(mSaveRotor ? (toRemove/2) : toRemove); - Logger.WARNING("mNewPollution[4]:"+getCurrentChunkPollution()); + Logger.INFO("mNewPollution[4]:"+getCurrentChunkPollution()); } else { - Logger.WARNING("Could not damage turbine rotor or Air Filter."); + Logger.INFO("Could not damage turbine rotor or Air Filter."); aBaseMetaTileEntity.setActive(false); } } //End of pollution removal block. @@ -370,12 +400,18 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi public boolean hasRotor(ItemStack rotorStack){ if(rotorStack != null){ if (rotorStack.getItem() instanceof ItemBasicScrubberTurbine) { + //Logger.INFO("Found Basic Turbine Rotor."); return true; } - if (rotorStack.getItem() instanceof GT_MetaGenerated_Tool && rotorStack.getItemDamage() >= 170 && rotorStack.getItemDamage() <= 179){ + else if (rotorStack.getItem() instanceof GT_MetaGenerated_Tool && rotorStack.getItemDamage() >= 170 && rotorStack.getItemDamage() <= 179){ + //Logger.INFO("Found Turbine Rotor."); return true; } + else { + //Logger.INFO("Found: "+rotorStack.getDisplayName()+":"+rotorStack.getItemDamage()); + } } + //Logger.INFO("Found No Turbine Rotor."); return false; } @@ -387,33 +423,43 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi if (rotorStack == null) { return false; } - else { - if(rotorStack.getItem() instanceof GT_MetaGenerated_Tool_01) { - Materials t1 = GT_MetaGenerated_Tool.getPrimaryMaterial(rotorStack); - Materials t2 = GT_MetaGenerated_Tool.getSecondaryMaterial(rotorStack); - if (t1 == Materials._NULL && t2 == Materials._NULL){ - creativeRotor = true; - } - } - } - - if (rotorStack.getItem() instanceof ItemBasicScrubberTurbine) { + else if (rotorStack.getItem() instanceof ItemBasicScrubberTurbine) { long currentUse = ItemBasicScrubberTurbine.getFilterDamage(rotorStack); //Remove broken Filter - if (rotorStack.getItemDamage() == 0 && currentUse >= 2500-10){ + if (rotorStack.getItemDamage() == 0 && currentUse >= 2000-10){ + Logger.INFO("Depleting ItemBasicScrubberTurbine T1"); this.mInventory[this.SLOT_FILTER] = null; return false; } - else if (rotorStack.getItemDamage() == 1 && currentUse >= 5000-10){ + else if (rotorStack.getItemDamage() == 1 && currentUse >= 4000-10){ + Logger.INFO("Depleting ItemBasicScrubberTurbine T2"); + this.mInventory[this.SLOT_FILTER] = null; + return false; + } + else if (rotorStack.getItemDamage() == 2 && currentUse >= 6000-10){ + Logger.INFO("Depleting ItemBasicScrubberTurbine T3"); this.mInventory[this.SLOT_FILTER] = null; return false; } else { //Do Damage - ItemAirFilter.setFilterDamage(rotorStack, currentUse+10); - Logger.WARNING("Rotor Damage: "+currentUse); + Logger.INFO("Damaging ItemBasicScrubberTurbine"); + ItemBasicScrubberTurbine.setFilterDamage(rotorStack, currentUse+10); + Logger.INFO("Rotor Damage: "+currentUse); return true; } + } + else if(rotorStack.getItem() instanceof GT_MetaGenerated_Tool_01) { + Materials t1 = GT_MetaGenerated_Tool.getPrimaryMaterial(rotorStack); + Materials t2 = GT_MetaGenerated_Tool.getSecondaryMaterial(rotorStack); + if (t1 == Materials._NULL && t2 == Materials._NULL){ + Logger.INFO("Found creative rotor."); + creativeRotor = true; + } + } + else { + Logger.INFO("Bad item in rotor slot."); + return false; } if(mInventory[SLOT_ROTOR].getItem() instanceof GT_MetaGenerated_Tool_01 && @@ -424,23 +470,23 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi double fDam = Math.floor(Math.abs(MathUtils.randFloat(1f, 2f) - MathUtils.randFloat(1f, 2f)) * (1f + 2f - 1f) + 1f); damageValue -= fDam; - //Logger.WARNING("Trying to do "+damageValue+" damage to the rotor. ["+fDam+"]"); + //Logger.INFO("Trying to do "+damageValue+" damage to the rotor. ["+fDam+"]"); /*Materials M1 = GT_MetaGenerated_Tool.getPrimaryMaterial(this.mInventory[this.SLOT_ROTOR]); Materials M2 = GT_MetaGenerated_Tool.getSecondaryMaterial(this.mInventory[this.SLOT_ROTOR]); - Logger.WARNING("Trying to do "+damageValue+" damage to the rotor. [2]");*/ + Logger.INFO("Trying to do "+damageValue+" damage to the rotor. [2]");*/ //Damage Rotor //int rotorDurability = this.mInventory[this.SLOT_ROTOR].getItemDamage(); long rotorDamage = creativeRotor ? 0 : GT_MetaGenerated_Tool.getToolDamage(this.mInventory[this.SLOT_ROTOR]); long rotorDurabilityMax = creativeRotor ? Integer.MAX_VALUE : GT_MetaGenerated_Tool.getToolMaxDamage(this.mInventory[this.SLOT_ROTOR]); long rotorDurability = (rotorDurabilityMax - rotorDamage); - Logger.WARNING("Rotor Damage: "+rotorDamage + " | Max Durability: "+rotorDurabilityMax+" | "+" Remaining Durability: "+rotorDurability); + Logger.INFO("Rotor Damage: "+rotorDamage + " | Max Durability: "+rotorDurabilityMax+" | "+" Remaining Durability: "+rotorDurability); if (rotorDurability >= damageValue){ if (!mSaveRotor){ - Logger.WARNING("Damaging Rotor."); + Logger.INFO("Damaging Rotor."); if (!creativeRotor) GT_ModHandler.damageOrDechargeItem(this.mInventory[this.SLOT_ROTOR], (int) damageValue, 0, null); @@ -454,7 +500,7 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi } } else { - Logger.WARNING("Damaging Rotor."); + Logger.INFO("Damaging Rotor."); if (rotorDurability > 1000){ if (!creativeRotor) GT_ModHandler.damageOrDechargeItem(this.mInventory[this.SLOT_ROTOR], (int) damageValue/2, 0, null); @@ -472,47 +518,46 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi } if (rotorDurability <= 0 && !mSaveRotor && !creativeRotor) { - Logger.WARNING("Destroying Rotor."); + Logger.INFO("Destroying Rotor."); this.mInventory[this.SLOT_ROTOR] = null; return false; } else if (rotorDurability <= 0 && mSaveRotor) { - Logger.WARNING("Saving Rotor."); + Logger.INFO("Saving Rotor."); return false; } }else { - Logger.WARNING("Bad Rotor."); + Logger.INFO("Bad Rotor."); return false; } } - catch (Throwable t){} + catch (Throwable t){ + t.printStackTrace(); + } return false; } public int getFreeSpaces(){ int mAir = 0; IGregTechTileEntity aBaseMetaTileEntity = this.getBaseMetaTileEntity(); - int x = aBaseMetaTileEntity.getXCoord(); - int y = aBaseMetaTileEntity.getYCoord(); - int z = aBaseMetaTileEntity.getZCoord(); - if(aBaseMetaTileEntity.getAirOffset(x+1, y, z)){ + if(aBaseMetaTileEntity.getAirOffset(1, 0, 0)){ mAir++; } - if(aBaseMetaTileEntity.getAirOffset(x-1, y, z)){ + if(aBaseMetaTileEntity.getAirOffset(-1, 0, 0)){ mAir++; } - if(aBaseMetaTileEntity.getAirOffset(x, y, z+1)){ + if(aBaseMetaTileEntity.getAirOffset(0, 0, 1)){ mAir++; } - if(aBaseMetaTileEntity.getAirOffset(x, y, z-1)){ + if(aBaseMetaTileEntity.getAirOffset(0, 0, -1)){ mAir++; } - if(aBaseMetaTileEntity.getAirOffset(x, y+1, z)){ + if(aBaseMetaTileEntity.getAirOffset(0, 1, 0)){ mAir++; } - if(aBaseMetaTileEntity.getAirOffset(x, y-1, z)){ + if(aBaseMetaTileEntity.getAirOffset(0, -1, 0)){ mAir++; } return mAir; @@ -526,8 +571,10 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi if (this.mTier < 7) { int startPollution = getCurrentChunkPollution(); + Logger.INFO("Current Chunk Pollution: "+startPollution); PollutionUtils.removePollution(this.getBaseMetaTileEntity(), toRemove); int after = getCurrentChunkPollution(); + Logger.INFO("Current Chunk Pollution: "+after); return (after<startPollution); } else { @@ -572,7 +619,7 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi continue; } - Logger.WARNING("Trying to remove pollution from chunk "+r.xPosition+", "+r.zPosition+" | "+startPollution); + Logger.INFO("Trying to remove pollution from chunk "+r.xPosition+", "+r.zPosition+" | "+startPollution); int after = 0; boolean isMainChunk = r.isAtLocation(mainChunkX, mainChunkZ); @@ -587,7 +634,7 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi if (startPollution - after > 0) { totalRemoved += (startPollution - after); } - Logger.WARNING("Removed "+(startPollution - after)+" pollution from chunk "+r.xPosition+", "+r.zPosition+" | "+after); + Logger.INFO("Removed "+(startPollution - after)+" pollution from chunk "+r.xPosition+", "+r.zPosition+" | "+after); } return totalRemoved > 0 && chunksWithRemoval > 0; } @@ -650,7 +697,7 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi else { //Do Damage ItemAirFilter.setFilterDamage(filter, currentUse+1); - Logger.WARNING("Filter Damage: "+currentUse); + Logger.INFO("Filter Damage: "+currentUse); return true; } } @@ -670,14 +717,14 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi @Override public boolean canInsertItem(int aIndex, ItemStack aStack, int aSide) { - if (aIndex == 5) { + if (aIndex == SLOT_FILTER) { if (aStack.getItem() instanceof ItemAirFilter) { Logger.INFO("Inserting Air Filter into "+aIndex); return true; } } - if (aIndex == 4) { - if (this.mInventory[6] != null) { + if (aIndex == SLOT_ROTOR) { + if (this.mInventory[7] != null) { Logger.INFO("Found conveyor, can automate turbines. Inserting into "+aIndex); if (aStack.getItem() instanceof ItemBasicScrubberTurbine) { return true; @@ -786,4 +833,35 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi super.setItemNBT(aNBT); } + private static ItemStack[] sGregTurbines; + + public static ItemStack getTieredTurbine(int aTier) { + if (sGregTurbines == null) { + sGregTurbines = new ItemStack[3]; + sGregTurbines[0] = GT_MetaGenerated_Tool.sInstances.get("gt.metatool.01").getToolWithStats(GT_MetaGenerated_Tool_01.TURBINE_SMALL, 1, Materials.Iron, Materials.Iron, null); + sGregTurbines[1] = GT_MetaGenerated_Tool.sInstances.get("gt.metatool.01").getToolWithStats(GT_MetaGenerated_Tool_01.TURBINE_SMALL, 1, Materials.Bronze, Materials.Bronze, null); + sGregTurbines[2] = GT_MetaGenerated_Tool.sInstances.get("gt.metatool.01").getToolWithStats(GT_MetaGenerated_Tool_01.TURBINE_SMALL, 1, Materials.Steel, Materials.Steel, null); + } + else { + return sGregTurbines[aTier]; + } + + return null; + } + + public int getBaseEfficiency(ItemStack aStackRotor) { + if (aStackRotor.getItem() instanceof ItemBasicScrubberTurbine) { + return getBaseEfficiency(getTieredTurbine(aStackRotor.getItemDamage())); + } + return (int) ((50.0F + (10.0F * ((GT_MetaGenerated_Tool) aStackRotor.getItem()).getToolCombatDamage(aStackRotor))) * 100); + } + + public int getOptimalAirFlow(ItemStack aStackRotor) { + if (aStackRotor.getItem() instanceof ItemBasicScrubberTurbine) { + return getOptimalAirFlow(getTieredTurbine(aStackRotor.getItemDamage())); + } + return (int) Math.max(Float.MIN_NORMAL, ((GT_MetaGenerated_Tool) aStackRotor.getItem()).getToolStats(aStackRotor).getSpeedMultiplier() + * GT_MetaGenerated_Tool.getPrimaryMaterial(aStackRotor).mToolSpeed * 50); + } + }
\ No newline at end of file diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaCondensor.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaCondensor.java index 78b7e40f01..0f7edd062d 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaCondensor.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaCondensor.java @@ -34,7 +34,7 @@ public class GregtechMetaCondensor extends GregtechMetaBoilerBase{ @Override public String[] getDescription() { - return new String[]{this.mDescription, "IC2 Steam + Water = Normal Steam.", "Requires no power to run, although it's not very fast.", }; + return new String[]{this.mDescription, "IC2 Steam + Water = Normal Steam.", "Requires no power to run, although it's not very fast.", CORE.GT_Tooltip}; } @Override diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaGarbageCollector.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaGarbageCollector.java index 0a65db7be4..88658c399d 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaGarbageCollector.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaGarbageCollector.java @@ -32,7 +32,12 @@ public class GregtechMetaGarbageCollector extends GregtechMetaTileEntity { @Override public String[] getDescription() { - return new String[] {this.mDescription, "Can request the JVM to perform garbage collection", "Configurable to run once every 5 minute interval (5-180)", "This Machine has no recipe", "Admin Tool, Limit one per world if possible"}; + return new String[] {this.mDescription, + "Can request the JVM to perform garbage collection", + "Configurable to run once every 5 minute interval (5-180)", + "This Machine has no recipe", + "Admin Tool, Limit one per world if possible", + CORE.GT_Tooltip}; } @Override diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionCreator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionCreator.java index 4e5c296629..65217f9e53 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionCreator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionCreator.java @@ -1,24 +1,20 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.World; - import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_Utility; - -import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.PlayerUtils; import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMetaTileEntity; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; public class GregtechMetaPollutionCreator extends GregtechMetaTileEntity { @@ -39,7 +35,7 @@ public class GregtechMetaPollutionCreator extends GregtechMetaTileEntity { @Override public String[] getDescription() { - return new String[] {this.mDescription, "A useful debug machine to create pollution."}; + return new String[] {this.mDescription, "A useful debug machine to create pollution.", CORE.GT_Tooltip}; } @Override @@ -189,7 +185,7 @@ public class GregtechMetaPollutionCreator extends GregtechMetaTileEntity { public int pollutionMultiplier = 1; private void showPollution(final World worldIn, final EntityPlayer playerIn){ - if(!PollutionUtils.mPollution()){ + if(!PollutionUtils.isPollutionEnabled()){ PlayerUtils.messagePlayer(playerIn, "This block is useless, Pollution is disabled."); } else { diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionDetector.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionDetector.java index 78f60f13c9..69a4f96708 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionDetector.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionDetector.java @@ -1,25 +1,21 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.World; - import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_Utility; - -import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.PlayerUtils; import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMetaTileEntity; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; public class GregtechMetaPollutionDetector extends GregtechMetaTileEntity { @@ -43,7 +39,8 @@ public class GregtechMetaPollutionDetector extends GregtechMetaTileEntity { public String[] getDescription() { return new String[] {this.mDescription, "Right click to check pollution levels.", "Configure with screwdriver to set redstone output amount.", - "Does not use power."}; + "Does not use power.", + CORE.GT_Tooltip}; } @Override @@ -189,7 +186,7 @@ public class GregtechMetaPollutionDetector extends GregtechMetaTileEntity { } private void showPollution(final World worldIn, final EntityPlayer playerIn){ - if(!PollutionUtils.mPollution()){ + if(!PollutionUtils.isPollutionEnabled()){ PlayerUtils.messagePlayer(playerIn, "This block is useless, Pollution is disabled."); } else { diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityChunkLoader.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityChunkLoader.java index 140f1d9cd5..140f1d9cd5 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityChunkLoader.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityChunkLoader.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityThaumcraftResearcher.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityThaumcraftResearcher.java index 8456f40797..8456f40797 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityThaumcraftResearcher.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityThaumcraftResearcher.java diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_AutoChisel.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_AutoChisel.java new file mode 100644 index 0000000000..f2fc0cce7a --- /dev/null +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_AutoChisel.java @@ -0,0 +1,155 @@ +package gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic; + +import java.util.List; + +import gregtech.api.enums.Textures.BlockIcons; +import gregtech.api.interfaces.ITexture; +import gregtech.api.interfaces.tileentity.IGregTechTileEntity; +import gregtech.api.metatileentity.MetaTileEntity; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine; +import gregtech.api.objects.GT_RenderedTexture; +import gregtech.api.util.GT_Recipe; +import gregtech.api.util.GT_Utility; +import gtPlusPlus.core.util.minecraft.ItemUtils; +import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; +import net.minecraft.item.ItemStack; +import team.chisel.carving.Carving; + +public class GregtechMetaTileEntity_AutoChisel extends GT_MetaTileEntity_BasicMachine { + + private ItemStack mInputCache; + private ItemStack mOutputCache; + + public GregtechMetaTileEntity_AutoChisel(int aID, String aName, String aNameRegional, int aTier) { + super(aID, aName, aNameRegional, aTier, 1, "Chisels things, Gregtech style", 1, 1, "Compressor.png", "", + new ITexture[]{ + new GT_RenderedTexture(BlockIcons.OVERLAY_SIDE_MASSFAB_ACTIVE), + new GT_RenderedTexture(BlockIcons.OVERLAY_SIDE_MASSFAB), + new GT_RenderedTexture(BlockIcons.OVERLAY_FRONT_MULTI_SMELTER_ACTIVE), + new GT_RenderedTexture(BlockIcons.OVERLAY_FRONT_MULTI_SMELTER), + new GT_RenderedTexture(TexturesGtBlock.Overlay_MatterFab_Active), + new GT_RenderedTexture(TexturesGtBlock.Overlay_MatterFab), + new GT_RenderedTexture(BlockIcons.OVERLAY_BOTTOM_MASSFAB_ACTIVE), + new GT_RenderedTexture(BlockIcons.OVERLAY_BOTTOM_MASSFAB) + }); + } + + public GregtechMetaTileEntity_AutoChisel(String aName, int aTier, String aDescription, ITexture[][][] aTextures, String aGUIName, String aNEIName) { + super(aName, aTier, 1, aDescription, aTextures, 1, 1, aGUIName, aNEIName); + } + + @Override + public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { + return new GregtechMetaTileEntity_AutoChisel(this.mName, this.mTier, this.mDescription, this.mTextures, this.mGUIName, this.mNEIName); + } + + @Override + public String[] getDescription() { + String[] A = new String[]{ + this.mDescription, + "What you want to chisel goes in slot 1", + "What you want to get goes in the special slot (bottom right)", + "If special slot is empty, first chisel result is used" + }; + return A; + } + + @Override + public GT_Recipe.GT_Recipe_Map getRecipeList() { + return null; + } + + private boolean hasValidCache(ItemStack aStack, ItemStack aSpecialSlot, boolean aClearOnFailure) { + if (mInputCache != null && mOutputCache != null) { + if (GT_Utility.areStacksEqual(aStack, mInputCache) && GT_Utility.areStacksEqual(aSpecialSlot, mOutputCache)) { + return true; + } + } + // clear cache if it was invalid + if (aClearOnFailure) { + mInputCache = null; + mOutputCache = null; + } + return false; + } + + private void cacheItem(ItemStack mInputItem, ItemStack mOutputItem) { + mOutputCache = mOutputItem.copy(); + mInputCache = mInputItem.copy(); + } + + @Override + protected boolean allowPutStackValidated(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) { + return hasValidCache(aStack, this.getSpecialSlot(), false) ? true : super.allowPutStackValidated(aBaseMetaTileEntity, aIndex, aSide, aStack) && hasChiselResults(aStack); + } + + // lets make sure the user isn't trying to make something from a block that doesn't have this as a valid target + private static boolean canBeMadeFrom(ItemStack from, ItemStack to) { + List<ItemStack> results = getItemsForChiseling(from); + for (ItemStack s : results) { + if (s.getItem() == to.getItem() && s.getItemDamage() == to.getItemDamage()) { + return true; + } + } + return false; + } + + // lets make sure the user isn't trying to make something from a block that doesn't have this as a valid target + private static boolean hasChiselResults(ItemStack from) { + List<ItemStack> results = getItemsForChiseling(from); + return results.size() > 0; + } + + private static List<ItemStack> getItemsForChiseling(ItemStack aStack){ + return Carving.chisel.getItemsForChiseling(aStack); + } + + private static ItemStack getChiselOutput(ItemStack aInput, ItemStack aTarget) { + ItemStack tOutput = null; + if (aTarget != null && canBeMadeFrom(aInput, aTarget)) { + tOutput = aTarget; + } + else if (aTarget != null && !canBeMadeFrom(aInput, aTarget)) { + tOutput = null; + } + else { + tOutput = getItemsForChiseling(aInput).get(0); + } + return tOutput; + } + + @Override + public int checkRecipe() { + ItemStack tOutput = null; + ItemStack aInput = getInputAt(0); + ItemStack aTarget = getSpecialSlot(); + boolean tIsCached = hasValidCache(aInput, aTarget, true); + if (aInput != null && hasChiselResults(aInput) && aInput.stackSize > 0) { + tOutput = tIsCached ? mOutputCache.copy() : getChiselOutput(aInput, aTarget); + if (tOutput != null) { + tOutput = tOutput.copy(); + tOutput.stackSize = 1; + // We can chisel this + if (canOutput(tOutput)) { + getInputAt(0).stackSize -= 1; + calculateOverclockedNess(16, 20); + //In case recipe is too OP for that machine + if (mMaxProgresstime == Integer.MAX_VALUE - 1 && mEUt == Integer.MAX_VALUE - 1) { + return FOUND_RECIPE_BUT_DID_NOT_MEET_REQUIREMENTS; + } + if (!tIsCached) { + cacheItem(ItemUtils.getSimpleStack(aInput, 1), ItemUtils.getSimpleStack(tOutput, 1)); + } + this.mOutputItems[0] = tOutput.copy(); + return FOUND_AND_SUCCESSFULLY_USED_RECIPE; + } + else { + mOutputBlocked++; + return FOUND_RECIPE_BUT_DID_NOT_MEET_REQUIREMENTS; + } + } + } + return DID_NOT_FIND_RECIPE; + } + +}
\ No newline at end of file diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_BasicWasher.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_BasicWasher.java index 01944c6ce5..99b3faa7d4 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_BasicWasher.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_BasicWasher.java @@ -7,6 +7,7 @@ import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine; import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_Recipe; +import gtPlusPlus.core.lib.CORE; import gregtech.api.util.GTPP_Recipe; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; @@ -39,7 +40,7 @@ public class GregtechMetaTileEntity_BasicWasher extends GT_MetaTileEntity_BasicM @Override public String[] getDescription() { - return new String[]{this.mDescription, "Grants no byproducts, but it is fast.", }; + return new String[]{this.mDescription, "Grants no byproducts, but it is fast.", CORE.GT_Tooltip}; } @Override diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ChemicalReactor.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ChemicalReactor.java index 7505c721f4..c872e5c912 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ChemicalReactor.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ChemicalReactor.java @@ -69,7 +69,7 @@ public class GregtechMetaTileEntity_ChemicalReactor extends GT_MetaTileEntity_Ba @Override public String[] getDescription() { - return new String[]{this.mDescription, "Because why not?", }; + return new String[]{this.mDescription, "Because why not?", CORE.GT_Tooltip}; } @Override diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_CompactFusionReactor.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_CompactFusionReactor.java index 2197ce193d..2197ce193d 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_CompactFusionReactor.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_CompactFusionReactor.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_PocketFusion.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_PocketFusion.java index cf9ab2b7e3..6cae58ced2 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_PocketFusion.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_PocketFusion.java @@ -55,7 +55,7 @@ public class GregtechMetaTileEntity_PocketFusion extends GT_MetaTileEntity_Delux public String[] getDescription() { return new String[] { this.mDescription, "Not Very Fast, but not very big either.", "Each side pair in/out puts to different slots.", "Top & Bottom Sides are Outputs.", - "Front & Back are Input Plasma 1.", "Sides are Input Plasma 2." }; + "Front & Back are Input Plasma 1.", "Sides are Input Plasma 2.", CORE.GT_Tooltip }; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ReactorColdTrap.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ReactorColdTrap.java new file mode 100644 index 0000000000..85e2df42c9 --- /dev/null +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ReactorColdTrap.java @@ -0,0 +1,67 @@ +package gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic; + +import gregtech.api.interfaces.ITexture; +import gregtech.api.interfaces.tileentity.IGregTechTileEntity; +import gregtech.api.metatileentity.MetaTileEntity; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine; +import gregtech.api.objects.GT_RenderedTexture; +import gregtech.api.util.GTPP_Recipe; +import gregtech.api.util.GT_Recipe; +import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; + +public class GregtechMetaTileEntity_ReactorColdTrap extends GT_MetaTileEntity_BasicMachine { + + public GregtechMetaTileEntity_ReactorColdTrap(int aID, String aName, String aNameRegional, int aTier) { + super(aID, aName, aNameRegional, aTier, 1, + "Just like the Arctic", 2, 9, "Dehydrator.png", "", + new ITexture[]{ + new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_COLDTRAP_SIDE_ACTIVE), + new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_COLDTRAP_SIDE), + new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_COLDTRAP_FRONT_ACTIVE), + new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_COLDTRAP_FRONT), + new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_COLDTRAP_TOP_ACTIVE), + new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_COLDTRAP_TOP), + new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_COLDTRAP_TOP_ACTIVE), + new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_COLDTRAP_TOP) + } + ); + } + + public GregtechMetaTileEntity_ReactorColdTrap(String aName, int aTier, String aDescription, ITexture[][][] aTextures, String aGUIName, String aNEIName) { + super(aName, aTier, 1, aDescription, aTextures, 1, 1, aGUIName, aNEIName); + } + + @Override + public String[] getDescription() { + return new String[]{this.mDescription, "Does not require ice cubes", CORE.GT_Tooltip}; + } + + @Override + public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { + return new GregtechMetaTileEntity_ReactorColdTrap(this.mName, this.mTier, this.mDescription, this.mTextures, this.mGUIName, this.mNEIName); + } + + @Override + public GT_Recipe.GT_Recipe_Map getRecipeList() { + return GTPP_Recipe.GTPP_Recipe_Map.sColdTrapRecipes; + } + + @Override + public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) { + return (super.allowPutStack(aBaseMetaTileEntity, aIndex, aSide, aStack)) && (getRecipeList().containsInput(aStack)); + } + + @Override + public boolean isFluidInputAllowed(FluidStack aFluid) { + return super.isFluidInputAllowed(aFluid); + } + + @Override + public int getCapacity() { + return 16000 * Math.max(1, this.mTier); + } + +} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ReactorProcessingUnit.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ReactorProcessingUnit.java new file mode 100644 index 0000000000..60e2ec8c0a --- /dev/null +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ReactorProcessingUnit.java @@ -0,0 +1,67 @@ +package gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic; + +import gregtech.api.interfaces.ITexture; +import gregtech.api.interfaces.tileentity.IGregTechTileEntity; +import gregtech.api.metatileentity.MetaTileEntity; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine; +import gregtech.api.objects.GT_RenderedTexture; +import gregtech.api.util.GTPP_Recipe; +import gregtech.api.util.GT_Recipe; +import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; + +public class GregtechMetaTileEntity_ReactorProcessingUnit extends GT_MetaTileEntity_BasicMachine { + + public GregtechMetaTileEntity_ReactorProcessingUnit(int aID, String aName, String aNameRegional, int aTier) { + super(aID, aName, aNameRegional, aTier, 1, + "Processes Nuclear things", 2, 9, "Dehydrator.png", "", + new ITexture[]{ + new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_PROCESSINGUNIT_SIDE_ACTIVE), + new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_PROCESSINGUNIT_SIDE), + new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_PROCESSINGUNIT_FRONT_ACTIVE), + new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_PROCESSINGUNIT_FRONT), + new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_PROCESSINGUNIT_TOP_ACTIVE), + new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_PROCESSINGUNIT_TOP), + new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_PROCESSINGUNIT_TOP_ACTIVE), + new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_PROCESSINGUNIT_TOP) + } + ); + } + + public GregtechMetaTileEntity_ReactorProcessingUnit(String aName, int aTier, String aDescription, ITexture[][][] aTextures, String aGUIName, String aNEIName) { + super(aName, aTier, 1, aDescription, aTextures, 1, 1, aGUIName, aNEIName); + } + + @Override + public String[] getDescription() { + return new String[]{this.mDescription, CORE.GT_Tooltip}; + } + + @Override + public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { + return new GregtechMetaTileEntity_ReactorProcessingUnit(this.mName, this.mTier, this.mDescription, this.mTextures, this.mGUIName, this.mNEIName); + } + + @Override + public GT_Recipe.GT_Recipe_Map getRecipeList() { + return GTPP_Recipe.GTPP_Recipe_Map.sReactorProcessingUnitRecipes; + } + + @Override + public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) { + return (super.allowPutStack(aBaseMetaTileEntity, aIndex, aSide, aStack)) && (getRecipeList().containsInput(aStack)); + } + + @Override + public boolean isFluidInputAllowed(FluidStack aFluid) { + return super.isFluidInputAllowed(aFluid); + } + + @Override + public int getCapacity() { + return 8000 * Math.max(1, this.mTier); + } + +} diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaWirelessCharger.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaWirelessCharger.java index 8e4b9ff79c..ffaa77a0be 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaWirelessCharger.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaWirelessCharger.java @@ -48,6 +48,7 @@ public class GregtechMetaWirelessCharger extends GregtechMetaTileEntity { "Mixed: Provides both 2A of long range and 1A per player locally.", "Mixed mode is more conservative of power and as a result only", "Gets half the distances each singular mode gets.", + CORE.GT_Tooltip }; } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GMTE_AmazonPackager.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GMTE_AmazonPackager.java index bdd49eb803..b8f24d6c5e 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GMTE_AmazonPackager.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GMTE_AmazonPackager.java @@ -98,20 +98,15 @@ public class GMTE_AmazonPackager extends GregtechMeta_MultiBlockBase { } else { IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBus){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mInputBusses.add((GT_MetaTileEntity_Hatch_InputBus)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mMaintenanceHatches.add((GT_MetaTileEntity_Hatch_Maintenance)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Energy){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mEnergyHatches.add((GT_MetaTileEntity_Hatch_Energy)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_OutputBus) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mOutputBusses.add((GT_MetaTileEntity_Hatch_OutputBus) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Muffler) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mMufflerHatches.add((GT_MetaTileEntity_Hatch_Muffler) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } } return false; diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GregtechMTE_TeslaTower.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GregtechMTE_TeslaTower.java index 7ddf16b36f..7ddf16b36f 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GregtechMTE_TeslaTower.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GregtechMTE_TeslaTower.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialAlloySmelter.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialAlloySmelter.java index 4c76b6dcf0..df01d01679 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialAlloySmelter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialAlloySmelter.java @@ -28,6 +28,7 @@ import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.block.ModBlocks; +import gtPlusPlus.core.lib.CORE; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemStack; @@ -119,14 +120,14 @@ public class GregtechMetaTileEntity_IndustrialAlloySmelter extends GregtechMeta_ .beginStructureBlock(3, 5, 3, true) .addController("Bottom center") .addCasingInfo("Inconel Reinforced Casings", 10) - .addCasingInfo("Integral Encasement V", 18) + .addCasingInfo("Integral Encasement V", 8) .addCasingInfo("Heating Coils", 16) .addInputBus("Any Inconel Reinforced Casing", 1) .addOutputBus("Any Inconel Reinforced Casing", 1) .addEnergyHatch("Any Inconel Reinforced Casing", 1) .addMaintenanceHatch("Any Inconel Reinforced Casing", 1) .addMufflerHatch("Any Inconel Reinforced Casing", 1) - .toolTipFinisher("GT++"); + .toolTipFinisher(CORE.GT_Tooltip_Builder); return tt; } @@ -178,20 +179,15 @@ public class GregtechMetaTileEntity_IndustrialAlloySmelter extends GregtechMeta_ } else { IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBus){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mInputBusses.add((GT_MetaTileEntity_Hatch_InputBus)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mMaintenanceHatches.add((GT_MetaTileEntity_Hatch_Maintenance)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Energy){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mEnergyHatches.add((GT_MetaTileEntity_Hatch_Energy)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_OutputBus) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mOutputBusses.add((GT_MetaTileEntity_Hatch_OutputBus) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Muffler) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mMufflerHatches.add((GT_MetaTileEntity_Hatch_Muffler) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } } return false; diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialArcFurnace.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialArcFurnace.java index f51e8b3ee2..eae867d11d 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialArcFurnace.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialArcFurnace.java @@ -1,14 +1,26 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; +import static gregtech.api.util.GT_StructureUtility.ofHatchAdder; + import com.gtnewhorizon.structurelib.structure.IStructureDefinition; import com.gtnewhorizon.structurelib.structure.StructureDefinition; + import gregtech.api.GregTech_API; import gregtech.api.enums.TAE; import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.implementations.*; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_InputBus; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Maintenance; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Muffler; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_OutputBus; import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_Multiblock_Tooltip_Builder; import gregtech.api.util.GT_Recipe; @@ -26,12 +38,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumChatFormatting; -import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; -import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; -import static gregtech.api.util.GT_StructureUtility.ofHatchAdder; - -public class GregtechMetaTileEntity_IndustrialArcFurnace -extends GregtechMeta_MultiBlockBase { +public class GregtechMetaTileEntity_IndustrialArcFurnace extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialArcFurnace> { //862 private static final int mCasingTextureID = TAE.getIndexFromPage(3, 3); @@ -70,7 +77,7 @@ extends GregtechMeta_MultiBlockBase { tt.addMachineType(getMachineType()) .addInfo("Controller Block for Industrial Arc Furnace") .addInfo("250% faster than using single block machines of the same voltage") - .addInfo("Processes 8 items per voltage tier") + .addInfo("Processes 8 items per voltage tier * W/L") .addInfo("Max Size required to process Plasma recipes") .addPollutionAmount(getPollutionPerSecond(null)) .addSeparator() @@ -85,7 +92,7 @@ extends GregtechMeta_MultiBlockBase { .addEnergyHatch("Any Casing", 1) .addMaintenanceHatch("Any Casing", 1) .addMufflerHatch("Any Casing", 1) - .toolTipFinisher("GT++"); + .toolTipFinisher(CORE.GT_Tooltip_Builder); return tt; } @@ -143,26 +150,19 @@ extends GregtechMeta_MultiBlockBase { } else { IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBus){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mInputBusses.add((GT_MetaTileEntity_Hatch_InputBus)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mMaintenanceHatches.add((GT_MetaTileEntity_Hatch_Maintenance)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Energy){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mEnergyHatches.add((GT_MetaTileEntity_Hatch_Energy)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_OutputBus) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mOutputBusses.add((GT_MetaTileEntity_Hatch_OutputBus) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Muffler) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mMufflerHatches.add((GT_MetaTileEntity_Hatch_Muffler) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mInputHatches.add((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Output) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mOutputHatches.add((GT_MetaTileEntity_Hatch_Output) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } } return false; @@ -196,7 +196,7 @@ extends GregtechMeta_MultiBlockBase { mCasing = 0; clearHatches(); if (checkPiece(mName + "7", 3, 3, 0)) { - mSize = 3; + mSize = 7; return mCasing >= 10 && checkHatch(); } return false; @@ -233,7 +233,7 @@ extends GregtechMeta_MultiBlockBase { @Override public boolean checkRecipe(final ItemStack aStack) { - return this.checkRecipeGeneric(this.mSize * 8 * GT_Utility.getTier(this.getMaxInputVoltage()), 100, 250); + return this.checkRecipeGeneric(getMaxParallelRecipes(), 100, 250); } @Override @@ -295,7 +295,7 @@ extends GregtechMeta_MultiBlockBase { @Override public void onModeChangeByScrewdriver(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) { - if (this.mSize > 3) { + if (this.mSize > 5) { this.mPlasmaMode = Utils.invertBoolean(mPlasmaMode); if (mPlasmaMode) { PlayerUtils.messagePlayer(aPlayer, "["+EnumChatFormatting.RED+"MODE"+EnumChatFormatting.RESET+"] "+EnumChatFormatting.LIGHT_PURPLE+"Plasma"+EnumChatFormatting.RESET); @@ -303,7 +303,10 @@ extends GregtechMeta_MultiBlockBase { else { PlayerUtils.messagePlayer(aPlayer, "["+EnumChatFormatting.RED+"MODE"+EnumChatFormatting.RESET+"] "+EnumChatFormatting.YELLOW+"Electric"+EnumChatFormatting.RESET); } - } + } + else { + PlayerUtils.messagePlayer(aPlayer, "["+EnumChatFormatting.RED+"MODE"+EnumChatFormatting.RESET+"] "+EnumChatFormatting.GRAY+"Cannot change mode, structure not large enough."+EnumChatFormatting.RESET); + } } @Override diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCentrifuge.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCentrifuge.java index 8ffdbc7efe..8802a7148b 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCentrifuge.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCentrifuge.java @@ -83,7 +83,7 @@ extends GregtechMeta_MultiBlockBase { .addEnergyHatch("Any Casing except front", 1) .addMaintenanceHatch("Any Casing except front", 1) .addMufflerHatch("Any Casing except front", 1) - .toolTipFinisher("GT++"); + .toolTipFinisher(CORE.GT_Tooltip_Builder); return tt; } @@ -132,26 +132,19 @@ extends GregtechMeta_MultiBlockBase { } else { IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBus){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mInputBusses.add((GT_MetaTileEntity_Hatch_InputBus)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mMaintenanceHatches.add((GT_MetaTileEntity_Hatch_Maintenance)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Energy){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mEnergyHatches.add((GT_MetaTileEntity_Hatch_Energy)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_OutputBus) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mOutputBusses.add((GT_MetaTileEntity_Hatch_OutputBus) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Muffler) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mMufflerHatches.add((GT_MetaTileEntity_Hatch_Muffler) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mInputHatches.add((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Output) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mOutputHatches.add((GT_MetaTileEntity_Hatch_Output) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } } return false; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialChisel.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialChisel.java new file mode 100644 index 0000000000..b59bf61301 --- /dev/null +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialChisel.java @@ -0,0 +1,474 @@ +package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing; + +import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; +import static gregtech.api.util.GT_StructureUtility.ofHatchAdder; +import static gtPlusPlus.core.util.data.ArrayUtils.removeNulls; + +import java.util.ArrayList; +import java.util.List; + +import org.apache.commons.lang3.ArrayUtils; + +import com.gtnewhorizon.structurelib.structure.IStructureDefinition; +import com.gtnewhorizon.structurelib.structure.StructureDefinition; + +import gregtech.api.enums.Textures; +import gregtech.api.interfaces.ITexture; +import gregtech.api.interfaces.metatileentity.IMetaTileEntity; +import gregtech.api.interfaces.tileentity.IGregTechTileEntity; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_InputBus; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Maintenance; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Muffler; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_OutputBus; +import gregtech.api.objects.GT_RenderedTexture; +import gregtech.api.util.GTPP_Recipe; +import gregtech.api.util.GT_Multiblock_Tooltip_Builder; +import gregtech.api.util.GT_Recipe; +import gregtech.api.util.GT_Utility; +import gtPlusPlus.core.block.ModBlocks; +import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.util.minecraft.ItemUtils; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; +import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; +import team.chisel.carving.Carving; + +public class GregtechMetaTileEntity_IndustrialChisel extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialChisel> { + + private int mCasing; + private IStructureDefinition<GregtechMetaTileEntity_IndustrialChisel> STRUCTURE_DEFINITION = null; + private ItemStack mInputCache; + private ItemStack mOutputCache; + private GTPP_Recipe mCachedRecipe; + + public GregtechMetaTileEntity_IndustrialChisel(int aID, String aName, String aNameRegional) { + super(aID, aName, aNameRegional); + } + + public GregtechMetaTileEntity_IndustrialChisel(String aName) { + super(aName); + } + + public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { + return new GregtechMetaTileEntity_IndustrialChisel(this.mName); + } + + @Override + public String getMachineType() { + return "Chisel"; + } + + @Override + protected GT_Multiblock_Tooltip_Builder createTooltip() { + GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + tt.addMachineType(getMachineType()) + .addInfo("Factory Grade Auto Chisel") + .addInfo("Target block goes in GUI slot") + .addInfo("If no target provided, firdt chisel result is used") + .addInfo("Speed: 200% | Eu Usage: 75% | Parallel: Tier x 16") + .addPollutionAmount(getPollutionPerSecond(null)) + .addSeparator() + .beginStructureBlock(3, 3, 3, true) + .addController("Front center") + .addCasingInfo("Sturdy Printer Casing", 10) + .addInputBus("Any casing", 1) + .addOutputBus("Any casing", 1) + .addEnergyHatch("Any casing", 1) + .addMaintenanceHatch("Any casing", 1) + .addMufflerHatch("Any casing", 1) + .toolTipFinisher(CORE.GT_Tooltip_Builder); + return tt; + } + + @Override + public IStructureDefinition<GregtechMetaTileEntity_IndustrialChisel> getStructureDefinition() { + if (STRUCTURE_DEFINITION == null) { + STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_IndustrialChisel>builder() + .addShape(mName, transpose(new String[][]{ + {"CCC", "CCC", "CCC"}, + {"C~C", "C-C", "CCC"}, + {"CCC", "CCC", "CCC"}, + })) + .addElement( + 'C', + ofChain( + ofHatchAdder( + GregtechMetaTileEntity_IndustrialChisel::addAdvChiselList, 90, 1 + ), + onElementPass( + x -> ++x.mCasing, + ofBlock( + ModBlocks.blockCasings5Misc, 5 + ) + ) + ) + ) + .build(); + } + return STRUCTURE_DEFINITION; + } + + public final boolean addAdvChiselList(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) { + if (aTileEntity == null) { + return false; + } else { + IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); + if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBus){ + return addToMachineList(aTileEntity, aBaseCasingIndex); + } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_OutputBus) { + return addToMachineList(aTileEntity, aBaseCasingIndex); + } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance){ + return addToMachineList(aTileEntity, aBaseCasingIndex); + } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Energy){ + return addToMachineList(aTileEntity, aBaseCasingIndex); + } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Muffler) { + return addToMachineList(aTileEntity, aBaseCasingIndex); + } + } + return false; + } + + @Override + public void construct(ItemStack stackSize, boolean hintsOnly) { + buildPiece(mName, stackSize, hintsOnly, 1, 1, 0); + } + + @Override + public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) { + mCasing = 0; + return checkPiece(mName, 1, 1, 0) && mCasing >= 10 && checkHatch(); + } + + public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) { + if (aSide == aFacing) { + return new ITexture[]{Textures.BlockIcons.getCasingTextureForId(90), new GT_RenderedTexture(aActive ? TexturesGtBlock.Overlay_Machine_Controller_Advanced_Active : TexturesGtBlock.Overlay_Machine_Controller_Advanced)}; + } + return new ITexture[]{Textures.BlockIcons.getCasingTextureForId(90)}; + } + + @Override + public boolean hasSlotInGUI() { + return true; + } + + @Override + public String getCustomGUIResourceName() { + return "ImplosionCompressor"; + } + + @Override + public boolean requiresVanillaGtGUI() { + return true; + } + + public GT_Recipe.GT_Recipe_Map getRecipeMap() { + return null; + } + + public boolean isCorrectMachinePart(ItemStack aStack) { + return true; + } + + private boolean hasValidCache(ItemStack aStack, ItemStack aSpecialSlot, boolean aClearOnFailure) { + if (mInputCache != null && mOutputCache != null && mCachedRecipe != null) { + if (GT_Utility.areStacksEqual(aStack, mInputCache) && GT_Utility.areStacksEqual(aSpecialSlot, mOutputCache)) { + return true; + } + } + // clear cache if it was invalid + if (aClearOnFailure) { + mInputCache = null; + mOutputCache = null; + mCachedRecipe = null; + } + return false; + } + + private void cacheItem(ItemStack aInputItem, ItemStack aOutputItem, GTPP_Recipe aRecipe) { + mInputCache = aInputItem.copy(); + mOutputCache = aOutputItem.copy(); + mCachedRecipe = aRecipe; + } + + // lets make sure the user isn't trying to make something from a block that doesn't have this as a valid target + private static boolean canBeMadeFrom(ItemStack from, ItemStack to) { + List<ItemStack> results = getItemsForChiseling(from); + for (ItemStack s : results) { + if (s.getItem() == to.getItem() && s.getItemDamage() == to.getItemDamage()) { + return true; + } + } + return false; + } + + // lets make sure the user isn't trying to make something from a block that doesn't have this as a valid target + private static boolean hasChiselResults(ItemStack from) { + List<ItemStack> results = getItemsForChiseling(from); + return results.size() > 0; + } + + private static List<ItemStack> getItemsForChiseling(ItemStack aStack){ + return Carving.chisel.getItemsForChiseling(aStack); + } + + private static ItemStack getChiselOutput(ItemStack aInput, ItemStack aTarget) { + ItemStack tOutput = null; + if (aTarget != null && canBeMadeFrom(aInput, aTarget)) { + tOutput = aTarget; + } + else if (aTarget != null && !canBeMadeFrom(aInput, aTarget)) { + tOutput = null; + } + else { + tOutput = getItemsForChiseling(aInput).get(0); + } + return tOutput; + } + + private GTPP_Recipe generateChiselRecipe(ItemStack aInput, ItemStack aTarget) { + boolean tIsCached = hasValidCache(aInput, aTarget, true); + if (tIsCached || aInput != null && hasChiselResults(aInput)) { + ItemStack tOutput = tIsCached ? mOutputCache.copy() : getChiselOutput(aInput, aTarget); + if (tOutput != null) { + if (mCachedRecipe != null && GT_Utility.areStacksEqual(aInput, mInputCache) && GT_Utility.areStacksEqual(tOutput, mOutputCache)) { + return mCachedRecipe; + } + // We can chisel this + GTPP_Recipe aRecipe = new GTPP_Recipe( + false, + new ItemStack[] {ItemUtils.getSimpleStack(aInput, 1)}, + new ItemStack[] {ItemUtils.getSimpleStack(tOutput, 1)}, + null, + new int[] {10000}, + new FluidStack[] {}, + new FluidStack[] {}, + 20, + 16, + 0); + + // Cache it + cacheItem(aInput, tOutput, aRecipe); + return aRecipe; + } + } + return null; + } + + public boolean checkRecipe(final ItemStack aStack) { + ArrayList<ItemStack> aItems = this.getStoredInputs(); + if (!aItems.isEmpty()) { + + GT_Recipe tRecipe = generateChiselRecipe(aItems.get(0), this.getGUIItemStack()); + + if (tRecipe == null) { + log("BAD RETURN - 0"); + return false; + } + + // Based on the Processing Array. A bit overkill, but very flexible. + ItemStack[] aItemInputs = aItems.toArray(new ItemStack[aItems.size()]); + FluidStack[] aFluidInputs = new FluidStack[] {}; + + // Reset outputs and progress stats + this.mEUt = 0; + this.mMaxProgresstime = 0; + this.mOutputItems = new ItemStack[]{}; + this.mOutputFluids = new FluidStack[]{}; + + long tVoltage = getMaxInputVoltage(); + byte tTier = (byte) Math.max(1, GT_Utility.getTier(tVoltage)); + long tEnergy = getMaxInputEnergy(); + log("Running checkRecipeGeneric(0)"); + + log("Running checkRecipeGeneric(1)"); + // Remember last recipe - an optimization for findRecipe() + this.mLastRecipe = tRecipe; + + int aMaxParallelRecipes = getMaxParallelRecipes(); + int aEUPercent = getEuDiscountForParallelism(); + int aSpeedBonusPercent = 200; + + aMaxParallelRecipes = this.canBufferOutputs(tRecipe, aMaxParallelRecipes); + if (aMaxParallelRecipes == 0) { + log("BAD RETURN - 2"); + return false; + } + + // EU discount + float tRecipeEUt = (tRecipe.mEUt * aEUPercent) / 100.0f; + float tTotalEUt = 0.0f; + + int parallelRecipes = 0; + + log("parallelRecipes: "+parallelRecipes); + log("aMaxParallelRecipes: "+aMaxParallelRecipes); + log("tTotalEUt: "+tTotalEUt); + log("tVoltage: "+tVoltage); + log("tRecipeEUt: "+tRecipeEUt); + // Count recipes to do in parallel, consuming input items and fluids and considering input voltage limits + for (; parallelRecipes < aMaxParallelRecipes && tTotalEUt < (tEnergy - tRecipeEUt); parallelRecipes++) { + if (!tRecipe.isRecipeInputEqual(true, aFluidInputs, aItemInputs)) { + log("Broke at "+parallelRecipes+"."); + break; + } + log("Bumped EU from "+tTotalEUt+" to "+(tTotalEUt+tRecipeEUt)+"."); + tTotalEUt += tRecipeEUt; + } + + if (parallelRecipes == 0) { + log("BAD RETURN - 3"); + return false; + } + + // -- Try not to fail after this point - inputs have already been consumed! -- + log("parallelRecipes: "+parallelRecipes); + log("aMaxParallelRecipes: "+aMaxParallelRecipes); + log("tTotalEUt: "+tTotalEUt); + log("tVoltage: "+tVoltage); + log("tRecipeEUt: "+tRecipeEUt); + + + // Convert speed bonus to duration multiplier + // e.g. 100% speed bonus = 200% speed = 100%/200% = 50% recipe duration. + aSpeedBonusPercent = Math.max(-99, aSpeedBonusPercent); + float tTimeFactor = 100.0f / (100.0f + aSpeedBonusPercent); + this.mMaxProgresstime = (int)(tRecipe.mDuration * tTimeFactor); + + this.mEUt = (int)Math.ceil(tTotalEUt); + + this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000); + this.mEfficiencyIncrease = 10000; + + // Overclock + if (this.mEUt <= 16) { + this.mEUt = (this.mEUt * (1 << tTier - 1) * (1 << tTier - 1)); + this.mMaxProgresstime = (this.mMaxProgresstime / (1 << tTier - 1)); + } else { + while (this.mEUt <= gregtech.api.enums.GT_Values.V[(tTier - 1)]) { + this.mEUt *= 4; + this.mMaxProgresstime /= 2; + } + } + + if (this.mEUt > 0) { + this.mEUt = (-this.mEUt); + } + + this.mMaxProgresstime = Math.max(1, this.mMaxProgresstime); + + // Collect fluid outputs + FluidStack[] tOutputFluids = new FluidStack[tRecipe.mFluidOutputs.length]; + for (int h = 0; h < tRecipe.mFluidOutputs.length; h++) { + if (tRecipe.getFluidOutput(h) != null) { + tOutputFluids[h] = tRecipe.getFluidOutput(h).copy(); + tOutputFluids[h].amount *= parallelRecipes; + } + } + + // Collect output item types + ItemStack[] tOutputItems = new ItemStack[tRecipe.mOutputs.length]; + for (int h = 0; h < tRecipe.mOutputs.length; h++) { + if (tRecipe.getOutput(h) != null) { + tOutputItems[h] = tRecipe.getOutput(h).copy(); + tOutputItems[h].stackSize = 0; + } + } + + // Set output item stack sizes (taking output chance into account) + for (int f = 0; f < tOutputItems.length; f++) { + if (tRecipe.mOutputs[f] != null && tOutputItems[f] != null) { + for (int g = 0; g < parallelRecipes; g++) { + if (getBaseMetaTileEntity().getRandomNumber(10000) <= tRecipe.getOutputChance(f)) + tOutputItems[f].stackSize += tRecipe.mOutputs[f].stackSize; + } + } + } + + tOutputItems = removeNulls(tOutputItems); + + // Sanitize item stack size, splitting any stacks greater than max stack size + List<ItemStack> splitStacks = new ArrayList<ItemStack>(); + for (ItemStack tItem : tOutputItems) { + while (tItem.getMaxStackSize() < tItem.stackSize) { + ItemStack tmp = tItem.copy(); + tmp.stackSize = tmp.getMaxStackSize(); + tItem.stackSize = tItem.stackSize - tItem.getMaxStackSize(); + splitStacks.add(tmp); + } + } + + if (splitStacks.size() > 0) { + ItemStack[] tmp = new ItemStack[splitStacks.size()]; + tmp = splitStacks.toArray(tmp); + tOutputItems = ArrayUtils.addAll(tOutputItems, tmp); + } + + // Strip empty stacks + List<ItemStack> tSList = new ArrayList<ItemStack>(); + for (ItemStack tS : tOutputItems) { + if (tS.stackSize > 0) tSList.add(tS); + } + tOutputItems = tSList.toArray(new ItemStack[tSList.size()]); + + // Commit outputs + this.mOutputItems = tOutputItems; + this.mOutputFluids = tOutputFluids; + updateSlots(); + + // Play sounds (GT++ addition - GT multiblocks play no sounds) + startProcess(); + + log("GOOD RETURN - 1"); + return true; + } + + return false; + } + + @Override + public int getMaxParallelRecipes() { + return (16 * GT_Utility.getTier(this.getMaxInputVoltage())); + } + + @Override + public int getEuDiscountForParallelism() { + return 75; + } + + private static String sChiselSound = null; + + private static final String getChiselSound() { + if (sChiselSound == null) { + sChiselSound = Carving.chisel.getVariationSound(Blocks.stone, 0); + } + return sChiselSound; + } + + @Override + public String getSound() { + return getChiselSound(); + } + + public int getMaxEfficiency(ItemStack aStack) { + return 10000; + } + + public int getPollutionPerSecond(ItemStack aStack) { + return CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialChisel; + } + + public int getDamageToComponent(ItemStack aStack) { + return 0; + } + + public boolean explodesOnComponentBreak(ItemStack aStack) { + return false; + } + +}
\ No newline at end of file diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCokeOven.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCokeOven.java index d1c766968f..63dd3d62dc 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCokeOven.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCokeOven.java @@ -72,7 +72,7 @@ extends GregtechMeta_MultiBlockBase { .addEnergyHatch("Any Casing", 1) .addMaintenanceHatch("Any Casing", 1) .addMufflerHatch("Any Casing", 1) - .toolTipFinisher("GT++"); + .toolTipFinisher(CORE.GT_Tooltip_Builder); return tt; } @@ -81,7 +81,7 @@ extends GregtechMeta_MultiBlockBase { if (STRUCTURE_DEFINITION == null) { STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_IndustrialCokeOven>builder() .addShape(mName, transpose(new String[][]{ - {"CCC", "C-C", "CCC"}, + {"CCC", "CCC", "CCC"}, {"HHH", "H-H", "HHH"}, {"C~C", "CCC", "CCC"}, })) @@ -146,26 +146,19 @@ extends GregtechMeta_MultiBlockBase { } else { IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBus){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mInputBusses.add((GT_MetaTileEntity_Hatch_InputBus)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mMaintenanceHatches.add((GT_MetaTileEntity_Hatch_Maintenance)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Energy){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mEnergyHatches.add((GT_MetaTileEntity_Hatch_Energy)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_OutputBus) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mOutputBusses.add((GT_MetaTileEntity_Hatch_OutputBus) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Muffler) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mMufflerHatches.add((GT_MetaTileEntity_Hatch_Muffler) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mInputHatches.add((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Output) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mOutputHatches.add((GT_MetaTileEntity_Hatch_Output) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } } return false; diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCuttingMachine.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCuttingMachine.java index 6c025a1177..bf5f8aaeaf 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCuttingMachine.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCuttingMachine.java @@ -71,7 +71,7 @@ extends GregtechMeta_MultiBlockBase { .addEnergyHatch("Any Casing", 1) .addMaintenanceHatch("Any Casing", 1) .addMufflerHatch("Any Casing", 1) - .toolTipFinisher("GT++"); + .toolTipFinisher(CORE.GT_Tooltip_Builder); return tt; } @@ -120,23 +120,17 @@ extends GregtechMeta_MultiBlockBase { } else { IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBus){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mInputBusses.add((GT_MetaTileEntity_Hatch_InputBus)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mMaintenanceHatches.add((GT_MetaTileEntity_Hatch_Maintenance)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Energy){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mEnergyHatches.add((GT_MetaTileEntity_Hatch_Energy)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_OutputBus) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mOutputBusses.add((GT_MetaTileEntity_Hatch_OutputBus) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Muffler) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mMufflerHatches.add((GT_MetaTileEntity_Hatch_Muffler) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mInputHatches.add((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } } return false; diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialDehydrator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialDehydrator.java index 9786cf8ea6..44552ea2f7 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialDehydrator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialDehydrator.java @@ -28,6 +28,7 @@ import gregtech.api.util.GT_Utility; import gregtech.api.util.GTPP_Recipe; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.block.ModBlocks; +import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.PlayerUtils; @@ -89,7 +90,7 @@ public class GregtechMetaTileEntity_IndustrialDehydrator extends GregtechMeta_Mu .addEnergyHatch("Any Casing", 1) .addMaintenanceHatch("Any Casing", 1) .addMufflerHatch("Any Casing", 1) - .toolTipFinisher("GT++"); + .toolTipFinisher(CORE.GT_Tooltip_Builder); return tt; } @@ -147,26 +148,19 @@ public class GregtechMetaTileEntity_IndustrialDehydrator extends GregtechMeta_Mu } else { IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBus){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mInputBusses.add((GT_MetaTileEntity_Hatch_InputBus)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mMaintenanceHatches.add((GT_MetaTileEntity_Hatch_Maintenance)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Energy){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mEnergyHatches.add((GT_MetaTileEntity_Hatch_Energy)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_OutputBus) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mOutputBusses.add((GT_MetaTileEntity_Hatch_OutputBus) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Muffler) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mMufflerHatches.add((GT_MetaTileEntity_Hatch_Muffler) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mInputHatches.add((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Output) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mOutputHatches.add((GT_MetaTileEntity_Hatch_Output) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } } return false; diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialElectrolyzer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialElectrolyzer.java index ebeeb93658..f6613980ca 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialElectrolyzer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialElectrolyzer.java @@ -66,7 +66,7 @@ extends GregtechMeta_MultiBlockBase { .addEnergyHatch("Any Casing", 1) .addMaintenanceHatch("Any Casing", 1) .addMufflerHatch("Any Casing", 1) - .toolTipFinisher("GT++"); + .toolTipFinisher(CORE.GT_Tooltip_Builder); return tt; } @@ -115,26 +115,19 @@ extends GregtechMeta_MultiBlockBase { } else { IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBus){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mInputBusses.add((GT_MetaTileEntity_Hatch_InputBus)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mMaintenanceHatches.add((GT_MetaTileEntity_Hatch_Maintenance)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Energy){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mEnergyHatches.add((GT_MetaTileEntity_Hatch_Energy)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_OutputBus) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mOutputBusses.add((GT_MetaTileEntity_Hatch_OutputBus) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Muffler) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mMufflerHatches.add((GT_MetaTileEntity_Hatch_Muffler) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mInputHatches.add((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Output) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mOutputHatches.add((GT_MetaTileEntity_Hatch_Output) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } } return false; diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialExtruder.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialExtruder.java index 600004a882..a5c7f62578 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialExtruder.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialExtruder.java @@ -72,7 +72,7 @@ extends GregtechMeta_MultiBlockBase { .addEnergyHatch("Any Casing", 1) .addMaintenanceHatch("Any Casing", 1) .addMufflerHatch("Back Center", 2) - .toolTipFinisher("GT++"); + .toolTipFinisher(CORE.GT_Tooltip_Builder); return tt; } @@ -127,20 +127,15 @@ extends GregtechMeta_MultiBlockBase { } else { IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBus){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mInputBusses.add((GT_MetaTileEntity_Hatch_InputBus)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mMaintenanceHatches.add((GT_MetaTileEntity_Hatch_Maintenance)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Energy){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mEnergyHatches.add((GT_MetaTileEntity_Hatch_Energy)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_OutputBus) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mOutputBusses.add((GT_MetaTileEntity_Hatch_OutputBus) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Muffler) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mMufflerHatches.add((GT_MetaTileEntity_Hatch_Muffler) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } } return false; diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMacerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMacerator.java index 73c1587f4f..b6e072b653 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMacerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMacerator.java @@ -67,7 +67,7 @@ extends GregtechMeta_MultiBlockBase { .addMaintenanceHatch("Bottom Casing", 1) .addOutputBus("One per layer except bottom layer", 2) .addMufflerHatch("Any Casing", 2) - .toolTipFinisher("GT++"); + .toolTipFinisher(CORE.GT_Tooltip_Builder); return tt; } @@ -148,14 +148,11 @@ extends GregtechMeta_MultiBlockBase { } else { IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBus){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mInputBusses.add((GT_MetaTileEntity_Hatch_InputBus)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mMaintenanceHatches.add((GT_MetaTileEntity_Hatch_Maintenance)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Energy){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mEnergyHatches.add((GT_MetaTileEntity_Hatch_Energy)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } } return false; @@ -167,11 +164,9 @@ extends GregtechMeta_MultiBlockBase { } else { IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_OutputBus) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mOutputBusses.add((GT_MetaTileEntity_Hatch_OutputBus) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Muffler) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mMufflerHatches.add((GT_MetaTileEntity_Hatch_Muffler) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } } return false; diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMixer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMixer.java index 312a982a11..5e405d426d 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMixer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMixer.java @@ -89,7 +89,7 @@ extends GregtechMeta_MultiBlockBase { .addEnergyHatch("Any Casing", 1) .addMaintenanceHatch("Any Casing", 1) .addMufflerHatch("Any Casing", 1) - .toolTipFinisher("GT++"); + .toolTipFinisher(CORE.GT_Tooltip_Builder); return tt; } @@ -145,26 +145,19 @@ extends GregtechMeta_MultiBlockBase { } else { IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBus){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mInputBusses.add((GT_MetaTileEntity_Hatch_InputBus)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mMaintenanceHatches.add((GT_MetaTileEntity_Hatch_Maintenance)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Energy){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mEnergyHatches.add((GT_MetaTileEntity_Hatch_Energy)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_OutputBus) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mOutputBusses.add((GT_MetaTileEntity_Hatch_OutputBus) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Muffler) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mMufflerHatches.add((GT_MetaTileEntity_Hatch_Muffler) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mInputHatches.add((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Output) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mOutputHatches.add((GT_MetaTileEntity_Hatch_Output) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } } return false; diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java index 232c6ab89f..76fc51b413 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java @@ -23,6 +23,7 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.objects.GT_RenderedTexture; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.block.ModBlocks; +import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.PlayerUtils; @@ -85,7 +86,7 @@ extends GregtechMeta_MultiBlockBase { String[] aBuiltStrings = new String[3]; aBuiltStrings[0] = aToolTipNames[0] + ", " + aToolTipNames[1] + ", " + aToolTipNames[2]; aBuiltStrings[1] = aToolTipNames[3] + ", " + aToolTipNames[4] + ", " + aToolTipNames[5]; - aBuiltStrings[2] = aToolTipNames[6] + ", " + aToolTipNames[7]; + aBuiltStrings[2] = aToolTipNames[6] + ", " + aToolTipNames[7] + ", " + aToolTipNames[8]; GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); tt.addMachineType(getMachineType()) @@ -109,7 +110,7 @@ extends GregtechMeta_MultiBlockBase { .addEnergyHatch("Any Casing", 1) .addMaintenanceHatch("Any Casing", 1) .addMufflerHatch("Any Casing", 1) - .toolTipFinisher("GT++"); + .toolTipFinisher(CORE.GT_Tooltip_Builder); return tt; } @@ -158,26 +159,19 @@ extends GregtechMeta_MultiBlockBase { } else { IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBus){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mInputBusses.add((GT_MetaTileEntity_Hatch_InputBus)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mMaintenanceHatches.add((GT_MetaTileEntity_Hatch_Maintenance)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Energy){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mEnergyHatches.add((GT_MetaTileEntity_Hatch_Energy)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_OutputBus) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mOutputBusses.add((GT_MetaTileEntity_Hatch_OutputBus) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Muffler) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mMufflerHatches.add((GT_MetaTileEntity_Hatch_Muffler) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mInputHatches.add((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Output) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mOutputHatches.add((GT_MetaTileEntity_Hatch_Output) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } } return false; diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialPlatePress.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialPlatePress.java index 02c123c926..007d1a0d0f 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialPlatePress.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialPlatePress.java @@ -72,7 +72,7 @@ public class GregtechMetaTileEntity_IndustrialPlatePress extends GregtechMeta_Mu .addEnergyHatch("Any Casing", 1) .addMaintenanceHatch("Any Casing", 1) .addMufflerHatch("Any Casing", 1) - .toolTipFinisher("GT++"); + .toolTipFinisher(CORE.GT_Tooltip_Builder); return tt; } @@ -121,20 +121,15 @@ public class GregtechMetaTileEntity_IndustrialPlatePress extends GregtechMeta_Mu } else { IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBus){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mInputBusses.add((GT_MetaTileEntity_Hatch_InputBus)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mMaintenanceHatches.add((GT_MetaTileEntity_Hatch_Maintenance)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Energy){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mEnergyHatches.add((GT_MetaTileEntity_Hatch_Energy)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_OutputBus) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mOutputBusses.add((GT_MetaTileEntity_Hatch_OutputBus) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Muffler) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mMufflerHatches.add((GT_MetaTileEntity_Hatch_Muffler) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } } return false; diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialSifter.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialSifter.java index e98ea7b3c7..c5450fec5b 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialSifter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialSifter.java @@ -67,7 +67,7 @@ extends GregtechMeta_MultiBlockBase { .addEnergyHatch("Any Casing", 1) .addMaintenanceHatch("Any Casing", 1) .addMufflerHatch("Any Casing", 1) - .toolTipFinisher("GT++"); + .toolTipFinisher(CORE.GT_Tooltip_Builder); return tt; } @@ -122,20 +122,15 @@ extends GregtechMeta_MultiBlockBase { } else { IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBus){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mInputBusses.add((GT_MetaTileEntity_Hatch_InputBus)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mMaintenanceHatches.add((GT_MetaTileEntity_Hatch_Maintenance)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Energy){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mEnergyHatches.add((GT_MetaTileEntity_Hatch_Energy)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_OutputBus) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mOutputBusses.add((GT_MetaTileEntity_Hatch_OutputBus) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Muffler) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mMufflerHatches.add((GT_MetaTileEntity_Hatch_Muffler) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } } return false; diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialSinter.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialSinter.java index 5a62c6c335..5a62c6c335 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialSinter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialSinter.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialThermalCentrifuge.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialThermalCentrifuge.java index 5f420a3e9e..01b887694a 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialThermalCentrifuge.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialThermalCentrifuge.java @@ -66,7 +66,7 @@ extends GregtechMeta_MultiBlockBase { .addEnergyHatch("Bottom Casing", 1) .addMaintenanceHatch("Bottom Casing", 1) .addMufflerHatch("Bottom Casing", 1) - .toolTipFinisher("GT++"); + .toolTipFinisher(CORE.GT_Tooltip_Builder); return tt; } @@ -137,20 +137,15 @@ extends GregtechMeta_MultiBlockBase { } else { IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBus){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mInputBusses.add((GT_MetaTileEntity_Hatch_InputBus)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mMaintenanceHatches.add((GT_MetaTileEntity_Hatch_Maintenance)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Energy){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mEnergyHatches.add((GT_MetaTileEntity_Hatch_Energy)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_OutputBus) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mOutputBusses.add((GT_MetaTileEntity_Hatch_OutputBus) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Muffler) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mMufflerHatches.add((GT_MetaTileEntity_Hatch_Muffler) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } } return false; diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialVacuumFreezer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialVacuumFreezer.java index f4ab3207eb..1f63995651 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialVacuumFreezer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialVacuumFreezer.java @@ -99,7 +99,7 @@ public class GregtechMetaTileEntity_IndustrialVacuumFreezer extends GregtechMeta .addEnergyHatch("Any Casing", 1) .addMaintenanceHatch("Any Casing", 1) .addMufflerHatch("Any Casing", 1) - .toolTipFinisher("GT++"); + .toolTipFinisher(CORE.GT_Tooltip_Builder); return tt; } @@ -149,30 +149,22 @@ public class GregtechMetaTileEntity_IndustrialVacuumFreezer extends GregtechMeta } else { IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_CustomFluidBase && aMetaTileEntity.getBaseMetaTileEntity().getMetaTileID() == 967) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); mHaveHatch = true; - return this.mInputHatches.add((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBus){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mInputBusses.add((GT_MetaTileEntity_Hatch_InputBus)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mMaintenanceHatches.add((GT_MetaTileEntity_Hatch_Maintenance)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Energy){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mEnergyHatches.add((GT_MetaTileEntity_Hatch_Energy)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_OutputBus) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mOutputBusses.add((GT_MetaTileEntity_Hatch_OutputBus) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Muffler) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mMufflerHatches.add((GT_MetaTileEntity_Hatch_Muffler) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mInputHatches.add((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Output) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mOutputHatches.add((GT_MetaTileEntity_Hatch_Output) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } } return false; diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWashPlant.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWashPlant.java index a8df92a5ab..168d4ff6d6 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWashPlant.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWashPlant.java @@ -80,7 +80,7 @@ extends GregtechMeta_MultiBlockBase { .addEnergyHatch("Any Casing", 1) .addMaintenanceHatch("Any Casing", 1) .addMufflerHatch("Any Casing", 1) - .toolTipFinisher("GT++"); + .toolTipFinisher(CORE.GT_Tooltip_Builder); return tt; } @@ -129,23 +129,17 @@ extends GregtechMeta_MultiBlockBase { } else { IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBus){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mInputBusses.add((GT_MetaTileEntity_Hatch_InputBus)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mMaintenanceHatches.add((GT_MetaTileEntity_Hatch_Maintenance)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Energy){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mEnergyHatches.add((GT_MetaTileEntity_Hatch_Energy)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_OutputBus) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mOutputBusses.add((GT_MetaTileEntity_Hatch_OutputBus) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Muffler) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mMufflerHatches.add((GT_MetaTileEntity_Hatch_Muffler) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mInputHatches.add((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } } return false; diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWireMill.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWireMill.java index b1ecce7670..ccce25d925 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWireMill.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWireMill.java @@ -66,7 +66,7 @@ extends GregtechMeta_MultiBlockBase { .addEnergyHatch("Any Casing", 1) .addMaintenanceHatch("Any Casing", 1) .addMufflerHatch("Any Casing", 1) - .toolTipFinisher("GT++"); + .toolTipFinisher(CORE.GT_Tooltip_Builder); return tt; } @@ -115,20 +115,15 @@ extends GregtechMeta_MultiBlockBase { } else { IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBus){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mInputBusses.add((GT_MetaTileEntity_Hatch_InputBus)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mMaintenanceHatches.add((GT_MetaTileEntity_Hatch_Maintenance)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Energy){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mEnergyHatches.add((GT_MetaTileEntity_Hatch_Energy)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_OutputBus) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mOutputBusses.add((GT_MetaTileEntity_Hatch_OutputBus) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Muffler) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mMufflerHatches.add((GT_MetaTileEntity_Hatch_Muffler) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } } return false; diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IronBlastFurnace.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IronBlastFurnace.java index 5d6904bd46..5d6904bd46 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IronBlastFurnace.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IronBlastFurnace.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IsaMill.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IsaMill.java index cd76749283..59e6e78757 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IsaMill.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IsaMill.java @@ -31,6 +31,7 @@ import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.api.objects.minecraft.BlockPos; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.item.chemistry.general.ItemGenericChemBase; +import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.EntityUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -79,16 +80,19 @@ public class GregtechMetaTileEntity_IsaMill extends GregtechMeta_MultiBlockBase .addInfo("Grind ores.") .addPollutionAmount(getPollutionPerSecond(null)) .addSeparator() - .beginStructureBlock(3, 3, 4, false) + .beginStructureBlock(3, 3, 7, false) .addController("Front Center") .addCasingInfo("IsaMill Exterior Casing", 40) - .addCasingInfo("IsaMill Gearbox", 6) + .addOtherStructurePart("IsaMill Gearbox", "Inner Blocks") + .addOtherStructurePart("IsaMill Piping", "8x, ring around controller") + .addStructureInfo("IsaMill Pipings must not be obstructed in front (only air blocks)") + .addOtherStructurePart("Milling Ball Hatch", "Any Casing") .addInputBus("Any Casing", 1) .addOutputBus("Any Casing", 1) .addEnergyHatch("Any Casing", 1) .addMaintenanceHatch("Any Casing", 1) .addMufflerHatch("Any Casing", 1) - .toolTipFinisher("GT++"); + .toolTipFinisher(CORE.GT_Tooltip_Builder); return tt; } @@ -105,7 +109,7 @@ public class GregtechMetaTileEntity_IsaMill extends GregtechMeta_MultiBlockBase 'C', ofChain( ofHatchAdder( - GregtechMetaTileEntity_IsaMill::addIsaMillList, getCasingTextureIndex(), 1 + GregtechMetaTileEntity_IsaMill::addToMachineList, getCasingTextureIndex(), 1 ), onElementPass( x -> ++x.mCasing, @@ -144,34 +148,6 @@ public class GregtechMetaTileEntity_IsaMill extends GregtechMeta_MultiBlockBase return checkPiece(mName, 1, 1, 0) && mCasing >= 48 - 8 && checkHatch(); } - public final boolean addIsaMillList(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) { - if (aTileEntity == null) { - return false; - } else { - IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_MillingBalls){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return addToMachineListInternal(mMillingBallBuses, aMetaTileEntity, aBaseCasingIndex); - } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBus){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mInputBusses.add((GT_MetaTileEntity_Hatch_InputBus)aMetaTileEntity); - } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mMaintenanceHatches.add((GT_MetaTileEntity_Hatch_Maintenance)aMetaTileEntity); - } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Energy){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mEnergyHatches.add((GT_MetaTileEntity_Hatch_Energy)aMetaTileEntity); - } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_OutputBus) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mOutputBusses.add((GT_MetaTileEntity_Hatch_OutputBus) aMetaTileEntity); - } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Muffler) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mMufflerHatches.add((GT_MetaTileEntity_Hatch_Muffler) aMetaTileEntity); - } - } - return false; - } - public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte aFacing, final byte aColorIndex, final boolean aActive, final boolean aRedstone) { return new ITexture[]{ Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(2)), @@ -345,7 +321,7 @@ public class GregtechMetaTileEntity_IsaMill extends GregtechMeta_MultiBlockBase } public byte getIntakeMeta() { - return 0; + return 1; } public Block getGearboxBlock() { @@ -381,7 +357,7 @@ public class GregtechMetaTileEntity_IsaMill extends GregtechMeta_MultiBlockBase } public int getMaxEfficiency(ItemStack aStack) { - return boostEu ? 20000 : 10000; + return 10000; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_SpargeTower.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_SpargeTower.java new file mode 100644 index 0000000000..81f8ba9edb --- /dev/null +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_SpargeTower.java @@ -0,0 +1,414 @@ +package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing; + +import static com.gtnewhorizon.structurelib.structure.StructureUtility.isAir; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; +import static gregtech.api.util.GT_StructureUtility.ofHatchAdder; + +import java.util.ArrayList; +import java.util.List; + +import com.gtnewhorizon.structurelib.alignment.IAlignmentLimits; +import com.gtnewhorizon.structurelib.structure.IStructureDefinition; +import com.gtnewhorizon.structurelib.structure.StructureDefinition; + +import gregtech.api.enums.Textures; +import gregtech.api.enums.Textures.BlockIcons; +import gregtech.api.gui.GT_GUIContainer_MultiMachine; +import gregtech.api.interfaces.ITexture; +import gregtech.api.interfaces.metatileentity.IMetaTileEntity; +import gregtech.api.interfaces.tileentity.IGregTechTileEntity; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output; +import gregtech.api.render.TextureFactory; +import gregtech.api.util.GTPP_Recipe; +import gregtech.api.util.GTPP_Recipe.GTPP_Recipe_Map; +import gregtech.api.util.GT_Multiblock_Tooltip_Builder; +import gregtech.api.util.GT_Recipe; +import gregtech.api.util.GT_Utility; +import gregtech.api.util.GasSpargingRecipe; +import gregtech.api.util.GasSpargingRecipeMap; +import gtPlusPlus.api.objects.Logger; +import gtPlusPlus.core.block.ModBlocks; +import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.util.math.MathUtils; +import gtPlusPlus.core.util.minecraft.PlayerUtils; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; +import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; + +public class GregtechMetaTileEntity_SpargeTower extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_SpargeTower> { + + protected static final String STRUCTURE_PIECE_BASE = "base"; + protected static final String STRUCTURE_PIECE_LAYER = "layer"; + protected static final String STRUCTURE_PIECE_LAYER_HINT = "layerHint"; + protected static final String STRUCTURE_PIECE_TOP_HINT = "topHint"; + private static final IStructureDefinition<GregtechMetaTileEntity_SpargeTower> STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_SpargeTower>builder() + .addShape(STRUCTURE_PIECE_BASE, transpose(new String[][]{ + {"b~b", "bbb", "bbb"}, + })) + .addShape(STRUCTURE_PIECE_LAYER, transpose(new String[][]{ + {"lll", "lcl", "lll"} + })) + .addShape(STRUCTURE_PIECE_LAYER_HINT, transpose(new String[][]{ + {"lll", "l-l", "lll"} + })) + .addShape(STRUCTURE_PIECE_TOP_HINT, transpose(new String[][]{ + {"lll", "lll", "lll"} + })) + .addElement('b', ofChain( + ofHatchAdder(GregtechMetaTileEntity_SpargeTower::addEnergyInputToMachineList, getCasingIndex(), 1), + ofHatchAdder(GregtechMetaTileEntity_SpargeTower::addInputToMachineList, getCasingIndex(), 1), + ofHatchAdder(GregtechMetaTileEntity_SpargeTower::addMaintenanceToMachineList, getCasingIndex(), 1), + onElementPass(GregtechMetaTileEntity_SpargeTower::onCasingFound, ofBlock(ModBlocks.blockCasings5Misc, 4)) + )) + .addElement('l', ofChain( + ofHatchAdder(GregtechMetaTileEntity_SpargeTower::addEnergyInputToMachineList, getCasingIndex(), 2), + ofHatchAdder(GregtechMetaTileEntity_SpargeTower::addLayerOutputHatch, getCasingIndex(), 2), + ofHatchAdder(GregtechMetaTileEntity_SpargeTower::addMaintenanceToMachineList, getCasingIndex(), 2), + onElementPass(GregtechMetaTileEntity_SpargeTower::onCasingFound, ofBlock(ModBlocks.blockCasings5Misc, 4)) + )) + .addElement('c', ofChain( + onElementPass(t -> t.onTopLayerFound(false), ofHatchAdder(GregtechMetaTileEntity_SpargeTower::addOutputToMachineList, getCasingIndex(), 3)), + onElementPass(t -> t.onTopLayerFound(false), ofHatchAdder(GregtechMetaTileEntity_SpargeTower::addMaintenanceToMachineList, getCasingIndex(), 3)), + onElementPass(t -> t.onTopLayerFound(true), ofBlock(ModBlocks.blockCasings5Misc, 4)), + isAir() + )) + .build(); + + protected final List<List<GT_MetaTileEntity_Hatch_Output>> mOutputHatchesByLayer = new ArrayList<>(); + protected int mHeight; + protected int mCasing; + protected boolean mTopLayerFound; + + public GregtechMetaTileEntity_SpargeTower(int aID, String aName, String aNameRegional) { + super(aID, aName, aNameRegional); + } + + public GregtechMetaTileEntity_SpargeTower(String aName) { + super(aName); + } + + public static int getCasingIndex() { + return 68; + } + + @Override + public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { + return new GregtechMetaTileEntity_SpargeTower(this.mName); + } + + @Override + protected GT_Multiblock_Tooltip_Builder createTooltip() { + final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + tt.addMachineType("Gas Sparge Tower") + .addInfo("Controller block for the Sparging Tower") + .addInfo("Fluids are only put out at the correct height") + .addInfo("The correct height equals the slot number in the NEI recipe") + .addSeparator() + .beginStructureBlock(3, 8, 3, true) + .addController("Front bottom") + .addOtherStructurePart("Sparge Tower Exterior Casing", "45 (minimum)") + .addEnergyHatch("Any casing", 1, 2) + .addMaintenanceHatch("Any casing", 1, 2, 3) + .addInputHatch("2x Input Hatches (Any bottom layer casing)", 1) + .addOutputHatch("6x Output Hatches (At least one per layer except bottom layer)", 2, 3) + .toolTipFinisher(CORE.GT_Tooltip_Builder); + return tt; + } + + @Override + public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) { + if (aSide == aFacing) { + if (aActive) + return new ITexture[]{ + BlockIcons.getCasingTextureForId(getCasingIndex()), + TextureFactory.builder().addIcon(TexturesGtBlock.Overlay_Machine_Controller_Advanced_Active).extFacing().build()}; + return new ITexture[]{ + BlockIcons.getCasingTextureForId(getCasingIndex()), + TextureFactory.builder().addIcon(TexturesGtBlock.Overlay_Machine_Controller_Advanced).extFacing().build()}; + } + return new ITexture[]{Textures.BlockIcons.getCasingTextureForId(getCasingIndex())}; + } + + @Override + public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) { + return new GT_GUIContainer_MultiMachine(aPlayerInventory, aBaseMetaTileEntity, getLocalName(), "DistillationTower.png"); + } + + @Override + public GT_Recipe.GT_Recipe_Map getRecipeMap() { + if (GTPP_Recipe_Map.sSpargeTowerRecipes.mRecipeList.isEmpty()) { + generateRecipes(); + } + return GTPP_Recipe_Map.sSpargeTowerRecipes; + } + + private static boolean generateRecipes() { + for (GasSpargingRecipe aRecipe : GasSpargingRecipeMap.mRecipes) { + GTPP_Recipe newRecipe = new GTPP_Recipe( + false, + new ItemStack[] {}, + new ItemStack[] {}, + null, + null, + aRecipe.mFluidInputs.clone(), + new FluidStack[] {}, + aRecipe.mDuration, + aRecipe.mEUt, + 0); + GTPP_Recipe_Map.sSpargeTowerRecipes.add(newRecipe); + } + if (GTPP_Recipe_Map.sSpargeTowerRecipes.mRecipeList.isEmpty()) { + return false; + } + return true; + } + + @Override + public boolean isCorrectMachinePart(ItemStack aStack) { + return true; + } + + @Override + public boolean checkRecipe(ItemStack aStack) { + ArrayList<FluidStack> tFluidList = getStoredFluids(); + long tVoltage = getMaxInputVoltage(); + byte tTier = (byte) Math.max(0, GT_Utility.getTier(tVoltage)); + FluidStack[] tFluids = tFluidList.toArray(new FluidStack[0]); + if (tFluids.length > 0) { + Logger.INFO("Found "+tFluids.length+" input fluids. Searching "+GTPP_Recipe_Map.sSpargeTowerRecipes.mRecipeList.size()+" recipes."); + GT_Recipe tRecipe = getRecipeMap().findRecipe(getBaseMetaTileEntity(), false, gregtech.api.enums.GT_Values.V[tTier], tFluids); + if (tRecipe != null) { + Logger.INFO("Found recipe!"); + if (tRecipe.isRecipeInputEqual(true, tFluids)) { + Logger.INFO("Found recipe that matches!"); + this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000); + this.mEfficiencyIncrease = 10000; + + // Reset outputs and progress stats + this.mEUt = 0; + this.mProgresstime = 0; + this.mMaxProgresstime = 0; + this.mOutputItems = new ItemStack[]{}; + this.mOutputFluids = new FluidStack[]{}; + this.mLastRecipe = tRecipe; + + calculateOverclockedNessMulti(tRecipe.mEUt, tRecipe.mDuration, 1, tVoltage); + int aDevProgress = this.mMaxProgresstime / 10; + this.mMaxProgresstime = Math.max(1, aDevProgress); + this.mOutputItems = new ItemStack[]{}; + ArrayList<FluidStack> aFluidOutputs = getByproductsOfSparge(tRecipe.mFluidInputs[0], tRecipe.mFluidInputs[1]); + this.mOutputFluids = (FluidStack[]) aFluidOutputs.toArray(new FluidStack[0]); + updateSlots(); + Logger.INFO("Done!"); + return true; + } + } + else { + Logger.INFO("Did not find recipe!"); + } + } + this.mEUt = 0; + this.mEfficiency = 0; + Logger.INFO("Did not find recipe! (2)"); + return false; + } + + private static ArrayList<FluidStack> getByproductsOfSparge(final FluidStack aSpargeGas, final FluidStack aSpentFuel){ + GasSpargingRecipe aSpargeRecipe = GasSpargingRecipeMap.findRecipe(aSpargeGas, aSpentFuel); + ArrayList<FluidStack> aOutputGases = new ArrayList<FluidStack>(); + if (aSpargeRecipe == null) { + Logger.INFO("Did not find sparge recipe!"); + return aOutputGases; + } + int aSpargeGasAmount = aSpargeRecipe.mInputGas.amount; + + aOutputGases.add(aSpargeRecipe.mOutputSpargedFuel.copy()); + ArrayList<FluidStack> aTempMap = new ArrayList<FluidStack>(); + for (int i=2;i<aSpargeRecipe.mFluidOutputs.length;i++) { + int aGasAmount = MathUtils.randInt(0, (aSpargeRecipe.mMaxOutputQuantity[i-2]/100)); + FluidStack aOutput = aSpargeRecipe.mFluidOutputs[i].copy(); + aSpargeGasAmount -= aGasAmount; + FluidStack aSpargeOutput = null; + if (aGasAmount > 0) { + aSpargeOutput = new FluidStack(aOutput.getFluid(), aGasAmount); + } + aTempMap.add(aSpargeOutput); + } + Logger.INFO("Sparge gas left: "+aSpargeGasAmount); + if (aSpargeGasAmount > 0) { + aOutputGases.add(new FluidStack(aSpargeRecipe.mInputGas.getFluid(), aSpargeGasAmount)); + } + //Logger.INFO("Sparge Outputs: "+ItemUtils.getArrayStackNames(aTempMap)); + aOutputGases.addAll(aTempMap); + Logger.INFO("Sparge output size: "+aOutputGases.size()); + //Logger.INFO("Output of sparging: "+ItemUtils.getArrayStackNames(aOutputGases)); + return aOutputGases; + } + + protected void onCasingFound() { + mCasing++; + } + + protected void onTopLayerFound(boolean aIsCasing) { + mTopLayerFound = true; + if (aIsCasing) { + onCasingFound(); + } + } + + protected boolean addLayerOutputHatch(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) { + if (aTileEntity == null || aTileEntity.isDead() || !(aTileEntity.getMetaTileEntity() instanceof GT_MetaTileEntity_Hatch_Output)) { + Logger.INFO("Bad Output Hatch"); + return false; + } + while (mOutputHatchesByLayer.size() < mHeight) { + mOutputHatchesByLayer.add(new ArrayList<>()); + } + GT_MetaTileEntity_Hatch_Output tHatch = (GT_MetaTileEntity_Hatch_Output) aTileEntity.getMetaTileEntity(); + tHatch.updateTexture(aBaseCasingIndex); + boolean addedHatch = mOutputHatchesByLayer.get(mHeight - 1).add(tHatch); + Logger.INFO("Added Hatch: "+addedHatch); + return addedHatch; + } + + @Override + protected IAlignmentLimits getInitialAlignmentLimits() { + // don't rotate a freaking tower, it won't work + return (d, r, f) -> d.offsetY == 0 && r.isNotRotated() && !f.isVerticallyFliped(); + } + + @Override + public IStructureDefinition<GregtechMetaTileEntity_SpargeTower> getStructureDefinition() { + return STRUCTURE_DEFINITION; + } + + @Override + public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) { + // reset + mOutputHatchesByLayer.forEach(List::clear); + mHeight = 1; + mTopLayerFound = false; + mCasing = 0; + + // check base + if (!checkPiece(STRUCTURE_PIECE_BASE, 1, 0, 0)) { + Logger.INFO("Bad Base. Height: "+mHeight); + return false; + } + + // check each layer + while (mHeight < 8 && checkPiece(STRUCTURE_PIECE_LAYER, 1, mHeight, 0) && !mTopLayerFound) { + if (mOutputHatchesByLayer.get(mHeight - 1).isEmpty()) { + // layer without output hatch + Logger.INFO("Height: "+mHeight + " - Missing output on "+(mHeight - 1)); + return false; + } + // not top + mHeight++; + } + + // validate final invariants... + Logger.INFO("Height: "+mHeight); + Logger.INFO("Casings: "+mCasing); + Logger.INFO("Required: "+(7 * mHeight - 5)); + Logger.INFO("Found Top: "+mTopLayerFound); + return mCasing >= 45 && mTopLayerFound && mMaintenanceHatches.size() == 1; + } + + @Override + public int getMaxEfficiency(ItemStack aStack) { + return 10000; + } + + @Override + public int getPollutionPerTick(ItemStack aStack) { + return 0; + } + + @Override + public int getDamageToComponent(ItemStack aStack) { + return 0; + } + + @Override + public boolean explodesOnComponentBreak(ItemStack aStack) { + return false; + } + + @Override + protected void addFluidOutputs(FluidStack[] mOutputFluids2) { + for (int i = 0; i < mOutputFluids2.length && i < mOutputHatchesByLayer.size(); i++) { + FluidStack tStack = mOutputFluids2[i] != null ? mOutputFluids2[i].copy() : null; + if (tStack == null) { + continue; + } + if (!dumpFluid(mOutputHatchesByLayer.get(i), tStack, true)) { + dumpFluid(mOutputHatchesByLayer.get(i), tStack, false); + } + } + } + + @Override + public void construct(ItemStack stackSize, boolean hintsOnly) { + buildPiece(STRUCTURE_PIECE_BASE, stackSize, hintsOnly, 1, 0, 0); + int tTotalHeight = 8; // min 2 output layer, so at least 1 + 2 height + for (int i = 1; i < tTotalHeight - 1; i++) { + buildPiece(STRUCTURE_PIECE_LAYER_HINT, stackSize, hintsOnly, 1, i, 0); + } + buildPiece(STRUCTURE_PIECE_TOP_HINT, stackSize, hintsOnly, 1, tTotalHeight - 1, 0); + } + + @Override + public boolean hasSlotInGUI() { + return false; + } + + @Override + public String getCustomGUIResourceName() { + return null; + } + + @Override + public boolean requiresVanillaGtGUI() { + return true; + } + + @Override + public String getMachineType() { + return "Gas Sparger"; + } + + @Override + public int getMaxParallelRecipes() { + return 1; + } + + @Override + public int getEuDiscountForParallelism() { + return 0; + } + + @Override + public boolean onPlungerRightClick(EntityPlayer aPlayer, byte aSide, float aX, float aY, float aZ) { + int aLayerIndex = 0; + PlayerUtils.messagePlayer(aPlayer, "Trying to clear "+mOutputHatchesByLayer.size()+" layers of output hatches."); + for (List<GT_MetaTileEntity_Hatch_Output> layer : this.mOutputHatchesByLayer) { + int aHatchIndex = 0; + for (GT_MetaTileEntity_Hatch_Output hatch : layer) { + if (hatch.mFluid != null) { + PlayerUtils.messagePlayer(aPlayer, "Clearing "+hatch.mFluid.amount+"L of "+hatch.mFluid.getLocalizedName()+" from hatch "+aHatchIndex+" on layer "+aLayerIndex+"."); + hatch.mFluid = null; + } + aHatchIndex++; + } + aLayerIndex++; + } + return aLayerIndex > 0; + } +} diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_AssemblyLine.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_AssemblyLine.java index 8c9e886e94..8c9e886e94 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_AssemblyLine.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_AssemblyLine.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_DistillationTower.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_DistillationTower.java index 78c72bed69..6d8ca49d7d 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_DistillationTower.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_DistillationTower.java @@ -98,20 +98,15 @@ public class GregtechMetaTileEntity_Adv_DistillationTower extends GregtechMeta_M } else { IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBus){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mInputBusses.add((GT_MetaTileEntity_Hatch_InputBus)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mMaintenanceHatches.add((GT_MetaTileEntity_Hatch_Maintenance)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Energy){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mEnergyHatches.add((GT_MetaTileEntity_Hatch_Energy)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_OutputBus) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mOutputBusses.add((GT_MetaTileEntity_Hatch_OutputBus) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mInputHatches.add((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } } return false; @@ -123,8 +118,7 @@ public class GregtechMetaTileEntity_Adv_DistillationTower extends GregtechMeta_M } else { IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Output){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mOutputHatches.add((GT_MetaTileEntity_Hatch_Output)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } } return false; @@ -136,11 +130,9 @@ public class GregtechMetaTileEntity_Adv_DistillationTower extends GregtechMeta_M } else { IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Output){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mOutputHatches.add((GT_MetaTileEntity_Hatch_Output)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Muffler){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mMufflerHatches.add((GT_MetaTileEntity_Hatch_Muffler)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } } return false; @@ -166,7 +158,7 @@ public class GregtechMetaTileEntity_Adv_DistillationTower extends GregtechMeta_M .addEnergyHatch("Bottom Casing", 1) .addOutputHatch("One per layer except bottom", 2) .addMufflerHatch("Top Center Casing", 3) - .toolTipFinisher("GT++"); + .toolTipFinisher(CORE.GT_Tooltip_Builder); return tt; } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java index 098642978d..ce54aef282 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java @@ -32,6 +32,7 @@ import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.block.ModBlocks; +import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; @@ -106,7 +107,7 @@ public class GregtechMetaTileEntity_Adv_EBF extends GregtechMeta_MultiBlockBase .addEnergyHatch("Any Casing", 1) .addMufflerHatch("Any Casing", 1) .addMaintenanceHatch("Any Casing", 1) - .toolTipFinisher("GT++"); + .toolTipFinisher(CORE.GT_Tooltip_Builder); return tt; } @@ -164,31 +165,23 @@ public class GregtechMetaTileEntity_Adv_EBF extends GregtechMeta_MultiBlockBase } else { IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_CustomFluidBase && aMetaTileEntity.getBaseMetaTileEntity().getMetaTileID() == 968) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); mHaveHatch = true; - return this.mInputHatches.add((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBus){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mInputBusses.add((GT_MetaTileEntity_Hatch_InputBus)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mMaintenanceHatches.add((GT_MetaTileEntity_Hatch_Maintenance)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Energy){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mEnergyHatches.add((GT_MetaTileEntity_Hatch_Energy)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_OutputBus) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mOutputBusses.add((GT_MetaTileEntity_Hatch_OutputBus) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Muffler) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mMufflerHatches.add((GT_MetaTileEntity_Hatch_Muffler) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mInputHatches.add((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Output) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mOutputHatches.add((GT_MetaTileEntity_Hatch_Output) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } } return false; diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Fusion_MK4.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Fusion_MK4.java index 385826d0df..56206f8178 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Fusion_MK4.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Fusion_MK4.java @@ -15,6 +15,7 @@ import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_Multiblock_Tooltip_Builder; import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_FusionComputer; import gtPlusPlus.core.block.ModBlocks; +import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.reflect.ReflectionUtils; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; import net.minecraft.block.Block; @@ -52,7 +53,7 @@ public class GregtechMetaTileEntity_Adv_Fusion_MK4 extends GT_MetaTileEntity_Fus .addInputHatch("2-16, Specified casings", 1) .addOutputHatch("1-16, Specified casings", 3) .addStructureInfo("ALL Hatches must be UHV or better") - .toolTipFinisher("GT++"); + .toolTipFinisher(CORE.GT_Tooltip_Builder); return tt; } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Implosion.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Implosion.java index cece6c9daf..aff614184a 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Implosion.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Implosion.java @@ -69,7 +69,7 @@ extends GregtechMeta_MultiBlockBase { .addEnergyHatch("Any casing", 1) .addMaintenanceHatch("Any casing", 1) .addMufflerHatch("Any casing", 1) - .toolTipFinisher("GT++"); + .toolTipFinisher(CORE.GT_Tooltip_Builder); return tt; } @@ -107,20 +107,15 @@ extends GregtechMeta_MultiBlockBase { } else { IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBus){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mInputBusses.add((GT_MetaTileEntity_Hatch_InputBus)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mMaintenanceHatches.add((GT_MetaTileEntity_Hatch_Maintenance)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Energy){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mEnergyHatches.add((GT_MetaTileEntity_Hatch_Energy)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_OutputBus) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mOutputBusses.add((GT_MetaTileEntity_Hatch_OutputBus) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Muffler) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mMufflerHatches.add((GT_MetaTileEntity_Hatch_Muffler) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } } return false; diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamMacerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamMacerator.java index 6deead6c48..3191f56889 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamMacerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamMacerator.java @@ -15,6 +15,7 @@ import gregtech.api.metatileentity.implementations.*; import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_Multiblock_Tooltip_Builder; import gregtech.api.util.GT_Recipe; +import gtPlusPlus.core.lib.CORE; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Steam_BusInput; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Steam_BusOutput; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GT_MetaTileEntity_Hatch_CustomFluidBase; @@ -71,7 +72,7 @@ public class GregtechMetaTileEntity_SteamMacerator extends GregtechMeta_SteamMul .addStructureHint("Input Bus (Steam)", 1) .addStructureHint("Output Bus (Steam)", 1) .addStructureHint("Steam Hatch", 1) - .toolTipFinisher("GT++"); + .toolTipFinisher(CORE.GT_Tooltip_Builder); return tt; } @@ -109,14 +110,11 @@ public class GregtechMetaTileEntity_SteamMacerator extends GregtechMeta_SteamMul } else { IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_CustomFluidBase && aMetaTileEntity.getBaseMetaTileEntity().getMetaTileID() == 31040){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mSteamInputFluids.add((GT_MetaTileEntity_Hatch_CustomFluidBase)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Steam_BusInput){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mSteamInputs.add((GT_MetaTileEntity_Hatch_Steam_BusInput)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Steam_BusOutput){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mSteamOutputs.add((GT_MetaTileEntity_Hatch_Steam_BusOutput)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } } return false; diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_AutoCrafter.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_AutoCrafter.java index 5e9b9685f4..eae51e5c1d 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_AutoCrafter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_AutoCrafter.java @@ -144,7 +144,7 @@ public class GT4Entity_AutoCrafter extends GregtechMeta_MultiBlockBase { .addEnergyHatch("Any Casing", 1) .addMaintenanceHatch("Any Casing", 1) .addMufflerHatch("Any Casing", 1) - .toolTipFinisher("GT++"); + .toolTipFinisher(CORE.GT_Tooltip_Builder); return tt; } @@ -207,23 +207,17 @@ public class GT4Entity_AutoCrafter extends GregtechMeta_MultiBlockBase { } else { IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBus){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mInputBusses.add((GT_MetaTileEntity_Hatch_InputBus)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mMaintenanceHatches.add((GT_MetaTileEntity_Hatch_Maintenance)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Energy){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mEnergyHatches.add((GT_MetaTileEntity_Hatch_Energy)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_OutputBus) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mOutputBusses.add((GT_MetaTileEntity_Hatch_OutputBus) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Muffler) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mMufflerHatches.add((GT_MetaTileEntity_Hatch_Muffler) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mInputHatches.add((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } } return false; diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_ThermalBoiler.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_ThermalBoiler.java index 991f2b54ed..65474d38ed 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_ThermalBoiler.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_ThermalBoiler.java @@ -222,7 +222,7 @@ extends GregtechMeta_MultiBlockBase .addOutputHatch("Any Casing", 1) .addMaintenanceHatch("Any Casing", 1) .addMufflerHatch("Any Casing", 1) - .toolTipFinisher("GT++"); + .toolTipFinisher(CORE.GT_Tooltip_Builder); return tt; } @@ -280,23 +280,17 @@ extends GregtechMeta_MultiBlockBase } else { IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBus){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mInputBusses.add((GT_MetaTileEntity_Hatch_InputBus)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mMaintenanceHatches.add((GT_MetaTileEntity_Hatch_Maintenance)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_OutputBus) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mOutputBusses.add((GT_MetaTileEntity_Hatch_OutputBus) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Muffler) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mMufflerHatches.add((GT_MetaTileEntity_Hatch_Muffler) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mInputHatches.add((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Output) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mOutputHatches.add((GT_MetaTileEntity_Hatch_Output) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } } return false; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_ElementalDuplicator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_ElementalDuplicator.java new file mode 100644 index 0000000000..326cc01de7 --- /dev/null +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_ElementalDuplicator.java @@ -0,0 +1,744 @@ +package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production; + +import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; +import static gregtech.api.util.GT_StructureUtility.ofHatchAdder; +import static gtPlusPlus.core.util.data.ArrayUtils.removeNulls; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; + +import org.apache.commons.lang3.ArrayUtils; + +import com.gtnewhorizon.structurelib.StructureLibAPI; +import com.gtnewhorizon.structurelib.structure.IStructureDefinition; +import com.gtnewhorizon.structurelib.structure.IStructureElement; +import com.gtnewhorizon.structurelib.structure.StructureDefinition; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import gregtech.api.GregTech_API; +import gregtech.api.enums.Textures; +import gregtech.api.interfaces.ITexture; +import gregtech.api.interfaces.metatileentity.IMetaTileEntity; +import gregtech.api.interfaces.tileentity.IGregTechTileEntity; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_InputBus; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Maintenance; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_OutputBus; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachineBlock; +import gregtech.api.objects.GT_RenderedTexture; +import gregtech.api.util.GTPP_Recipe; +import gregtech.api.util.GT_Multiblock_Tooltip_Builder; +import gregtech.api.util.GT_Recipe; +import gregtech.api.util.GT_Utility; +import gtPlusPlus.api.objects.Logger; +import gtPlusPlus.api.objects.data.AutoMap; +import gtPlusPlus.api.objects.data.Triplet; +import gtPlusPlus.core.item.chemistry.general.ItemGenericChemBase; +import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.recipe.common.CI; +import gtPlusPlus.core.util.math.MathUtils; +import gtPlusPlus.core.util.minecraft.ItemUtils; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_ElementalDataOrbHolder; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; +import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; +import net.minecraft.block.Block; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.FluidStack; + +public class GregtechMTE_ElementalDuplicator extends GregtechMeta_MultiBlockBase { + + private int mSolidCasingTier = 0; + private int mMachineCasingTier = 0; + private int mPipeCasingTier = 0; + private int mCoilTier = 0; + private int checkCoil; + private int[] checkCasing = new int[8]; + private int checkMachine; + private int checkPipe; + private int maxTierOfHatch; + private int mCasing; + private IStructureDefinition<GregtechMTE_ElementalDuplicator> STRUCTURE_DEFINITION = null; + + private ArrayList<GT_MetaTileEntity_Hatch_ElementalDataOrbHolder> mReplicatorDataOrbHatches = new ArrayList<GT_MetaTileEntity_Hatch_ElementalDataOrbHolder>(); + + private static final HashMap<Integer, Triplet<Block, Integer, Integer>> mTieredBlockRegistry = new HashMap<Integer, Triplet<Block, Integer, Integer>>(); + + public GregtechMTE_ElementalDuplicator(final int aID, final String aName, final String aNameRegional) { + super(aID, aName, aNameRegional); + } + + public GregtechMTE_ElementalDuplicator(final String aName) { + super(aName); + } + + public static boolean registerMachineCasingForTier(int aTier, Block aBlock, int aMeta, int aCasingTextureID) { + int aSize = mTieredBlockRegistry.size(); + int aSize2 = aSize; + Triplet<Block, Integer, Integer> aCasingData = new Triplet<Block, Integer, Integer>(aBlock, aMeta, aCasingTextureID); + if (mTieredBlockRegistry.containsKey(aTier)) { + CORE.crash("Tried to register a Machine casing for tier "+aTier+" to the Chemical Plant, however this tier already contains one."); + } + mTieredBlockRegistry.put(aTier, aCasingData); + aSize = mTieredBlockRegistry.size(); + return aSize > aSize2; + } + + private static int getCasingTextureIdForTier(int aTier) { + if (!mTieredBlockRegistry.containsKey(aTier)) { + return 10; + } + int aCasingID = mTieredBlockRegistry.get(aTier).getValue_3(); + //Logger.INFO("Found casing texture ID "+aCasingID+" for tier "+aTier); + return aCasingID; + } + + @Override + public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { + return new GregtechMTE_ElementalDuplicator(this.mName); + } + + @Override + public String getMachineType() { + return "Replicator"; + } + + @Override + protected GT_Multiblock_Tooltip_Builder createTooltip() { + GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + tt.addMachineType(getMachineType()) + .addInfo("Controller Block for the Industrial Replication Machine") + .addInfo("Now replication is less painful") + .addInfo("Please read to user manual for more information on construction & usage") + .addSeparator() + .addController("Bottom Center") + .addStructureHint("Catalyst Housing", 1) + .addInputBus("Bottom Casing", 1) + .addOutputBus("Bottom Casing", 1) + .addInputHatch("Bottom Casing", 1) + .addOutputHatch("Bottom Casing", 1) + .addEnergyHatch("Bottom Casing", 1) + .addMaintenanceHatch("Bottom Casing", 1) + .toolTipFinisher(CORE.GT_Tooltip_Builder); + return tt; + } + + public void setMachineMeta(int meta) { + checkMachine = meta; + } + + public int getMachineMeta() { + return checkMachine; + } + + public void setPipeMeta(int meta) { + checkPipe = meta; + } + + public int getPipeMeta() { + return checkPipe; + } + + public void setCoilMeta(int meta) { + checkCoil = meta; + } + + public int getCoilMeta() { + return checkCoil; + } + + public int coilTier(int meta) { + switch (meta) { + case 0: return 1; + case 1: return 2; + case 2: return 3; + case 3: return 4; + case 4: return 5; + case 5: return 7; + case 6: return 8; + case 7: return 10; + case 8: return 11; + case 9: return 6; + case 10: return 9; + } + return 0; + } + + @Override + public IStructureDefinition<GregtechMTE_ElementalDuplicator> getStructureDefinition() { + if (STRUCTURE_DEFINITION == null) { + STRUCTURE_DEFINITION = StructureDefinition.<GregtechMTE_ElementalDuplicator>builder() + .addShape(mName, transpose(new String[][]{ + {"XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX"}, + {"X X", " MMMMM ", " MHHHM ", " MHHHM ", " MHHHM ", " MMMMM ", "X X"}, + {"X X", " ", " PPP ", " PPP ", " PPP ", " ", "X X"}, + {"X X", " ", " HHH ", " HHH ", " HHH ", " ", "X X"}, + {"X X", " ", " PPP ", " PPP ", " PPP ", " ", "X X"}, + {"X X", " MMMMM ", " MHHHM ", " MHHHM ", " MHHHM ", " MMMMM ", "X X"}, + {"CCC~CCC", "CMMMMMC", "CMMMMMC", "CMMMMMC", "CMMMMMC", "CMMMMMC", "CCCCCCC"}, + })) + .addElement( + 'C', + ofChain( + ofHatchAdder( + GregtechMTE_ElementalDuplicator::addChemicalPlantList, getCasingTextureID(), 1 + ), + onElementPass( + x -> {++x.checkCasing[0]; ++x.mCasing;}, + ofSolidCasing(0) + ), + onElementPass( + x -> {++x.checkCasing[1]; ++x.mCasing;}, + ofSolidCasing(1) + ), + onElementPass( + x -> {++x.checkCasing[2]; ++x.mCasing;}, + ofSolidCasing(2) + ), + onElementPass( + x -> {++x.checkCasing[3]; ++x.mCasing;}, + ofSolidCasing(3) + ), + onElementPass( + x -> {++x.checkCasing[4]; ++x.mCasing;}, + ofSolidCasing(4) + ), + onElementPass( + x -> {++x.checkCasing[5]; ++x.mCasing;}, + ofSolidCasing(5) + ), + onElementPass( + x -> {++x.checkCasing[6]; ++x.mCasing;}, + ofSolidCasing(6) + ), + onElementPass( + x -> {++x.checkCasing[7]; ++x.mCasing;}, + ofSolidCasing(7) + ) + ) + ) + .addElement( + 'X', + ofChain( + onElementPass( + x -> {++x.checkCasing[0]; ++x.mCasing;}, + ofSolidCasing(0) + ), + onElementPass( + x -> {++x.checkCasing[1]; ++x.mCasing;}, + ofSolidCasing(1) + ), + onElementPass( + x -> {++x.checkCasing[2]; ++x.mCasing;}, + ofSolidCasing(2) + ), + onElementPass( + x -> {++x.checkCasing[3]; ++x.mCasing;}, + ofSolidCasing(3) + ), + onElementPass( + x -> {++x.checkCasing[4]; ++x.mCasing;}, + ofSolidCasing(4) + ), + onElementPass( + x -> {++x.checkCasing[5]; ++x.mCasing;}, + ofSolidCasing(5) + ), + onElementPass( + x -> {++x.checkCasing[6]; ++x.mCasing;}, + ofSolidCasing(6) + ), + onElementPass( + x -> {++x.checkCasing[7]; ++x.mCasing;}, + ofSolidCasing(7) + ) + ) + ) + .addElement( + 'M', + addTieredBlock( + GregTech_API.sBlockCasings1, GregtechMTE_ElementalDuplicator::setMachineMeta, GregtechMTE_ElementalDuplicator::getMachineMeta, 10 + ) + ) + .addElement( + 'H', + addTieredBlock( + GregTech_API.sBlockCasings5, GregtechMTE_ElementalDuplicator::setCoilMeta, GregtechMTE_ElementalDuplicator::getCoilMeta, 11 + ) + ) + .addElement( + 'P', + addTieredBlock( + GregTech_API.sBlockCasings2, GregtechMTE_ElementalDuplicator::setPipeMeta, GregtechMTE_ElementalDuplicator::getPipeMeta, 12, 16 + ) + ) + .build(); + } + return STRUCTURE_DEFINITION; + } + + public static <T> IStructureElement<T> ofSolidCasing(int aIndex) { + return new IStructureElement<T>() { + @Override + public boolean check(T t, World world, int x, int y, int z) { + Block block = world.getBlock(x, y, z); + int meta = world.getBlockMetadata(x, y, z); + Block target = mTieredBlockRegistry.get(aIndex).getValue_1(); + int targetMeta = mTieredBlockRegistry.get(aIndex).getValue_2(); + return target.equals(block) && meta == targetMeta; + } + + int getIndex(int size) { + if (size > 8) size = 8; + return size - 1; + } + + @Override + public boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigger) { + StructureLibAPI.hintParticle(world, x, y, z, mTieredBlockRegistry.get(getIndex(trigger.stackSize)).getValue_1(), mTieredBlockRegistry.get(getIndex(trigger.stackSize)).getValue_2()); + return true; + } + + @Override + public boolean placeBlock(T t, World world, int x, int y, int z, ItemStack trigger) { + return world.setBlock(x, y, z, mTieredBlockRegistry.get(getIndex(trigger.stackSize)).getValue_1(), mTieredBlockRegistry.get(getIndex(trigger.stackSize)).getValue_2(), 3); + } + }; + } + + @Override + public void construct(ItemStack stackSize, boolean hintsOnly) { + buildPiece(mName , stackSize, hintsOnly, 3, 6, 0); + } + + @Override + public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) { + mCasing = 0; + for (int i = 0; i < 8; i++) { + checkCasing[i] = 0; + } + checkCoil = 0; + checkPipe = 0; + checkMachine = 0; + mSolidCasingTier = 0; + mMachineCasingTier = 0; + mPipeCasingTier = 0; + mCoilTier = 0; + mReplicatorDataOrbHatches.clear(); + if (checkPiece(mName, 3, 6, 0) && mCasing >= 80) { + for (int i = 0; i < 8; i++) { + if (checkCasing[i] == mCasing) { + mSolidCasingTier = i; + } + else if (checkCasing[i] > 0) + return false; + } + mMachineCasingTier = checkMachine - 1; + mPipeCasingTier = checkPipe - 12; + mCoilTier = coilTier(checkCoil - 1); + updateHatchTexture(); + return mMachineCasingTier >= maxTierOfHatch; + } + return false; + } + + public void updateHatchTexture() { + for (GT_MetaTileEntity_Hatch h : mReplicatorDataOrbHatches) h.updateTexture(getCasingTextureID()); + for (GT_MetaTileEntity_Hatch h : mInputBusses) h.updateTexture(getCasingTextureID()); + for (GT_MetaTileEntity_Hatch h : mMaintenanceHatches) h.updateTexture(getCasingTextureID()); + for (GT_MetaTileEntity_Hatch h : mEnergyHatches) h.updateTexture(getCasingTextureID()); + for (GT_MetaTileEntity_Hatch h : mOutputBusses) h.updateTexture(getCasingTextureID()); + for (GT_MetaTileEntity_Hatch h : mInputHatches) h.updateTexture(getCasingTextureID()); + for (GT_MetaTileEntity_Hatch h : mOutputHatches) h.updateTexture(getCasingTextureID()); + } + + public final boolean addChemicalPlantList(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) { + if (aTileEntity == null) { + return false; + } else { + IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); + if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_ElementalDataOrbHolder){ + return addToMachineList(aTileEntity, aBaseCasingIndex); + } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBus){ + maxTierOfHatch = Math.max(maxTierOfHatch, ((GT_MetaTileEntity_Hatch_InputBus) aMetaTileEntity).mTier); + return addToMachineList(aTileEntity, aBaseCasingIndex); + } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance){ + return addToMachineList(aTileEntity, aBaseCasingIndex); + } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Energy){ + maxTierOfHatch = Math.max(maxTierOfHatch, ((GT_MetaTileEntity_Hatch_Energy) aMetaTileEntity).mTier); + return addToMachineList(aTileEntity, aBaseCasingIndex); + } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_OutputBus) { + maxTierOfHatch = Math.max(maxTierOfHatch, ((GT_MetaTileEntity_Hatch_OutputBus) aMetaTileEntity).mTier); + return addToMachineList(aTileEntity, aBaseCasingIndex); + } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input) { + maxTierOfHatch = Math.max(maxTierOfHatch, ((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity).mTier); + return addToMachineList(aTileEntity, aBaseCasingIndex); + } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Output) { + maxTierOfHatch = Math.max(maxTierOfHatch, ((GT_MetaTileEntity_Hatch_Output) aMetaTileEntity).mTier); + return addToMachineList(aTileEntity, aBaseCasingIndex); + } + } + return false; + } + + @Override + public String getSound() { + return GregTech_API.sSoundList.get(Integer.valueOf(207)); + } + + @Override + public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte aFacing, final byte aColorIndex, final boolean aActive, final boolean aRedstone) { + + ITexture aOriginalTexture; + + // Check things exist client side (The worst code ever) + if (aBaseMetaTileEntity.getWorld() != null) { + + } + int aCasingID = getCasingTextureID(); + aOriginalTexture = Textures.BlockIcons.getCasingTextureForId(aCasingID); + + if (aSide == aFacing) { + return new ITexture[]{aOriginalTexture, new GT_RenderedTexture(aActive ? TexturesGtBlock.Overlay_Machine_Controller_Advanced_Active : TexturesGtBlock.Overlay_Machine_Controller_Advanced)}; + } + return new ITexture[]{aOriginalTexture}; + } + + @Override + public boolean hasSlotInGUI() { + return true; + } + + @Override + public GT_Recipe.GT_Recipe_Map getRecipeMap() { + if (GTPP_Recipe.GTPP_Recipe_Map.sChemicalPlant_GT.mRecipeList.size() == 0) { + generateRecipes(); + } + return GTPP_Recipe.GTPP_Recipe_Map.sChemicalPlant_GT; + } + + public static void generateRecipes() { + for (GT_Recipe i : GTPP_Recipe.GTPP_Recipe_Map.sChemicalPlantRecipes.mRecipeList) { + GTPP_Recipe.GTPP_Recipe_Map.sChemicalPlant_GT.add(i); + } + } + + @Override + public int getMaxParallelRecipes() { + return 2 * getPipeCasingTier(); + } + + @Override + public int getEuDiscountForParallelism() { + return 100; + } + + private int getSolidCasingTier() { + return this.mSolidCasingTier; + } + + private int getMachineCasingTier() { + return mMachineCasingTier; + } + + private int getPipeCasingTier() { + return mPipeCasingTier; + } + + private int getCasingTextureID() { + // Check the Tier Client Side + int aTier = mSolidCasingTier; + int aCasingID = getCasingTextureIdForTier(aTier); + return aCasingID; + } + + public boolean addToMachineList(IGregTechTileEntity aTileEntity) { + int aMaxTier = getMachineCasingTier(); + final IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); + if (aMetaTileEntity instanceof GT_MetaTileEntity_TieredMachineBlock) { + GT_MetaTileEntity_TieredMachineBlock aMachineBlock = (GT_MetaTileEntity_TieredMachineBlock) aMetaTileEntity; + int aTileTier = aMachineBlock.mTier; + if (aTileTier > aMaxTier) { + log("Hatch tier too high."); + return false; + } + else { + return addToMachineList(aTileEntity, getCasingTextureID()); + } + } + else { + log("Bad Tile Entity being added to hatch map."); // Shouldn't ever happen, but.. ya know.. + return false; + } + } + + @Override + public void saveNBTData(NBTTagCompound aNBT) { + super.saveNBTData(aNBT); + aNBT.setInteger("mSolidCasingTier", this.mSolidCasingTier); + aNBT.setInteger("mMachineCasingTier", this.mMachineCasingTier); + aNBT.setInteger("mPipeCasingTier", this.mPipeCasingTier); + aNBT.setInteger("mCoilTier", this.mCoilTier); + } + + @Override + public void loadNBTData(NBTTagCompound aNBT) { + super.loadNBTData(aNBT); + mSolidCasingTier = aNBT.getInteger("mSolidCasingTier"); + mMachineCasingTier = aNBT.getInteger("mMachineCasingTier"); + mPipeCasingTier = aNBT.getInteger("mPipeCasingTier"); + mCoilTier = aNBT.getInteger("mCoilTier"); + } + + @Override + public boolean addToMachineList(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) { + final IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); + if (aMetaTileEntity == null) { + return false; + } + if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_ElementalDataOrbHolder) { + log("Found GT_MetaTileEntity_Hatch_ElementalDataOrbHolder"); + ((GT_MetaTileEntity_Hatch_ElementalDataOrbHolder) aTileEntity).mRecipeMap = getRecipeMap(); + return addToMachineListInternal(mReplicatorDataOrbHatches, aMetaTileEntity, aBaseCasingIndex); + } + return super.addToMachineList(aTileEntity, aBaseCasingIndex); + } + + @Override + public int getMaxEfficiency(final ItemStack aStack) { + return 10000; + } + + @Override + public int getPollutionPerTick(final ItemStack aStack) { + return 100; + } + + @Override + public int getAmountOfOutputs() { + return 1; + } + + @Override + public boolean explodesOnComponentBreak(final ItemStack aStack) { + return false; + } + + @Override + public String getCustomGUIResourceName() { + return null; + } + + // Same speed bonus as pyro oven + public int getSpeedBonus() { + return 50 * (this.mCoilTier - 2); + } + + @Override + public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { + if (aBaseMetaTileEntity.isServerSide()) { + if (this.mUpdate == 1 || this.mStartUpCheck == 1) { + this.mReplicatorDataOrbHatches.clear(); + } + } + super.onPostTick(aBaseMetaTileEntity, aTick); + } + + @Override + public void onPreTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { + super.onPreTick(aBaseMetaTileEntity, aTick); + } + + @Override + public boolean checkRecipe(final ItemStack aStack) { + return checkRecipeGeneric(getMaxParallelRecipes(), getEuDiscountForParallelism(), getSpeedBonus()); + } + + + @Override + public boolean checkRecipeGeneric( + ItemStack[] aItemInputs, FluidStack[] aFluidInputs, + int aMaxParallelRecipes, int aEUPercent, + int aSpeedBonusPercent, int aOutputChanceRoll, GT_Recipe aRecipe, boolean isOC) { + return false; + } + + private static final HashMap<Long, AutoMap<GT_Recipe>> mTieredRecipeMap = new HashMap<Long, AutoMap<GT_Recipe>>(); + private static final AutoMap<GT_Recipe> aTier0Recipes = new AutoMap<GT_Recipe>(); + private static final AutoMap<GT_Recipe> aTier1Recipes = new AutoMap<GT_Recipe>(); + private static final AutoMap<GT_Recipe> aTier2Recipes = new AutoMap<GT_Recipe>(); + private static final AutoMap<GT_Recipe> aTier3Recipes = new AutoMap<GT_Recipe>(); + private static final AutoMap<GT_Recipe> aTier4Recipes = new AutoMap<GT_Recipe>(); + private static final AutoMap<GT_Recipe> aTier5Recipes = new AutoMap<GT_Recipe>(); + private static final AutoMap<GT_Recipe> aTier6Recipes = new AutoMap<GT_Recipe>(); + private static final AutoMap<GT_Recipe> aTier7Recipes = new AutoMap<GT_Recipe>(); + private static boolean mInitRecipeCache = false; + + private static void initRecipeCaches() { + if (!mInitRecipeCache) { + mTieredRecipeMap.put((long) 0, aTier0Recipes); + mTieredRecipeMap.put((long) 1, aTier1Recipes); + mTieredRecipeMap.put((long) 2, aTier2Recipes); + mTieredRecipeMap.put((long) 3, aTier3Recipes); + mTieredRecipeMap.put((long) 4, aTier4Recipes); + mTieredRecipeMap.put((long) 5, aTier5Recipes); + mTieredRecipeMap.put((long) 6, aTier6Recipes); + mTieredRecipeMap.put((long) 7, aTier7Recipes); + for (GT_Recipe aRecipe : GTPP_Recipe.GTPP_Recipe_Map.sChemicalPlant_GT.mRecipeList) { + if (aRecipe != null) { + switch (aRecipe.mSpecialValue) { + case 0: + aTier0Recipes.add(aRecipe); + continue; + case 1: + aTier1Recipes.add(aRecipe); + continue; + case 2: + aTier2Recipes.add(aRecipe); + continue; + case 3: + aTier3Recipes.add(aRecipe); + continue; + case 4: + aTier4Recipes.add(aRecipe); + continue; + case 5: + aTier5Recipes.add(aRecipe); + continue; + case 6: + aTier6Recipes.add(aRecipe); + continue; + case 7: + aTier7Recipes.add(aRecipe); + continue; + } + } + } + mInitRecipeCache = true; + } + } + + private static boolean areInputsEqual(GT_Recipe aComparator, ItemStack[] aInputs, FluidStack[] aFluids) { + int aInputCount = aComparator.mInputs.length; + if (aInputCount > 0) { + //Logger.INFO("Looking for recipe with "+aInputCount+" Items"); + int aMatchingInputs = 0; + recipe : for (ItemStack a : aComparator.mInputs) { + for (ItemStack b : aInputs) { + if (a.getItem() == b.getItem()) { + if (a.getItemDamage() == b.getItemDamage()) { + //Logger.INFO("Found matching Item Input - "+b.getUnlocalizedName()); + aMatchingInputs++; + continue recipe; + } + } + } + } + if (aMatchingInputs != aInputCount) { + return false; + } + } + int aFluidInputCount = aComparator.mFluidInputs.length; + if (aFluidInputCount > 0) { + //Logger.INFO("Looking for recipe with "+aFluidInputCount+" Fluids"); + int aMatchingFluidInputs = 0; + recipe : for (FluidStack b : aComparator.mFluidInputs) { + //Logger.INFO("Checking for fluid "+b.getLocalizedName()); + for (FluidStack a : aFluids) { + if (GT_Utility.areFluidsEqual(a, b)) { + //Logger.INFO("Found matching Fluid Input - "+b.getLocalizedName()); + aMatchingFluidInputs++; + continue recipe; + } + else { + //Logger.INFO("Found fluid which did not match - "+a.getLocalizedName()); + } + } + } + if (aMatchingFluidInputs != aFluidInputCount) { + return false; + } + } + Logger.INFO("Recipes Match!"); + return true; + } + + public GT_Recipe findRecipe(final GT_Recipe aRecipe, final long aVoltage, final long aSpecialValue, ItemStack[] aInputs, final FluidStack[] aFluids) { + if (!mInitRecipeCache) { + initRecipeCaches(); + } + if (this.getRecipeMap().mRecipeList.isEmpty()) { + log("No Recipes in Map to search through."); + return null; + } + else { + log("Checking tier "+aSpecialValue+" recipes and below. Using Input Voltage of "+aVoltage+"V."); + log("We have "+aInputs.length+" Items and "+aFluids.length+" Fluids."); + // Try check the cached recipe first + if (aRecipe != null) { + if (areInputsEqual(aRecipe, aInputs, aFluids)) { + if (aRecipe.mEUt <= aVoltage) { + Logger.INFO("Using cached recipe."); + return aRecipe; + } + } + } + + // Get all recipes for the tier + AutoMap<AutoMap<GT_Recipe>> aMasterMap = new AutoMap<AutoMap<GT_Recipe>>(); + for (long i=0;i<=aSpecialValue;i++) { + aMasterMap.add(mTieredRecipeMap.get(i)); + } + GT_Recipe aFoundRecipe = null; + + // Iterate the tiers recipes until we find the one with all inputs matching + master : for (AutoMap<GT_Recipe> aTieredMap : aMasterMap) { + for (GT_Recipe aRecipeToCheck : aTieredMap) { + if (areInputsEqual(aRecipeToCheck, aInputs, aFluids)) { + log("Found recipe with matching inputs!"); + if (aRecipeToCheck.mSpecialValue <= aSpecialValue) { + if (aRecipeToCheck.mEUt <= aVoltage) { + aFoundRecipe = aRecipeToCheck; + break master; + } + } + } + } + } + + // If we found a recipe, return it + if (aFoundRecipe != null) { + log("Found valid recipe."); + return aFoundRecipe; + } + } + log("Did not find valid recipe."); + return null; + } + + /* + * Catalyst Handling + */ + + @Override + public ArrayList<ItemStack> getStoredInputs() { + ArrayList<ItemStack> tItems = super.getStoredInputs(); + for (GT_MetaTileEntity_Hatch_ElementalDataOrbHolder tHatch : mReplicatorDataOrbHatches) { + tHatch.mRecipeMap = getRecipeMap(); + if (isValidMetaTileEntity(tHatch)) { + tItems.addAll(tHatch.getInventory()); + } + } + return tItems; + } + +} diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_FastNeutronReactor.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_FastNeutronReactor.java index 3941d59edb..3941d59edb 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_FastNeutronReactor.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_FastNeutronReactor.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_FrothFlotationCell.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_FrothFlotationCell.java index 8f4fb2f706..8a936525f0 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_FrothFlotationCell.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_FrothFlotationCell.java @@ -26,6 +26,7 @@ import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; import gregtech.api.util.GTPP_Recipe; import gtPlusPlus.core.block.ModBlocks; +import gtPlusPlus.core.lib.CORE; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; import gtPlusPlus.xmod.gregtech.common.helpers.FlotationRecipeHandler; @@ -72,7 +73,7 @@ public class GregtechMTE_FrothFlotationCell extends GregtechMeta_MultiBlockBase .addOutputHatch("Bottom Casing", 1) .addEnergyHatch("Bottom Casing", 1) .addMaintenanceHatch("Bottom Casing", 1) - .toolTipFinisher("GT++"); + .toolTipFinisher(CORE.GT_Tooltip_Builder); return tt; } @@ -173,20 +174,15 @@ public class GregtechMTE_FrothFlotationCell extends GregtechMeta_MultiBlockBase } else { IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBus){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mInputBusses.add((GT_MetaTileEntity_Hatch_InputBus)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mMaintenanceHatches.add((GT_MetaTileEntity_Hatch_Maintenance)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Energy){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mEnergyHatches.add((GT_MetaTileEntity_Hatch_Energy)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mInputHatches.add((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Output) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mOutputHatches.add((GT_MetaTileEntity_Hatch_Output) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } } return false; diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_LargeNaqReactor.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_LargeNaqReactor.java index 1ead7edad5..1ead7edad5 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_LargeNaqReactor.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_LargeNaqReactor.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_MiniFusionPlant.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_MiniFusionPlant.java index 9c2e3289c3..9c2e3289c3 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_MiniFusionPlant.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_MiniFusionPlant.java diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java new file mode 100644 index 0000000000..1f6ae41be2 --- /dev/null +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java @@ -0,0 +1,523 @@ +package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production; + +import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; +import static gregtech.api.util.GT_StructureUtility.ofHatchAdder; + +import java.util.Collection; + +import com.gtnewhorizon.structurelib.structure.IStructureDefinition; +import com.gtnewhorizon.structurelib.structure.StructureDefinition; + +import gregtech.api.enums.TAE; +import gregtech.api.enums.Textures; +import gregtech.api.interfaces.ITexture; +import gregtech.api.interfaces.metatileentity.IMetaTileEntity; +import gregtech.api.interfaces.tileentity.IGregTechTileEntity; +import gregtech.api.metatileentity.MetaTileEntity; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Dynamo; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Maintenance; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Muffler; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output; +import gregtech.api.objects.GT_ItemStack; +import gregtech.api.objects.GT_RenderedTexture; +import gregtech.api.util.GTPP_Recipe.GTPP_Recipe_Map; +import gregtech.api.util.GT_Multiblock_Tooltip_Builder; +import gregtech.api.util.GT_Recipe; +import gregtech.api.util.GT_Recipe.GT_Recipe_Map; +import gtPlusPlus.api.objects.Logger; +import gtPlusPlus.core.block.ModBlocks; +import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.material.ELEMENT; +import gtPlusPlus.core.material.nuclear.NUCLIDE; +import gtPlusPlus.core.util.math.MathUtils; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.fluids.FluidStack; + +public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase<GregtechMTE_NuclearReactor> { + + protected int mFuelRemaining = 0; + + private int mCasing; + private IStructureDefinition<GregtechMTE_NuclearReactor> STRUCTURE_DEFINITION = null; + + + public GregtechMTE_NuclearReactor(final int aID, final String aName, final String aNameRegional) { + super(aID, aName, aNameRegional); + } + + public GregtechMTE_NuclearReactor(final String aName) { + super(aName); + } + + @Override + public long maxEUStore() { + return (640000000L * (Math.min(16, this.mEnergyHatches.size()))) / 16L; + } + + @Override + public String getMachineType() { + return "Reactor"; + } + + @Override + public GT_Recipe_Map getRecipeMap() { + return GTPP_Recipe_Map.sLiquidFluorineThoriumReactorRecipes; + } + + @Override + protected GT_Multiblock_Tooltip_Builder createTooltip() { + GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + tt.addMachineType(getMachineType()) + .addInfo("Controller Block for the Liquid Fluoride Thorium Reactor.") + .addInfo("Produces Heat & Energy from Radioactive Beta Decay.") + .addInfo("Outputs U233 every 10 seconds, on average") + .addInfo("Input Fluorine and Helium for bonus byproducts") + .addInfo("Input Li2BeF4 and a molten salt as fuel.") + .addInfo("LiFBeF2ThF4UF4, LiFBeF2ZrF4UF4 or LiFBeF2ZrF4U235") + .addPollutionAmount(getPollutionPerSecond(null)) + .addSeparator() + .beginStructureBlock(7, 4, 7, true) + .addController("Bottom Center") + .addCasingInfo("Hastelloy-N Reactor Casing", 27) + .addCasingInfo("Zeron-100 Reactor Shielding", 26) + .addInputHatch("Top or bottom layer edges", 1) + .addOutputHatch("Top or bottom layer edges", 1) + .addDynamoHatch("Top or bottom layer edges", 1) + .addMaintenanceHatch("Top or bottom layer edges", 1) + .addMufflerHatch("Top 3x3", 2) + .addStructureInfo("All dynamos must be IV or LuV tier.") + .addStructureInfo("All other hatches must be IV+ tier.") + .addStructureInfo("3x Output Hatches, 2x Input Hatches, 4x Dynamo Hatches") + .addStructureInfo("2x Maintenance Hatches, 4x Mufflers") + .toolTipFinisher(CORE.GT_Tooltip_Builder); + return tt; + } + + @Override + public String[] getExtraInfoData() { + final String tRunning = (this.mMaxProgresstime>0 ? "Reactor running":"Reactor stopped"); + final String tMaintainance = (this.getIdealStatus() == this.getRepairStatus() ? "No Maintainance issues" : "Needs Maintainance"); + + return new String[]{ + "Liquid Fluoride Thorium Reactor", + tRunning, + tMaintainance, + "Current Output: "+this.mEUt+" EU/t", + "Fuel Remaining: "+this.mFuelRemaining+" Litres", + "Current Efficiency: "+(this.mEfficiency/5)+"%", + "Current Efficiency (Raw): "+(this.mEfficiency), + "It requires you to have 100% Efficiency."}; + } + + @Override + public boolean allowCoverOnSide(final byte aSide, final GT_ItemStack aStack) { + return aSide != this.getBaseMetaTileEntity().getFrontFacing(); + } + + @Override + public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte aFacing, final byte aColorIndex, final boolean aActive, final boolean aRedstone) { + boolean aWarmedUp = this.mEfficiency == this.getMaxEfficiency(null); + if (!aBaseMetaTileEntity.isActive() || !aWarmedUp){ + if (aSide == aFacing) { + return new ITexture[]{Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(12)), + new GT_RenderedTexture(aActive ? Textures.BlockIcons.OVERLAY_FRONT_REPLICATOR_ACTIVE : Textures.BlockIcons.OVERLAY_FRONT_REPLICATOR)}; + } + return new ITexture[]{Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(12))}; + } + else if(aBaseMetaTileEntity.isActive() && aWarmedUp){ + if (aSide == aFacing) { + return new ITexture[]{Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(13)), + new GT_RenderedTexture(aActive ? Textures.BlockIcons.OVERLAY_FRONT_REPLICATOR_ACTIVE : Textures.BlockIcons.OVERLAY_FRONT_REPLICATOR)}; + } + return new ITexture[]{Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(13))}; + } + return new ITexture[]{Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(12))}; + + } + + @Override + public boolean hasSlotInGUI() { + return false; + } + + @Override + public String getCustomGUIResourceName() { + return "MatterFabricator"; + } + + public final boolean addNuclearReactorEdgeList(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) { + if (aTileEntity == null) { + return false; + } else { + IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); + if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance){ + return addToMachineList(aTileEntity, aBaseCasingIndex); + } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Dynamo && (((GT_MetaTileEntity_Hatch_Dynamo) aMetaTileEntity).mTier >= 5 && ((GT_MetaTileEntity_Hatch_Dynamo) aMetaTileEntity).mTier <= 6)){ + return addToMachineList(aTileEntity, aBaseCasingIndex); + } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input && ((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity).mTier >= 5) { + return addToMachineList(aTileEntity, aBaseCasingIndex); + } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Output && ((GT_MetaTileEntity_Hatch_Output) aMetaTileEntity).mTier >= 5) { + return addToMachineList(aTileEntity, aBaseCasingIndex); + } + } + return false; + } + + public final boolean addNuclearReactorTopList(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) { + if (aTileEntity == null) { + return false; + } else { + IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); + if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Muffler && ((GT_MetaTileEntity_Hatch_Muffler) aMetaTileEntity).mTier >= 5) { + return addToMachineList(aTileEntity, aBaseCasingIndex); + } + } + return false; + } + + @Override + public IStructureDefinition<GregtechMTE_NuclearReactor> getStructureDefinition() { + if (STRUCTURE_DEFINITION == null) { + STRUCTURE_DEFINITION = StructureDefinition.<GregtechMTE_NuclearReactor>builder() + .addShape(mName, transpose(new String[][]{ + {"CCCCCCC", "COOOOOC", "COXXXOC", "COXXXOC", "COXXXOC", "COOOOOC", "CCCCCCC"}, + {"GGGGGGG", "G-----G", "G-----G", "G-----G", "G-----G", "G-----G", "GGGGGGG"}, + {"GGGGGGG", "G-----G", "G-----G", "G-----G", "G-----G", "G-----G", "GGGGGGG"}, + {"CCC~CCC", "COOOOOC", "COOOOOC", "COOOOOC", "COOOOOC", "COOOOOC", "CCCCCCC"}, + })) + .addElement( + 'C', + ofChain( + ofHatchAdder( + GregtechMTE_NuclearReactor::addNuclearReactorEdgeList, TAE.GTPP_INDEX(12), 1 + ), + onElementPass( + x -> ++x.mCasing, + ofBlock( + ModBlocks.blockCasingsMisc, 12 + ) + ) + ) + ) + .addElement( + 'X', + ofChain( + ofHatchAdder( + GregtechMTE_NuclearReactor::addNuclearReactorTopList, TAE.GTPP_INDEX(12), 2 + ), + onElementPass( + x -> ++x.mCasing, + ofBlock( + ModBlocks.blockCasingsMisc, 12 + ) + ) + ) + ) + .addElement( + 'O', + ofBlock( + ModBlocks.blockCasingsMisc, 12 + ) + ) + .addElement( + 'G', + ofBlock( + ModBlocks.blockCasingsMisc, 13 + ) + ) + .build(); + } + return STRUCTURE_DEFINITION; + } + + @Override + public void construct(ItemStack stackSize, boolean hintsOnly) { + buildPiece(mName , stackSize, hintsOnly, 3, 3, 0); + } + + @Override + public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) { + mCasing = 0; + if (checkPiece(mName, 3, 3, 0) && mCasing >= 27) { + if (mOutputHatches.size() >= 3 && mInputHatches.size() >= 2 && mDynamoHatches.size() == 4 && + mMufflerHatches.size() == 4 && mMaintenanceHatches.size() == 2) { + this.mWrench = true; + this.mScrewdriver = true; + this.mSoftHammer = true; + this.mHardHammer = true; + this.mSolderingTool = true; + this.mCrowbar = true; + this.turnCasingActive(false); + return true; + } + } + return false; + } + + // Alk's Life Lessons from Greg. + /* + [23:41:15] <GregoriusTechneticies> xdir and zdir are x2 and not x3 + [23:41:26] <GregoriusTechneticies> thats you issue + [23:44:33] <Alkalus> mmm? + [23:44:49] <Alkalus> Should they be x3? + [23:44:50] <GregoriusTechneticies> you just do a x2, what is for a 5x5 multiblock + [23:45:01] <GregoriusTechneticies> x3 is for a 7x7 one + [23:45:06] <Alkalus> I have no idea what that value does, tbh.. + [23:45:15] <GregoriusTechneticies> its the offset + [23:45:23] <Alkalus> Debugging checkMachine has been a pain and I usually trash designs that don't work straight up.. + [23:45:28] <GregoriusTechneticies> it determines the horizontal middle of the multiblock + [23:45:47] <GregoriusTechneticies> which is in your case THREE blocks away from the controller + [23:45:51] <Alkalus> Ahh + [23:45:57] <GregoriusTechneticies> and not 2 + [23:46:06] <Alkalus> Noted, thanks :D + */ + + @Override + public boolean isCorrectMachinePart(final ItemStack aStack) { + return true; + } + + @Override + public int getMaxEfficiency(final ItemStack aStack) { + return 10000; + } + + @Override + public int getPollutionPerTick(final ItemStack aStack) { + return 0; + } + + @Override + public int getDamageToComponent(final ItemStack aStack) { + return 0; + } + + @Override + public boolean explodesOnComponentBreak(final ItemStack aStack) { + return true; + } + + @Override + public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { + return new GregtechMTE_NuclearReactor(this.mName); + } + + public boolean turnCasingActive(final boolean status) { + //TODO + if (this.mDynamoHatches != null) { + for (final GT_MetaTileEntity_Hatch_Dynamo hatch : this.mDynamoHatches) { + hatch.mMachineBlock = status ? (byte) TAE.GTPP_INDEX(13) : (byte) TAE.GTPP_INDEX(12); + } + } + if (this.mMufflerHatches != null) { + for (final GT_MetaTileEntity_Hatch_Muffler hatch : this.mMufflerHatches) { + hatch.mMachineBlock = status ? (byte) TAE.GTPP_INDEX(13) : (byte) TAE.GTPP_INDEX(12); + } + } + if (this.mOutputHatches != null) { + for (final GT_MetaTileEntity_Hatch_Output hatch : this.mOutputHatches) { + hatch.mMachineBlock = status ? (byte) TAE.GTPP_INDEX(13) : (byte) TAE.GTPP_INDEX(12); + } + } + if (this.mInputHatches != null) { + for (final GT_MetaTileEntity_Hatch_Input hatch : this.mInputHatches) { + hatch.mMachineBlock = status ? (byte) TAE.GTPP_INDEX(13) : (byte) TAE.GTPP_INDEX(12); + } + } + if (this.mMaintenanceHatches != null) { + for (final GT_MetaTileEntity_Hatch_Maintenance hatch : this.mMaintenanceHatches) { + hatch.mMachineBlock = status ? (byte) TAE.GTPP_INDEX(13) : (byte) TAE.GTPP_INDEX(12); + } + } + return true; + } + + public FluidStack[] getStoredFluidsAsArray() { + return getStoredFluids().toArray(new FluidStack[0]); + } + + public int getStoredFuel(GT_Recipe aRecipe) { + int aFuelStored = 0; + FluidStack aFuelFluid = null; + for (FluidStack aFluidInput : aRecipe.mFluidInputs) { + if (!aFluidInput.getFluid().equals(NUCLIDE.Li2BeF4.getFluid())) { + aFuelFluid = aFluidInput; + break; + } + } + if (aFuelFluid != null) { + for (GT_MetaTileEntity_Hatch_Input aInputHatch : this.mInputHatches) { + if (aInputHatch.getFluid() != null && aInputHatch.getFluidAmount() > 0) { + if (aInputHatch.getFluid().isFluidEqual(aFuelFluid)) { + aFuelStored += aInputHatch.getFluidAmount(); + } + } + } + } + return aFuelStored; + } + + @Override + public boolean checkRecipe(final ItemStack aStack) { + // Warm up for 4~ minutes + Logger.WARNING("Checking LFTR recipes."); + if (mEfficiency < this.getMaxEfficiency(null)) { + this.mProgresstime = 0; + this.mMaxProgresstime = 1; + this.mEfficiencyIncrease = 2; + Logger.WARNING("Warming Up! "+this.mEfficiency+"/"+this.getMaxEfficiency(null)); + return true; + } + Logger.WARNING("Warmed up, checking LFTR recipes."); + + final FluidStack[] tFluids = getStoredFluidsAsArray(); + final Collection<GT_Recipe> tRecipeList = getRecipeMap().mRecipeList; + if(tFluids.length > 0 && tRecipeList != null && tRecipeList.size() > 0) { //Does input hatch have a LFTR fuel? + Logger.WARNING("Found more than one input fluid and a list of valid recipes."); + // Find a valid recipe + GT_Recipe aFuelProcessing = this.findRecipe(getBaseMetaTileEntity(), mLastRecipe, true, 0, tFluids, new ItemStack[] {}); + if (aFuelProcessing == null) { + Logger.WARNING("Did not find valid recipe for given inputs."); + return false; + } + else { + Logger.WARNING("Found recipe? "+(aFuelProcessing != null ? "true" : "false")); + for (FluidStack aFluidInput : aFuelProcessing.mFluidInputs) { + Logger.WARNING("Using "+aFluidInput.getLocalizedName()); + } + } + // Reset outputs and progress stats + this.mEUt = 0; + this.mMaxProgresstime = 0; + this.mOutputItems = new ItemStack[]{}; + this.mOutputFluids = new FluidStack[]{}; + this.mLastRecipe = aFuelProcessing; + // Deplete Inputs + if (aFuelProcessing.mFluidInputs.length > 0) { + for (FluidStack aInputToConsume : aFuelProcessing.mFluidInputs) { + Logger.WARNING("Depleting "+aInputToConsume.getLocalizedName()+" - "+aInputToConsume.amount+"L"); + this.depleteInput(aInputToConsume); + } + } + // -- Try not to fail after this point - inputs have already been consumed! -- + this.mMaxProgresstime = (int)(aFuelProcessing.mDuration); + this.mEUt = aFuelProcessing.mSpecialValue * 4; + Logger.WARNING("Outputting "+this.mEUt+"eu/t"); + this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000); + this.mEfficiencyIncrease = 10000; + this.mMaxProgresstime = Math.max(1, this.mMaxProgresstime); + Logger.WARNING("Recipe time: "+this.mMaxProgresstime); + mFuelRemaining = getStoredFuel(aFuelProcessing); //Record available fuel + + this.mOutputFluids = aFuelProcessing.mFluidOutputs.clone(); + updateSlots(); + Logger.WARNING("Recipe Good!"); + return true; + } + this.mEUt = 0; + this.mEfficiency = 0; + Logger.WARNING("Recipe Bad!"); + return false; + } + + @Override + public int getMaxParallelRecipes() { + return 1; + } + + @Override + public int getEuDiscountForParallelism() { + return 0; + } + + @Override + public void explodeMultiblock() { + this.mInventory[1] = null; + long explodevalue = MathUtils.randLong(Integer.MAX_VALUE, 8589934588L); + for (final MetaTileEntity tTileEntity : this.mInputBusses) { + explodevalue = MathUtils.randLong(Integer.MAX_VALUE, 8589934588L); + tTileEntity.getBaseMetaTileEntity().doExplosion(explodevalue); + } + for (final MetaTileEntity tTileEntity : this.mOutputBusses) { + explodevalue = MathUtils.randLong(Integer.MAX_VALUE, 8589934588L); + tTileEntity.getBaseMetaTileEntity().doExplosion(explodevalue); + } + for (final MetaTileEntity tTileEntity : this.mInputHatches) { + explodevalue = MathUtils.randLong(Integer.MAX_VALUE, 8589934588L); + tTileEntity.getBaseMetaTileEntity().doExplosion(explodevalue); + } + for (final MetaTileEntity tTileEntity : this.mOutputHatches) { + explodevalue = MathUtils.randLong(Integer.MAX_VALUE, 8589934588L); + tTileEntity.getBaseMetaTileEntity().doExplosion(explodevalue); + } + for (final MetaTileEntity tTileEntity : this.mDynamoHatches) { + explodevalue = MathUtils.randLong(Integer.MAX_VALUE, 8589934588L); + tTileEntity.getBaseMetaTileEntity().doExplosion(explodevalue); + } + for (final MetaTileEntity tTileEntity : this.mMufflerHatches) { + explodevalue = MathUtils.randLong(Integer.MAX_VALUE, 8589934588L); + tTileEntity.getBaseMetaTileEntity().doExplosion(explodevalue); + } + for (final MetaTileEntity tTileEntity : this.mEnergyHatches) { + explodevalue = MathUtils.randLong(Integer.MAX_VALUE, 8589934588L); + tTileEntity.getBaseMetaTileEntity().doExplosion(explodevalue); + } + for (final MetaTileEntity tTileEntity : this.mMaintenanceHatches) { + explodevalue = MathUtils.randLong(Integer.MAX_VALUE, 8589934588L); + tTileEntity.getBaseMetaTileEntity().doExplosion(explodevalue); + } + explodevalue = MathUtils.randLong(Integer.MAX_VALUE, 8589934588L); + this.getBaseMetaTileEntity().doExplosion(explodevalue); + } + + @Override + public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { + if (aBaseMetaTileEntity.getWorld().isRemote) { + if (aBaseMetaTileEntity.isActive()){ + // Set casings active if we're warmed up. + if (this.mEfficiency == this.getMaxEfficiency(null)){ + this.turnCasingActive(true); + } + else { + this.turnCasingActive(false); + } + } + else { + this.turnCasingActive(false); + } + } + super.onPostTick(aBaseMetaTileEntity, aTick); + } + + @Override + public boolean onRunningTick(ItemStack aStack) { + // See if we're warmed up. + if (this.mEfficiency == this.getMaxEfficiency(null)){ + // Try output some Uranium-233 + if (MathUtils.randInt(1, 300) == 1){ + this.addOutput(ELEMENT.getInstance().URANIUM233.getFluidStack(MathUtils.randInt(1, 10))); + } + + } + return super.onRunningTick(aStack); + } + + @Override + public void saveNBTData(NBTTagCompound aNBT) { + aNBT.setInteger("mFuelRemaining", this.mFuelRemaining); + super.saveNBTData(aNBT); + } + + @Override + public void loadNBTData(NBTTagCompound aNBT) { + this.mFuelRemaining = aNBT.getInteger("mFuelRemaining"); + super.loadNBTData(aNBT); + } + +} diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityGeneratorArray.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityGeneratorArray.java index db922e0841..cccee84c99 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityGeneratorArray.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityGeneratorArray.java @@ -22,6 +22,7 @@ import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; import gregtech.api.util.GTPP_Recipe; import gtPlusPlus.api.objects.Logger; +import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; @@ -72,7 +73,7 @@ public class GregtechMetaTileEntityGeneratorArray extends GregtechMeta_MultiBloc .addOutputHatch("Any Casing", 1) .addDynamoHatch("Any casing", 1) .addMaintenanceHatch("Any casing", 1) - .toolTipFinisher("GT++"); + .toolTipFinisher(CORE.GT_Tooltip_Builder); return tt; } @@ -364,23 +365,17 @@ public class GregtechMetaTileEntityGeneratorArray extends GregtechMeta_MultiBloc } else { IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBus){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mInputBusses.add((GT_MetaTileEntity_Hatch_InputBus)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mMaintenanceHatches.add((GT_MetaTileEntity_Hatch_Maintenance)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Dynamo){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mDynamoHatches.add((GT_MetaTileEntity_Hatch_Dynamo)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_OutputBus) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mOutputBusses.add((GT_MetaTileEntity_Hatch_OutputBus) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mInputHatches.add((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Output) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mOutputHatches.add((GT_MetaTileEntity_Hatch_Output) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } } return false; diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java index 4fd39740a1..83b8eae458 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java @@ -89,7 +89,7 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase .addEnergyHatch("Any casing", 1) .addMaintenanceHatch("Any casing", 1) .addMufflerHatch("Any casing", 1) - .toolTipFinisher("GT++"); + .toolTipFinisher(CORE.GT_Tooltip_Builder); return tt; } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_AlloyBlastSmelter.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_AlloyBlastSmelter.java index b36e32d092..323efa2193 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_AlloyBlastSmelter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_AlloyBlastSmelter.java @@ -81,7 +81,7 @@ extends GregtechMeta_MultiBlockBase { .addEnergyHatch("Any Casing", 1) .addMaintenanceHatch("Any Casing", 1) .addMufflerHatch("Any Casing", 1) - .toolTipFinisher("GT++"); + .toolTipFinisher(CORE.GT_Tooltip_Builder); return tt; } @@ -137,23 +137,19 @@ extends GregtechMeta_MultiBlockBase { } else { IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBus){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mInputBusses.add((GT_MetaTileEntity_Hatch_InputBus)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mMaintenanceHatches.add((GT_MetaTileEntity_Hatch_Maintenance)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Energy){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mEnergyHatches.add((GT_MetaTileEntity_Hatch_Energy)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Muffler) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mMufflerHatches.add((GT_MetaTileEntity_Hatch_Muffler) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mInputHatches.add((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Output) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mOutputHatches.add((GT_MetaTileEntity_Hatch_Output) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); + } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_OutputBus) { + return addToMachineList(aTileEntity, aBaseCasingIndex); } } return false; diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Cyclotron.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Cyclotron.java index d8e91a3170..ecd4882516 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Cyclotron.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Cyclotron.java @@ -202,23 +202,17 @@ public class GregtechMetaTileEntity_Cyclotron extends GregtechMeta_MultiBlockBas } else { IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBus && ((GT_MetaTileEntity_Hatch_InputBus) aMetaTileEntity).mTier >= 5){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mInputBusses.add((GT_MetaTileEntity_Hatch_InputBus)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mMaintenanceHatches.add((GT_MetaTileEntity_Hatch_Maintenance)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Energy && ((GT_MetaTileEntity_Hatch_Energy) aMetaTileEntity).mTier >= 5){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mEnergyHatches.add((GT_MetaTileEntity_Hatch_Energy)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_OutputBus && ((GT_MetaTileEntity_Hatch_OutputBus) aMetaTileEntity).mTier >= 5) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mOutputBusses.add((GT_MetaTileEntity_Hatch_OutputBus) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Muffler && ((GT_MetaTileEntity_Hatch_Muffler) aMetaTileEntity).mTier >= 5) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mMufflerHatches.add((GT_MetaTileEntity_Hatch_Muffler) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input && ((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity).mTier >= 5) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mInputHatches.add((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } } return false; @@ -264,7 +258,7 @@ public class GregtechMetaTileEntity_Cyclotron extends GregtechMeta_MultiBlockBas .addEnergyHatch("Any Casing", 1) .addMaintenanceHatch("Any Casing", 1) .addMufflerHatch("Any Casing", 1) - .toolTipFinisher("GT++"); + .toolTipFinisher(CORE.GT_Tooltip_Builder); return tt; } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialFishingPond.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialFishingPond.java index 50ae499ff7..80eb09640d 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialFishingPond.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialFishingPond.java @@ -85,7 +85,7 @@ public class GregtechMetaTileEntity_IndustrialFishingPond extends GregtechMeta_M .addEnergyHatch("Any Casing", 1) .addMaintenanceHatch("Any Casing", 1) .addMufflerHatch("Any Casing", 1) - .toolTipFinisher("GT++"); + .toolTipFinisher(CORE.GT_Tooltip_Builder); return tt; } @@ -129,23 +129,17 @@ public class GregtechMetaTileEntity_IndustrialFishingPond extends GregtechMeta_M } else { IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBus){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mInputBusses.add((GT_MetaTileEntity_Hatch_InputBus)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mMaintenanceHatches.add((GT_MetaTileEntity_Hatch_Maintenance)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Energy){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mEnergyHatches.add((GT_MetaTileEntity_Hatch_Energy)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_OutputBus) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mOutputBusses.add((GT_MetaTileEntity_Hatch_OutputBus) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Muffler) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mMufflerHatches.add((GT_MetaTileEntity_Hatch_Muffler) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mInputHatches.add((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } } return false; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialRockBreaker.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialRockBreaker.java new file mode 100644 index 0000000000..1b8835f289 --- /dev/null +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialRockBreaker.java @@ -0,0 +1,559 @@ +package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production; + +import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; +import static gregtech.api.enums.GT_Values.E; +import static gregtech.api.enums.GT_Values.RES_PATH_GUI; +import static gregtech.api.util.GT_StructureUtility.ofHatchAdder; +import static gtPlusPlus.core.util.data.ArrayUtils.removeNulls; + +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; + +import org.apache.commons.lang3.ArrayUtils; + +import com.gtnewhorizon.structurelib.structure.IStructureDefinition; +import com.gtnewhorizon.structurelib.structure.StructureDefinition; + +import gregtech.api.GregTech_API; +import gregtech.api.enums.Materials; +import gregtech.api.enums.OrePrefixes; +import gregtech.api.enums.TAE; +import gregtech.api.enums.Textures; +import gregtech.api.interfaces.ITexture; +import gregtech.api.interfaces.metatileentity.IMetaTileEntity; +import gregtech.api.interfaces.tileentity.IGregTechTileEntity; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_InputBus; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Maintenance; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Muffler; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_OutputBus; +import gregtech.api.objects.GT_RenderedTexture; +import gregtech.api.util.GTPP_Recipe; +import gregtech.api.util.GT_Multiblock_Tooltip_Builder; +import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.util.GT_Recipe; +import gregtech.api.util.GT_Recipe.GT_Recipe_Map; +import gregtech.api.util.GT_Recipe.GT_Recipe_Map_Microwave; +import gregtech.api.util.GT_Utility; +import gtPlusPlus.core.block.ModBlocks; +import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.recipe.common.CI; +import gtPlusPlus.core.util.minecraft.FluidUtils; +import gtPlusPlus.core.util.minecraft.ItemUtils; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; +import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; +import net.minecraft.init.Blocks; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; + +public class GregtechMetaTileEntity_IndustrialRockBreaker extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialRockBreaker> { + + private int mCasing; + private IStructureDefinition<GregtechMetaTileEntity_IndustrialRockBreaker> STRUCTURE_DEFINITION = null; + + + public GregtechMetaTileEntity_IndustrialRockBreaker(final int aID, final String aName, final String aNameRegional) { + super(aID, aName, aNameRegional); + } + + public GregtechMetaTileEntity_IndustrialRockBreaker(final String aName) { + super(aName); + } + + @Override + public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { + return new GregtechMetaTileEntity_IndustrialRockBreaker(this.mName); + } + + @Override + public String getMachineType() { + return "Rock Breaker"; + } + + @Override + protected GT_Multiblock_Tooltip_Builder createTooltip() { + GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + tt.addMachineType(getMachineType()) + .addInfo("Controller Block for the Industrial Rock Breaker") + .addInfo("Speed: 200% | Eu Usage: 75% | Parallel: Tier x 8") + .addInfo("Circuit goes in the Input Bus or GUI slot") + .addInfo("1 = cobble, 2 = stone, 3 = obsidian") + .addInfo("Supply Water/Lava") + .addPollutionAmount(getPollutionPerSecond(null)) + .addSeparator() + .beginStructureBlock(3, 4, 3, true) + .addController("Bottom Center") + .addCasingInfo("Thermal Processing Casing", 9) + .addCasingInfo("Thermal Containment Casing", 16) + .addInputBus("Any Casing", 1) + .addInputHatch("Any Casing", 1) + .addOutputBus("Any Casing", 1) + .addEnergyHatch("Any Casing", 1) + .addMaintenanceHatch("Any Casing", 1) + .addMufflerHatch("Any Casing", 1) + .toolTipFinisher(CORE.GT_Tooltip_Builder); + return tt; + } + + @Override + public IStructureDefinition<GregtechMetaTileEntity_IndustrialRockBreaker> getStructureDefinition() { + if (STRUCTURE_DEFINITION == null) { + STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_IndustrialRockBreaker>builder() + .addShape(mName, transpose(new String[][]{ + {"CCC", "CCC", "CCC"}, + {"HHH", "H-H", "HHH"}, + {"HHH", "H-H", "HHH"}, + {"C~C", "CCC", "CCC"}, + })) + .addElement( + 'C', + ofChain( + ofHatchAdder( + GregtechMetaTileEntity_IndustrialRockBreaker::addRockBreakerList, TAE.GTPP_INDEX(16), 1 + ), + onElementPass( + x -> ++x.mCasing, + ofBlock( + ModBlocks.blockCasings2Misc, 0 + ) + ) + ) + ) + .addElement( + 'H', + ofBlock( + ModBlocks.blockCasings2Misc, 11 + ) + ) + .build(); + } + return STRUCTURE_DEFINITION; + } + + @Override + public void construct(ItemStack stackSize, boolean hintsOnly) { + buildPiece(mName , stackSize, hintsOnly, 1, 3, 0); + } + + @Override + public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) { + mCasing = 0; + boolean aCheckPiece = checkPiece(mName, 1, 3, 0); + boolean aCasingCount = mCasing >= 9; + boolean aCheckHatch = checkHatch(); + log(""+aCheckPiece+", "+aCasingCount+", "+aCheckHatch); + return aCheckPiece && aCasingCount && aCheckHatch; + } + + public final boolean addRockBreakerList(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) { + if (aTileEntity == null) { + return false; + } else { + IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); + if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBus){ + return addToMachineList(aTileEntity, aBaseCasingIndex); + } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance){ + return addToMachineList(aTileEntity, aBaseCasingIndex); + } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Energy){ + return addToMachineList(aTileEntity, aBaseCasingIndex); + } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Muffler) { + return addToMachineList(aTileEntity, aBaseCasingIndex); + } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input) { + return addToMachineList(aTileEntity, aBaseCasingIndex); + } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_OutputBus) { + return addToMachineList(aTileEntity, aBaseCasingIndex); + } + } + return false; + } + + + @Override + public String getSound() { + return GregTech_API.sSoundList.get(Integer.valueOf(208)); + } + + @Override + public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte aFacing, final byte aColorIndex, final boolean aActive, final boolean aRedstone) { + if (aSide == aFacing) { + return new ITexture[]{Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(16)), new GT_RenderedTexture(aActive ? TexturesGtBlock.Overlay_Machine_Controller_Advanced_Active : TexturesGtBlock.Overlay_Machine_Controller_Advanced)}; + } + return new ITexture[]{Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(16))}; + } + + @Override + public boolean hasSlotInGUI() { + return true; + } + + @Override + public boolean requiresVanillaGtGUI() { + return true; + } + + @Override + public String getCustomGUIResourceName() { + return "ElectricBlastFurnace"; + } + + private static final GT_Recipe_Map sFakeRecipeMap = new GT_Recipe_Map(new HashSet<>(0), "gt.recipe.fakerockbreaker", "Rock Breaker", "smelting", RES_PATH_GUI + "basicmachines/E_Furnace", 1, 1, 0, 0, 1, E, 1, E, true, false); + + private static void generateRecipeMap() { + if (sRecipe_Cobblestone == null || sRecipe_SmoothStone == null || sRecipe_Redstone == null) { + generateRecipes(); + } + FluidStack[] aInputFluids = new FluidStack[] {FluidUtils.getWater(1000), FluidUtils.getLava(1000)}; + GT_Recipe aTemp = sRecipe_Cobblestone.copy(); + aTemp.mFluidInputs = aInputFluids; + sFakeRecipeMap.add(aTemp); + aTemp = sRecipe_SmoothStone.copy(); + aTemp.mFluidInputs = aInputFluids; + sFakeRecipeMap.add(aTemp); + aTemp = sRecipe_Redstone.copy(); + aTemp.mFluidInputs = aInputFluids; + sFakeRecipeMap.add(aTemp); + } + + @Override + public GT_Recipe.GT_Recipe_Map getRecipeMap() { + if (sFakeRecipeMap.mRecipeList.isEmpty()) { + generateRecipeMap(); + } + return sFakeRecipeMap; + } + + @Override + public boolean isCorrectMachinePart(final ItemStack aStack) { + return true; + } + + private static GT_Recipe sRecipe_Cobblestone; + private static GT_Recipe sRecipe_SmoothStone; + private static GT_Recipe sRecipe_Redstone; + + private static final void generateRecipes() { + sRecipe_Cobblestone = new GTPP_Recipe( + false, + new ItemStack[] { + CI.getNumberedCircuit(1) + }, + new ItemStack[] { + ItemUtils.getSimpleStack(Blocks.cobblestone) + }, + null, + new int[] {10000}, + null, + null, + 16, + 32, + 0); + sRecipe_SmoothStone = new GTPP_Recipe( + false, + new ItemStack[] { + CI.getNumberedCircuit(2) + }, + new ItemStack[] { + ItemUtils.getSimpleStack(Blocks.stone) + }, + null, + new int[] {10000}, + null, + null, + 16, + 32, + 0); + sRecipe_Redstone = new GTPP_Recipe( + false, + new ItemStack[] { + CI.getNumberedCircuit(3), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L) + }, + new ItemStack[] { + ItemUtils.getSimpleStack(Blocks.obsidian) + }, + null, + new int[] {10000}, + null, + null, + 128, + 32, + 0); + } + + @Override + public boolean checkRecipe(final ItemStack aStack) { + ArrayList<FluidStack> aFluids = this.getStoredFluids(); + if (!aFluids.isEmpty()) { + boolean aHasWater = false; + boolean aHasLava = false; + for (FluidStack aFluid : aFluids) { + if (aFluid.getFluid() == FluidRegistry.WATER) { + aHasWater = true; + } + else if (aFluid.getFluid() == FluidRegistry.LAVA) { + aHasLava = true; + } + } + ArrayList<ItemStack> aItems = this.getStoredInputs(); + boolean aHasRedstone = false; + if (!aItems.isEmpty()) { + for (ItemStack aItem : aItems) { + if (GT_Utility.areStacksEqual(aItem, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L))) { + aHasRedstone = true; + break; + } + } + } + + if (!aHasWater || !aHasLava) { + log("BAD RETURN - 0-1"); + return false; + } + ItemStack aGuiCircuit = this.getGUIItemStack(); + if (aGuiCircuit == null || !ItemUtils.isControlCircuit(aGuiCircuit)) { + log("BAD RETURN - 0-2"); + return false; + } + + if (sRecipe_Cobblestone == null || sRecipe_SmoothStone == null || sRecipe_Redstone == null) { + generateRecipes(); + } + + int aCircuit = aGuiCircuit.getItemDamage(); + + GT_Recipe tRecipe = null; + switch (aCircuit) { + case 1: + tRecipe = sRecipe_Cobblestone; + break; + case 2: + tRecipe = sRecipe_SmoothStone; + break; + case 3: + if (aHasRedstone) { + tRecipe = sRecipe_Redstone; + } + break; + } + + if (tRecipe == null) { + log("BAD RETURN - 0-3"); + return false; + } + + // Based on the Processing Array. A bit overkill, but very flexible. + ItemStack[] aItemInputs = aItems.toArray(new ItemStack[aItems.size()]); + FluidStack[] aFluidInputs = new FluidStack[] {}; + + // Reset outputs and progress stats + this.mEUt = 0; + this.mMaxProgresstime = 0; + this.mOutputItems = new ItemStack[]{}; + this.mOutputFluids = new FluidStack[]{}; + + long tVoltage = getMaxInputVoltage(); + byte tTier = (byte) Math.max(1, GT_Utility.getTier(tVoltage)); + long tEnergy = getMaxInputEnergy(); + log("Running checkRecipeGeneric(0)"); + + log("Running checkRecipeGeneric(1)"); + // Remember last recipe - an optimization for findRecipe() + this.mLastRecipe = tRecipe; + + int aMaxParallelRecipes = getMaxParallelRecipes(); + int aEUPercent = getEuDiscountForParallelism(); + int aSpeedBonusPercent = 200; + + aMaxParallelRecipes = this.canBufferOutputs(tRecipe, aMaxParallelRecipes); + if (aMaxParallelRecipes == 0) { + log("BAD RETURN - 2"); + return false; + } + + // EU discount + float tRecipeEUt = (tRecipe.mEUt * aEUPercent) / 100.0f; + float tTotalEUt = 0.0f; + + int parallelRecipes = 0; + + log("parallelRecipes: "+parallelRecipes); + log("aMaxParallelRecipes: "+aMaxParallelRecipes); + log("tTotalEUt: "+tTotalEUt); + log("tVoltage: "+tVoltage); + log("tRecipeEUt: "+tRecipeEUt); + + if (aItems.size() > 0 && aCircuit == 3) { + // Count recipes to do in parallel, consuming input items and fluids and considering input voltage limits + for (; parallelRecipes < aMaxParallelRecipes && tTotalEUt < (tEnergy - tRecipeEUt); parallelRecipes++) { + if (!this.depleteInput(tRecipe.mInputs[1])) { + break; + } + log("Bumped EU from "+tTotalEUt+" to "+(tTotalEUt+tRecipeEUt)+"."); + tTotalEUt += tRecipeEUt; + } + } + else if (aCircuit >= 1 && aCircuit <= 2) { + for (; parallelRecipes < aMaxParallelRecipes && tTotalEUt < (tEnergy - tRecipeEUt); parallelRecipes++) { + log("Bumped EU from "+tTotalEUt+" to "+(tTotalEUt+tRecipeEUt)+"."); + tTotalEUt += tRecipeEUt; + } + } + + log("Broke at "+parallelRecipes+"."); + if (parallelRecipes == 0) { + log("BAD RETURN - 3"); + return false; + } + + // -- Try not to fail after this point - inputs have already been consumed! -- + + + + // Convert speed bonus to duration multiplier + // e.g. 100% speed bonus = 200% speed = 100%/200% = 50% recipe duration. + aSpeedBonusPercent = Math.max(-99, aSpeedBonusPercent); + float tTimeFactor = 100.0f / (100.0f + aSpeedBonusPercent); + this.mMaxProgresstime = (int)(tRecipe.mDuration * tTimeFactor); + + this.mEUt = (int)Math.ceil(tTotalEUt); + + this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000); + this.mEfficiencyIncrease = 10000; + + // Overclock + if (this.mEUt <= 16) { + this.mEUt = (this.mEUt * (1 << tTier - 1) * (1 << tTier - 1)); + this.mMaxProgresstime = (this.mMaxProgresstime / (1 << tTier - 1)); + } else { + while (this.mEUt <= gregtech.api.enums.GT_Values.V[(tTier - 1)]) { + this.mEUt *= 4; + this.mMaxProgresstime /= 2; + } + } + + if (this.mEUt > 0) { + this.mEUt = (-this.mEUt); + } + + this.mMaxProgresstime = Math.max(1, this.mMaxProgresstime); + + // Collect fluid outputs + FluidStack[] tOutputFluids = new FluidStack[tRecipe.mFluidOutputs.length]; + for (int h = 0; h < tRecipe.mFluidOutputs.length; h++) { + if (tRecipe.getFluidOutput(h) != null) { + tOutputFluids[h] = tRecipe.getFluidOutput(h).copy(); + tOutputFluids[h].amount *= parallelRecipes; + } + } + + // Collect output item types + ItemStack[] tOutputItems = new ItemStack[tRecipe.mOutputs.length]; + for (int h = 0; h < tRecipe.mOutputs.length; h++) { + if (tRecipe.getOutput(h) != null) { + tOutputItems[h] = tRecipe.getOutput(h).copy(); + tOutputItems[h].stackSize = 0; + } + } + + // Set output item stack sizes (taking output chance into account) + for (int f = 0; f < tOutputItems.length; f++) { + if (tRecipe.mOutputs[f] != null && tOutputItems[f] != null) { + for (int g = 0; g < parallelRecipes; g++) { + if (getBaseMetaTileEntity().getRandomNumber(10000) < tRecipe.getOutputChance(f)) + tOutputItems[f].stackSize += tRecipe.mOutputs[f].stackSize; + } + } + } + + tOutputItems = removeNulls(tOutputItems); + + // Sanitize item stack size, splitting any stacks greater than max stack size + List<ItemStack> splitStacks = new ArrayList<ItemStack>(); + for (ItemStack tItem : tOutputItems) { + while (tItem.getMaxStackSize() < tItem.stackSize) { + ItemStack tmp = tItem.copy(); + tmp.stackSize = tmp.getMaxStackSize(); + tItem.stackSize = tItem.stackSize - tItem.getMaxStackSize(); + splitStacks.add(tmp); + } + } + + if (splitStacks.size() > 0) { + ItemStack[] tmp = new ItemStack[splitStacks.size()]; + tmp = splitStacks.toArray(tmp); + tOutputItems = ArrayUtils.addAll(tOutputItems, tmp); + } + + // Strip empty stacks + List<ItemStack> tSList = new ArrayList<ItemStack>(); + for (ItemStack tS : tOutputItems) { + if (tS.stackSize > 0) tSList.add(tS); + } + tOutputItems = tSList.toArray(new ItemStack[tSList.size()]); + + // Commit outputs + this.mOutputItems = tOutputItems; + this.mOutputFluids = tOutputFluids; + updateSlots(); + + // Play sounds (GT++ addition - GT multiblocks play no sounds) + startProcess(); + + log("GOOD RETURN - 1"); + return true; + } + + return false; + } + + @Override + public int getMaxParallelRecipes() { + return (8 * GT_Utility.getTier(this.getMaxInputVoltage())); + } + + @Override + public int getEuDiscountForParallelism() { + return 75; + } + + @Override + public int getMaxEfficiency(final ItemStack aStack) { + return 10000; + } + + @Override + public int getPollutionPerSecond(final ItemStack aStack) { + return CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialRockBreaker; + } + + @Override + public int getDamageToComponent(final ItemStack aStack) { + return 0; + } + + @Override + public int getAmountOfOutputs() { + return 2; + } + + @Override + public boolean explodesOnComponentBreak(final ItemStack aStack) { + return false; + } + + @Override + public ArrayList<ItemStack> getStoredInputs() { + ArrayList<ItemStack> aInputs = super.getStoredInputs(); + if (this.hasSlotInGUI() && this.getGUIItemStack() != null) { + aInputs.add(this.getGUIItemStack()); + } + return aInputs; + } +} diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_LargeRocketEngine.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_LargeRocketEngine.java index 13240c78e2..d9162cea89 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_LargeRocketEngine.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_LargeRocketEngine.java @@ -18,6 +18,7 @@ import gregtech.api.util.GT_Recipe; import gregtech.api.util.GTPP_Recipe; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.item.chemistry.RocketFuels; +import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.material.MISC_MATERIALS; import gtPlusPlus.core.util.minecraft.FluidUtils; @@ -36,7 +37,7 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static gregtech.api.util.GT_StructureUtility.ofHatchAdder; -public class GregtechMetaTileEntity_LargeRocketEngine extends GregtechMeta_MultiBlockBase +public class GregtechMetaTileEntity_LargeRocketEngine extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_LargeRocketEngine> { protected int fuelConsumption; protected int fuelValue; @@ -56,8 +57,6 @@ public class GregtechMetaTileEntity_LargeRocketEngine extends GregtechMeta_Multi private IStructureDefinition<GregtechMetaTileEntity_LargeRocketEngine> STRUCTURE_DEFINITION = null; private final static int CASING_ID = TAE.getIndexFromPage(3, 11); - - public ArrayList<GT_MetaTileEntity_Hatch> mAllDynamoHatches = new ArrayList<GT_MetaTileEntity_Hatch>(); public GregtechMetaTileEntity_LargeRocketEngine(final int aID, final String aName, final String aNameRegional) { super(aID, aName, aNameRegional); @@ -115,7 +114,7 @@ public class GregtechMetaTileEntity_LargeRocketEngine extends GregtechMeta_Multi .addMaintenanceHatch("Side center line", 1) .addDynamoHatch("Top center line", 2) .addMufflerHatch("Back Center", 3) - .toolTipFinisher("GT++"); + .toolTipFinisher(CORE.GT_Tooltip_Builder); return tt; } @@ -199,15 +198,12 @@ public class GregtechMetaTileEntity_LargeRocketEngine extends GregtechMeta_Multi } else { IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mMaintenanceHatches.add((GT_MetaTileEntity_Hatch_Maintenance)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Dynamo) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mAllDynamoHatches.add((GT_MetaTileEntity_Hatch_Dynamo) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } if (LoadedMods.TecTech) { if (isThisHatchMultiDynamo(aMetaTileEntity)) { - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mAllDynamoHatches.add((GT_MetaTileEntity_Hatch) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } } } @@ -220,17 +216,13 @@ public class GregtechMetaTileEntity_LargeRocketEngine extends GregtechMeta_Multi } else { IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mMaintenanceHatches.add((GT_MetaTileEntity_Hatch_Maintenance)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_AirIntake) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mAirIntakes.add(aMetaTileEntity) && this.mInputHatches.add((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mInputHatches.add((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBus) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mInputBusses.add((GT_MetaTileEntity_Hatch_InputBus) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } } return false; @@ -242,8 +234,7 @@ public class GregtechMetaTileEntity_LargeRocketEngine extends GregtechMeta_Multi } else { IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Muffler){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mMufflerHatches.add((GT_MetaTileEntity_Hatch_Muffler)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } } return false; @@ -274,8 +265,7 @@ public class GregtechMetaTileEntity_LargeRocketEngine extends GregtechMeta_Multi else { int totalAir = 0; FluidStack airstack = FluidUtils.getFluidStack("air", 1); - for (Object U : this.mAirIntakes) { - GT_MetaTileEntity_Hatch_AirIntake u = (GT_MetaTileEntity_Hatch_AirIntake) U; + for (GT_MetaTileEntity_Hatch_AirIntake u : this.mAirIntakes) { if (u != null && u.mFluid != null) { // had this trow errors cousing the machine to stop probebly fixed FluidStack f = u.mFluid; @@ -317,7 +307,7 @@ public class GregtechMetaTileEntity_LargeRocketEngine extends GregtechMeta_Multi if (tFluids.size() > 0 && tRecipeList != null) { - if (tFluids.contains(MISC_MATERIALS.CARBON_DIOXIDE.getFluid(this.boostEu ? 3 : 1)) || tFluids.contains(FluidUtils.getFluidStack("carbondioxide", (this.boostEu ? 3 : 1)))) { + if (tFluids.contains(MISC_MATERIALS.CARBON_DIOXIDE.getFluidStack(this.boostEu ? 3 : 1)) || tFluids.contains(FluidUtils.getFluidStack("carbondioxide", (this.boostEu ? 3 : 1)))) { if (this.mRuntime % 72 == 0 || this.mRuntime == 0) { if (!consumeCO2()) { freeFuelTicks = 0; @@ -420,7 +410,7 @@ public class GregtechMetaTileEntity_LargeRocketEngine extends GregtechMeta_Multi } public boolean consumeCO2() { - if (this.depleteInput(MISC_MATERIALS.CARBON_DIOXIDE.getFluid(this.boostEu ? 3 : 1)) || this.depleteInput(FluidUtils.getFluidStack("carbondioxide", (this.boostEu ? 3 : 1)))) { + if (this.depleteInput(MISC_MATERIALS.CARBON_DIOXIDE.getFluidStack(this.boostEu ? 3 : 1)) || this.depleteInput(FluidUtils.getFluidStack("carbondioxide", (this.boostEu ? 3 : 1)))) { return true; } else { diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_LargeSemifluidGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_LargeSemifluidGenerator.java index 3860d27706..9be787e922 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_LargeSemifluidGenerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_LargeSemifluidGenerator.java @@ -67,7 +67,7 @@ public class GregtechMetaTileEntity_LargeSemifluidGenerator extends GregtechMeta .addMaintenanceHatch("Any Casing", 1) .addMufflerHatch("Any Casing", 1) .addDynamoHatch("Back Center", 2) - .toolTipFinisher("GT++"); + .toolTipFinisher(CORE.GT_Tooltip_Builder); return tt; } @@ -213,14 +213,11 @@ public class GregtechMetaTileEntity_LargeSemifluidGenerator extends GregtechMeta } else { IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mMaintenanceHatches.add((GT_MetaTileEntity_Hatch_Maintenance)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Muffler) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mMufflerHatches.add((GT_MetaTileEntity_Hatch_Muffler) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mInputHatches.add((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } } return false; @@ -231,9 +228,8 @@ public class GregtechMetaTileEntity_LargeSemifluidGenerator extends GregtechMeta return false; } else { IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Dynamo){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mDynamoHatches.add((GT_MetaTileEntity_Hatch_Dynamo)aMetaTileEntity); + if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Dynamo || this.isThisHatchMultiDynamo(aTileEntity)){ + return addToMachineList(aTileEntity, aBaseCasingIndex); } } return false; diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_MassFabricator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_MassFabricator.java index 4d9df7deea..f016288547 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_MassFabricator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_MassFabricator.java @@ -121,7 +121,7 @@ public class GregtechMetaTileEntity_MassFabricator extends GregtechMeta_MultiBlo .addEnergyHatch("Any Casing", 1) .addMaintenanceHatch("Any Casing", 1) .addMufflerHatch("Any Casing", 1) - .toolTipFinisher("GT++"); + .toolTipFinisher(CORE.GT_Tooltip_Builder); return tt; } @@ -239,26 +239,19 @@ public class GregtechMetaTileEntity_MassFabricator extends GregtechMeta_MultiBlo } else { IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBus){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mInputBusses.add((GT_MetaTileEntity_Hatch_InputBus)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mMaintenanceHatches.add((GT_MetaTileEntity_Hatch_Maintenance)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Energy){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mEnergyHatches.add((GT_MetaTileEntity_Hatch_Energy)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_OutputBus) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mOutputBusses.add((GT_MetaTileEntity_Hatch_OutputBus) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Muffler) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mMufflerHatches.add((GT_MetaTileEntity_Hatch_Muffler) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mInputHatches.add((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Output) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mOutputHatches.add((GT_MetaTileEntity_Hatch_Output) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } } return false; diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Refinery.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Refinery.java index 9f21154707..f86ecf3196 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Refinery.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Refinery.java @@ -58,10 +58,10 @@ public class GregtechMetaTileEntity_Refinery extends GregtechMeta_MultiBlockBase .addMufflerHatch("Base platform", 1) .addMaintenanceHatch("Base platform", 1) .addEnergyHatch("Base platform", 1) - .addStructureInfo("Muffler's Tier must be ZPM/ZPM+") + .addStructureInfo("Muffler's Tier must be LuV+") .addStructureInfo("4x Input Hatches, 2x Output Hatches, 1x Output Bus") .addStructureInfo("1x Muffler, 1x Maintenance Hatch, 1x Energy Hatch") - .toolTipFinisher("GT++"); + .toolTipFinisher(CORE.GT_Tooltip_Builder); return tt; } @@ -115,23 +115,17 @@ public class GregtechMetaTileEntity_Refinery extends GregtechMeta_MultiBlockBase } else { IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mMaintenanceHatches.add((GT_MetaTileEntity_Hatch_Maintenance)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Energy){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mEnergyHatches.add((GT_MetaTileEntity_Hatch_Energy)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_OutputBus) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mOutputBusses.add((GT_MetaTileEntity_Hatch_OutputBus) aMetaTileEntity); - } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Muffler && ((GT_MetaTileEntity_Hatch_Muffler) aMetaTileEntity).mTier >= 7) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mMufflerHatches.add((GT_MetaTileEntity_Hatch_Muffler) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); + } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Muffler && ((GT_MetaTileEntity_Hatch_Muffler) aMetaTileEntity).mTier >= 6) { + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mInputHatches.add((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Output) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mOutputHatches.add((GT_MetaTileEntity_Hatch_Output) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } } return false; diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_SolarTower.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_SolarTower.java index d42b33a403..d42b33a403 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_SolarTower.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_SolarTower.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/algae/GregtechMTE_AlgaePondBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/algae/GregtechMTE_AlgaePondBase.java index c06f764bfe..4759457d8d 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/algae/GregtechMTE_AlgaePondBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/algae/GregtechMTE_AlgaePondBase.java @@ -28,6 +28,7 @@ import gregtech.api.util.GT_Utility; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.item.chemistry.AgriculturalChem; +import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; @@ -85,7 +86,7 @@ public class GregtechMTE_AlgaePondBase extends GregtechMeta_MultiBlockBase { .addInputBus("Any Casing", 1) .addOutputBus("Any Casing", 1) .addInputHatch("Any Casing", 1) - .toolTipFinisher("GT++"); + .toolTipFinisher(CORE.GT_Tooltip_Builder); return tt; } @@ -154,14 +155,11 @@ public class GregtechMTE_AlgaePondBase extends GregtechMeta_MultiBlockBase { } else { IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBus){ - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mInputBusses.add((GT_MetaTileEntity_Hatch_InputBus)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_OutputBus) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mOutputBusses.add((GT_MetaTileEntity_Hatch_OutputBus) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); }else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mInputHatches.add((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } } return false; diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/bedrock/GregtechMetaTileEntity_BedrockMiningPlatform1.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/bedrock/GregtechMetaTileEntity_BedrockMiningPlatform1.java index 018120d614..018120d614 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/bedrock/GregtechMetaTileEntity_BedrockMiningPlatform1.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/bedrock/GregtechMetaTileEntity_BedrockMiningPlatform1.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/bedrock/GregtechMetaTileEntity_BedrockMiningPlatform2.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/bedrock/GregtechMetaTileEntity_BedrockMiningPlatform2.java index 6b97cb7ee2..6b97cb7ee2 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/bedrock/GregtechMetaTileEntity_BedrockMiningPlatform2.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/bedrock/GregtechMetaTileEntity_BedrockMiningPlatform2.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/bedrock/GregtechMetaTileEntity_BedrockMiningPlatformBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/bedrock/GregtechMetaTileEntity_BedrockMiningPlatformBase.java index 05a05d53e0..05a05d53e0 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/bedrock/GregtechMetaTileEntity_BedrockMiningPlatformBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/bedrock/GregtechMetaTileEntity_BedrockMiningPlatformBase.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java index 5edff05e48..4a01809ac7 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java @@ -1,6 +1,8 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.chemplant; -import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; import static gregtech.api.util.GT_StructureUtility.ofHatchAdder; import static gtPlusPlus.core.util.data.ArrayUtils.removeNulls; @@ -8,14 +10,12 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import org.apache.commons.lang3.ArrayUtils; + import com.gtnewhorizon.structurelib.StructureLibAPI; import com.gtnewhorizon.structurelib.structure.IStructureDefinition; import com.gtnewhorizon.structurelib.structure.IStructureElement; import com.gtnewhorizon.structurelib.structure.StructureDefinition; -import gregtech.api.metatileentity.implementations.*; -import gregtech.api.util.*; -import net.minecraft.world.World; -import org.apache.commons.lang3.ArrayUtils; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -24,7 +24,19 @@ import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_InputBus; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Maintenance; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_OutputBus; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachineBlock; import gregtech.api.objects.GT_RenderedTexture; +import gregtech.api.util.GTPP_Recipe; +import gregtech.api.util.GT_Multiblock_Tooltip_Builder; +import gregtech.api.util.GT_Recipe; +import gregtech.api.util.GT_Utility; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.api.objects.data.Triplet; @@ -39,10 +51,11 @@ import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; -public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase { +public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase<GregtechMTE_ChemicalPlant> { private int mSolidCasingTier = 0; private int mMachineCasingTier = 0; @@ -115,7 +128,7 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase { .addOutputHatch("Bottom Casing", 1) .addEnergyHatch("Bottom Casing", 1) .addMaintenanceHatch("Bottom Casing", 1) - .toolTipFinisher("GT++"); + .toolTipFinisher(CORE.GT_Tooltip_Builder); return tt; } @@ -354,24 +367,24 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase { } else { IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Catalysts){ - return addToMachineListInternal(mCatalystBuses, aMetaTileEntity, aBaseCasingIndex); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBus){ maxTierOfHatch = Math.max(maxTierOfHatch, ((GT_MetaTileEntity_Hatch_InputBus) aMetaTileEntity).mTier); - return this.mInputBusses.add((GT_MetaTileEntity_Hatch_InputBus)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance){ - return this.mMaintenanceHatches.add((GT_MetaTileEntity_Hatch_Maintenance)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Energy){ maxTierOfHatch = Math.max(maxTierOfHatch, ((GT_MetaTileEntity_Hatch_Energy) aMetaTileEntity).mTier); - return this.mEnergyHatches.add((GT_MetaTileEntity_Hatch_Energy)aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_OutputBus) { maxTierOfHatch = Math.max(maxTierOfHatch, ((GT_MetaTileEntity_Hatch_OutputBus) aMetaTileEntity).mTier); - return this.mOutputBusses.add((GT_MetaTileEntity_Hatch_OutputBus) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input) { maxTierOfHatch = Math.max(maxTierOfHatch, ((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity).mTier); - return this.mInputHatches.add((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Output) { maxTierOfHatch = Math.max(maxTierOfHatch, ((GT_MetaTileEntity_Hatch_Output) aMetaTileEntity).mTier); - return this.mOutputHatches.add((GT_MetaTileEntity_Hatch_Output) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } } return false; @@ -414,7 +427,7 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase { } public static void generateRecipes() { - for (GTPP_Recipe i : GTPP_Recipe.GTPP_Recipe_Map.sChemicalPlantRecipes.mRecipeList) { + for (GT_Recipe i : GTPP_Recipe.GTPP_Recipe_Map.sChemicalPlantRecipes.mRecipeList) { GTPP_Recipe.GTPP_Recipe_Map.sChemicalPlant_GT.add(i); } } @@ -555,10 +568,18 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase { } @Override - public boolean checkRecipe(final ItemStack aStack) { + public boolean checkRecipe(final ItemStack aStack) { return checkRecipeGeneric(getMaxParallelRecipes(), getEuDiscountForParallelism(), getSpeedBonus()); } + @Override + public boolean checkRecipeGeneric(int aMaxParallelRecipes, int aEUPercent, int aSpeedBonusPercent, int aOutputChanceRoll) { + ArrayList<ItemStack> tItems = getStoredInputs(); + ArrayList<FluidStack> tFluids = getStoredFluids(); + ItemStack[] tItemInputs = tItems.toArray(new ItemStack[tItems.size()]); + FluidStack[] tFluidInputs = tFluids.toArray(new FluidStack[tFluids.size()]); + return checkRecipeGeneric(tItemInputs, tFluidInputs, aMaxParallelRecipes, aEUPercent, aSpeedBonusPercent, aOutputChanceRoll); + } @Override public boolean checkRecipeGeneric( @@ -573,7 +594,7 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase { this.mMaxProgresstime = 0; this.mOutputItems = new ItemStack[]{}; this.mOutputFluids = new FluidStack[]{}; - + long tVoltage = getMaxInputVoltage(); byte tTier = (byte) Math.max(1, GT_Utility.getTier(tVoltage)); long tEnergy = getMaxInputEnergy(); @@ -1022,12 +1043,18 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase { @Override public ArrayList<ItemStack> getStoredInputs() { ArrayList<ItemStack> tItems = super.getStoredInputs(); + if (this.hasSlotInGUI() && this.getGUIItemStack() != null) { + tItems.add(this.getGUIItemStack()); + } for (GT_MetaTileEntity_Hatch_Catalysts tHatch : mCatalystBuses) { tHatch.mRecipeMap = getRecipeMap(); - if (isValidMetaTileEntity(tHatch)) { - tItems.addAll(tHatch.getContentUsageSlots()); + if (isValidMetaTileEntity(tHatch)) { + AutoMap<ItemStack> aHatchContent = tHatch.getContentUsageSlots(); + if (!aHatchContent.isEmpty()) { + tItems.addAll(aHatchContent); + } } - } + } return tItems; } } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_SHSteam.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_SHSteam.java index f52f02b5de..f52f02b5de 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_SHSteam.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_SHSteam.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Steam.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Steam.java index 2e6f6149e7..2e6f6149e7 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Steam.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Steam.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GregtechMetaTileEntity_LargerTurbineBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GregtechMetaTileEntity_LargerTurbineBase.java index 9da724c6eb..9da724c6eb 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GregtechMetaTileEntity_LargerTurbineBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GregtechMetaTileEntity_LargerTurbineBase.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_MultiTank.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_MultiTank.java index 6ed14eb2a9..6ed14eb2a9 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_MultiTank.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_MultiTank.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java index b09c5e611b..78adb094ed 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java @@ -1,18 +1,29 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.storage; -import java.util.ArrayList; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; +import static gregtech.api.util.GT_StructureUtility.ofHatchAdder; +import static gregtech.api.util.GT_StructureUtility.ofHatchAdderOptional; + +import java.util.function.Predicate; import com.gtnewhorizon.structurelib.StructureLibAPI; import com.gtnewhorizon.structurelib.structure.IStructureDefinition; import com.gtnewhorizon.structurelib.structure.IStructureElement; import com.gtnewhorizon.structurelib.structure.StructureDefinition; + import gregtech.api.enums.TAE; import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.metatileentity.implementations.*; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Dynamo; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Maintenance; import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_Multiblock_Tooltip_Builder; import gregtech.api.util.GT_Utility; @@ -37,11 +48,13 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.World; -import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; -import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; -import static gregtech.api.util.GT_StructureUtility.ofHatchAdder; +public class GregtechMetaTileEntity_PowerSubStationController extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_PowerSubStationController> { -public class GregtechMetaTileEntity_PowerSubStationController extends GregtechMeta_MultiBlockBase { + private static enum TopState { + MayBeTop, + Top, + NotTop + } protected long mAverageEuUsage = 0; protected long mTotalEnergyAdded = 0; @@ -54,11 +67,8 @@ public class GregtechMetaTileEntity_PowerSubStationController extends GregtechMe private int mCasing; private int[] cellCount = new int[6]; - private IStructureDefinition<GregtechMetaTileEntity_PowerSubStationController> STRUCTURE_DEFINITION = null; - - //TecTech Support - public ArrayList<GT_MetaTileEntity_Hatch> mAllEnergyHatches = new ArrayList<GT_MetaTileEntity_Hatch>(); - public ArrayList<GT_MetaTileEntity_Hatch> mAllDynamoHatches = new ArrayList<GT_MetaTileEntity_Hatch>(); + private TopState topState = TopState.MayBeTop; + private static IStructureDefinition<GregtechMetaTileEntity_PowerSubStationController> STRUCTURE_DEFINITION = null; public GregtechMetaTileEntity_PowerSubStationController(final int aID, final String aName, final String aNameRegional) { super(aID, aName, aNameRegional); @@ -77,19 +87,19 @@ public class GregtechMetaTileEntity_PowerSubStationController extends GregtechMe protected GT_Multiblock_Tooltip_Builder createTooltip() { GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); tt.addMachineType(getMachineType()) - .addInfo("[BUG] GUI does not work until structure is assembled correctly. (Do Not Report issue)") - .addInfo("Consumes " + this.ENERGY_TAX + "% of the average voltage of all energy type hatches") - .addInfo("Does not require maintenance") - .addInfo("Can be built with variable height between " + (CELL_HEIGHT_MIN + 2) + "-" + (CELL_HEIGHT_MAX + 2) + "") - .addInfo("Hatches can be placed nearly anywhere") - .addInfo("HV Energy/Dynamo Hatches are the lowest tier you can use") - .addInfo("Supports voltages >= UHV using MAX tier components.") - .addSeparator() - .addController("Bottom Center") - .addCasingInfo("Sub-Station External Casings", 10) - .addDynamoHatch("Any Casing", 1) - .addEnergyHatch("Any Casing", 1) - .toolTipFinisher("GT++"); + .addInfo("[BUG] GUI does not work until structure is assembled correctly. (Do Not Report issue)") + .addInfo("Consumes " + this.ENERGY_TAX + "% of the average voltage of all energy type hatches") + .addInfo("Does not require maintenance") + .addInfo("Can be built with variable height between " + (CELL_HEIGHT_MIN + 2) + "-" + (CELL_HEIGHT_MAX + 2) + "") + .addInfo("Hatches can be placed nearly anywhere") + .addInfo("HV Energy/Dynamo Hatches are the lowest tier you can use") + .addInfo("Supports voltages >= UHV using MAX tier components.") + .addSeparator() + .addController("Bottom Center") + .addCasingInfo("Sub-Station External Casings", 10) + .addDynamoHatch("Any Casing", 1) + .addEnergyHatch("Any Casing", 1) + .toolTipFinisher(CORE.GT_Tooltip_Builder); return tt; } @@ -203,62 +213,100 @@ public class GregtechMetaTileEntity_PowerSubStationController extends GregtechMe if (STRUCTURE_DEFINITION == null) { STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_PowerSubStationController>builder() .addShape(mName + "bottom", transpose(new String[][]{ - {"CC~CC", "CCCCC", "CCCCC", "CCCCC", "CCCCC"} + {"CC~CC", "CCCCC", "CCCCC", "CCCCC", "CCCCC"} + })) + .addShape(mName + "layer", transpose(new String[][]{ + {"CCCCC", "CIIIC", "CIIIC", "CIIIC", "CCCCC"} })) .addShape(mName + "mid", transpose(new String[][]{ - {"CCCCC", "CHHHC", "CHHHC", "CHHHC", "CCCCC"} + {"CCCCC", "CHHHC", "CHHHC", "CHHHC", "CCCCC"} })) .addShape(mName + "top", transpose(new String[][]{ - {"CCCCC", "CCCCC", "CCCCC", "CCCCC", "CCCCC"} + {"CCCCC", "CCCCC", "CCCCC", "CCCCC", "CCCCC"} })) .addElement( 'C', ofChain( ofHatchAdder( GregtechMetaTileEntity_PowerSubStationController::addPowerSubStationList, TAE.GTPP_INDEX(24), 1 - ), + ), onElementPass( x -> ++x.mCasing, ofBlock( ModBlocks.blockCasings2Misc, 8 + ) ) ) ) - ) .addElement( - 'H', + 'I', ofChain( - onElementPass( - x -> ++x.cellCount[0], - ofCell(4) - ), - onElementPass( - x -> ++x.cellCount[1], - ofCell(5) - ), - onElementPass( - x -> ++x.cellCount[2], - ofCell(6) - ), - onElementPass( - x -> ++x.cellCount[3], - ofCell(7) - ), - onElementPass( - x -> ++x.cellCount[4], - ofCell(8) - ), - onElementPass( - x -> ++x.cellCount[5], - ofCell(9) + onlyIf( + x -> x.topState != TopState.NotTop, + onElementPass( + x -> x.topState = TopState.Top, + ofHatchAdderOptional(GregtechMetaTileEntity_PowerSubStationController::addPowerSubStationList, TAE.GTPP_INDEX(24), 1, ModBlocks.blockCasings2Misc, 8) + ) + ), + onlyIf( + x -> x.topState != TopState.Top, + onElementPass( + x -> x.topState = TopState.NotTop, + ofChain( + onElementPass( + x -> ++x.cellCount[0], + ofCell(4) + ), + onElementPass( + x -> ++x.cellCount[1], + ofCell(5) + ), + onElementPass( + x -> ++x.cellCount[2], + ofCell(6) + ), + onElementPass( + x -> ++x.cellCount[3], + ofCell(7) + ), + onElementPass( + x -> ++x.cellCount[4], + ofCell(8) + ), + onElementPass( + x -> ++x.cellCount[5], + ofCell(9) + ) + ) + ) + ) ) ) - ) + .addElement('H', ofCell(4)) .build(); } return STRUCTURE_DEFINITION; } + public static <T> IStructureElement<T> onlyIf(Predicate<? super T> predicate, IStructureElement<? super T> downstream) { + return new IStructureElement<T>() { + @Override + public boolean check(T t, World world, int x, int y, int z) { + return predicate.test(t) && downstream.check(t, world, x, y, z); + } + + @Override + public boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigger) { + return predicate.test(t) && downstream.spawnHint(t, world, x, y, z, trigger); + } + + @Override + public boolean placeBlock(T t, World world, int x, int y, int z, ItemStack trigger) { + return predicate.test(t) && downstream.placeBlock(t, world, x, y, z, trigger); + } + }; + } + public static <T> IStructureElement<T> ofCell(int aIndex) { return new IStructureElement<T>() { @Override @@ -290,45 +338,74 @@ public class GregtechMetaTileEntity_PowerSubStationController extends GregtechMe @Override public void construct(ItemStack stackSize, boolean hintsOnly) { int layer = Math.min(stackSize.stackSize + 3, 18); + log("Layer: "+layer); + log("Building 0"); buildPiece(mName + "bottom" , stackSize, hintsOnly, 2, 0, 0); + log("Built 0"); for (int i = 1; i < layer - 1; i++) { + log("Building "+i); buildPiece(mName + "mid", stackSize, hintsOnly, 2, i, 0); + log("Built "+i); } + log("Building "+(layer - 1)); buildPiece(mName + "top", stackSize, hintsOnly, 2, layer - 1, 0); + log("Built "+(layer - 1)); } @Override public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) { mCasing = 0; + mEnergyHatches.clear(); + mDynamoHatches.clear(); + mTecTechEnergyHatches.clear(); + mTecTechDynamoHatches.clear(); mAllEnergyHatches.clear(); mAllDynamoHatches.clear(); for (int i = 0; i < 6; i++) { cellCount[i] = 0; } - if (!checkPiece(mName + "bottom", 2, 0, 0)) + log("Checking 0"); + if (!checkPiece(mName + "bottom", 2, 0, 0)) { + log("Failed on Layer 0"); return false; + } + log("Pass 0"); int layer = 1; - while (checkPiece(mName + "mid", 2, layer, 0)) { + topState = TopState.MayBeTop; + while (true) { + if (!checkPiece(mName + "layer", 2, layer, 0)) + return false; layer ++; + if (topState == TopState.Top) + break; // top found, break out + topState = TopState.MayBeTop; + if (layer > 18) + return false; // too many layers } - if (layer > 19 || !checkPiece(mName + "top", 2, layer, 0)) - return false; int level = 0; for (int i = 0; i < 6; i++) { if (cellCount[i] != 0) { - if (level == 0) level = i + 4; - else return false; + if (level == 0) { + level = i + 4; + } + else { + return false; + } } } int tier = getMaxHatchTier(level); long volSum = 0; for (GT_MetaTileEntity_Hatch hatch : mAllDynamoHatches) { - if (hatch.mTier > tier || hatch.mTier < 3) return false; - volSum += (8 << (hatch.mTier * 2)); + if (hatch.mTier > tier || hatch.mTier < 3) { + return false; + } + volSum += (8L << (hatch.mTier * 2)); } for (GT_MetaTileEntity_Hatch hatch : mAllEnergyHatches) { - if (hatch.mTier > tier || hatch.mTier < 3) return false; - volSum += (8 << (hatch.mTier * 2)); + if (hatch.mTier > tier || hatch.mTier < 3) { + return false; + } + volSum += (8L << (hatch.mTier * 2)); } mBatteryCapacity = getCapacityFromCellTier(level) * cellCount[level - 4]; if (mAllEnergyHatches.size() + mAllDynamoHatches.size() > 0) { @@ -345,18 +422,19 @@ public class GregtechMetaTileEntity_PowerSubStationController extends GregtechMe } else { IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Energy) { - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mAllEnergyHatches.add((GT_MetaTileEntity_Hatch_Energy)aMetaTileEntity); - } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Dynamo) { - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mAllDynamoHatches.add((GT_MetaTileEntity_Hatch_Dynamo)aMetaTileEntity); - } if (LoadedMods.TecTech) { + return addToMachineList(aTileEntity, aBaseCasingIndex); + } + else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Dynamo) { + return addToMachineList(aTileEntity, aBaseCasingIndex); + } + else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance) { + return addToMachineList(aTileEntity, aBaseCasingIndex); + } + else if (LoadedMods.TecTech) { if (isThisHatchMultiDynamo(aMetaTileEntity)) { - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mAllDynamoHatches.add((GT_MetaTileEntity_Hatch) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } else if (isThisHatchMultiEnergy(aMetaTileEntity)) { - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mAllEnergyHatches.add((GT_MetaTileEntity_Hatch) aMetaTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } } } @@ -411,7 +489,7 @@ public class GregtechMetaTileEntity_PowerSubStationController extends GregtechMe @Override public void loadNBTData(NBTTagCompound aNBT) { - + // Best not to get a long if the Tag Map is holding an int if (aNBT.hasKey("mAverageEuUsage")) { this.mAverageEuUsage = aNBT.getLong("mAverageEuUsage"); diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/misc/TileEntitySolarHeater.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/misc/TileEntitySolarHeater.java index 5d8e9d468d..5d8e9d468d 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/misc/TileEntitySolarHeater.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/misc/TileEntitySolarHeater.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_ConnectableCrate.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_ConnectableCrate.java index e6d825ea8f..a3c11d486b 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_ConnectableCrate.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_ConnectableCrate.java @@ -19,6 +19,7 @@ import gregtech.api.util.GT_Utility; import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.api.objects.minecraft.BlockPos; +import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.data.ArrayUtils; import gtPlusPlus.xmod.gregtech.api.gui.CONTAINER_SuperChest; import gtPlusPlus.xmod.gregtech.api.gui.GUI_SuperChest; @@ -73,6 +74,13 @@ public class GT_MetaTileEntity_ConnectableCrate extends GT_MetaTileEntity_Tiered public GT_MetaTileEntity_ConnectableCrate(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { super(aName, aTier, 3, aDescription, aTextures); } + + @Override + public String[] getDescription() { + return new String[]{ + this.mDescription, + CORE.GT_Tooltip}; + } public boolean isSimpleMachine() { return true; diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredChest.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredChest.java index bb46a0060d..951b4223dc 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredChest.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredChest.java @@ -12,7 +12,7 @@ import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachineBlock; import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_Utility; - +import gtPlusPlus.core.lib.CORE; import gtPlusPlus.xmod.gregtech.api.gui.CONTAINER_SuperChest; import gtPlusPlus.xmod.gregtech.api.gui.GUI_SuperChest; @@ -33,6 +33,13 @@ public class GT_MetaTileEntity_TieredChest extends GT_MetaTileEntity_TieredMachi /*public GT_MetaTileEntity_TieredChest(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, 3, aDescription, aTextures); }*/ + + @Override + public String[] getDescription() { + return new String[]{ + this.mDescription, + CORE.GT_Tooltip}; + } public boolean isSimpleMachine() { return true; diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredTank.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredTank.java index ad9876bcf0..ef7fe829d4 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredTank.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredTank.java @@ -29,13 +29,13 @@ public class GT_MetaTileEntity_TieredTank extends GT_MetaTileEntity_BasicTank { public String[] getDescription() { String[] aTip; - String aTankPortableness = CORE.GTNH ? "non-portable" : "portable"; + String aTankPortableness = "portable"; if (this.mFluid == null) { - aTip = new String[] {this.mDescription, "A "+aTankPortableness+" tank."}; + aTip = new String[] {this.mDescription, "A "+aTankPortableness+" tank.", CORE.GT_Tooltip}; } else { - aTip = new String[] {this.mDescription, "A "+aTankPortableness+" tank.", "Fluid: "+mFluid.getLocalizedName()+" "+mFluid.amount+"L"}; + aTip = new String[] {this.mDescription, "A "+aTankPortableness+" tank.", "Fluid: "+mFluid.getLocalizedName()+" "+mFluid.amount+"L", CORE.GT_Tooltip}; } return aTip; } @@ -146,7 +146,7 @@ public class GT_MetaTileEntity_TieredTank extends GT_MetaTileEntity_BasicTank { @Override public void setItemNBT(NBTTagCompound aNBT) { - if (CORE.NBT_PERSISTENCY_PATCH_APPLIED && !CORE.GTNH) { + if (CORE.NBT_PERSISTENCY_PATCH_APPLIED) { if (mFluid != null){ Logger.WARNING("Setting item fluid nbt"); aNBT.setTag("mFluid", mFluid.writeToNBT(new NBTTagCompound())); diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GregtechMetaEnergyBuffer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GregtechMetaEnergyBuffer.java index 4f0197c060..320e2175b0 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GregtechMetaEnergyBuffer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GregtechMetaEnergyBuffer.java @@ -38,7 +38,11 @@ public class GregtechMetaEnergyBuffer extends GregtechMetaTileEntity { @Override public String[] getDescription() { - return new String[] {this.mDescription, "Defaults 4A In/Out", "Change output Amperage with a screwdriver", "Now Portable!"}; + return new String[] {this.mDescription, + "Defaults 4A In/Out", + "Change output Amperage with a screwdriver", + "Now Portable!", + CORE.GT_Tooltip}; } @Override diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GregtechMetaSafeBlock.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GregtechMetaSafeBlock.java index b52ed040f4..63042d4702 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GregtechMetaSafeBlock.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GregtechMetaSafeBlock.java @@ -16,11 +16,6 @@ import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.machines public class GregtechMetaSafeBlock extends GregtechMetaSafeBlockBase { - @Override - public String[] getDescription() { - return new String[] {this.mDescription}; - } - public GregtechMetaSafeBlock(final int aID, final String aName, final String aNameRegional, final int aTier) { super(aID, aName, aNameRegional, aTier, 28, "Protecting your items from sticky fingers."); } @@ -32,6 +27,13 @@ extends GregtechMetaSafeBlockBase { public GregtechMetaSafeBlock(final String aName, final int aTier, final int aInvSlotCount, final String aDescription, final ITexture[][][] aTextures) { super(aName, aTier, aInvSlotCount, aDescription, aTextures); } + + @Override + public String[] getDescription() { + return new String[]{ + this.mDescription, + CORE.GT_Tooltip}; + } @Override public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/creative/GT_MetaTileEntity_InfiniteItemHolder.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/creative/GT_MetaTileEntity_InfiniteItemHolder.java index 529a0b79f6..fb37f33055 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/creative/GT_MetaTileEntity_InfiniteItemHolder.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/creative/GT_MetaTileEntity_InfiniteItemHolder.java @@ -7,7 +7,7 @@ import net.minecraft.item.ItemStack; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; - +import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.minecraft.PlayerUtils; import gtPlusPlus.core.util.sys.KeyboardUtils; import gtPlusPlus.xmod.gregtech.common.tileentities.storage.GT_MetaTileEntity_TieredChest; @@ -21,6 +21,13 @@ public class GT_MetaTileEntity_InfiniteItemHolder extends GT_MetaTileEntity_Tier public GT_MetaTileEntity_InfiniteItemHolder(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); } + + @Override + public String[] getDescription() { + return new String[]{ + this.mDescription, + CORE.GT_Tooltip}; + } @Override public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) { diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf.java index 43d5cffe82..43d5cffe82 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Compartment.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Compartment.java index 7dcb76a22e..7dcb76a22e 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Compartment.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Compartment.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Desk.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Desk.java index 2c7186a3ce..2c7186a3ce 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Desk.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Desk.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_FileCabinet.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_FileCabinet.java index 93bb7d5bb9..93bb7d5bb9 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_FileCabinet.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_FileCabinet.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Iron.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Iron.java index 606496501f..606496501f 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Iron.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Iron.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Large.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Large.java index cc17f49d83..cc17f49d83 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Large.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Large.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_AngelGrinder.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_AngleGrinder.java index 905164802c..27f118e363 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_AngelGrinder.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_AngleGrinder.java @@ -26,7 +26,7 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.IChatComponent; import net.minecraftforge.event.world.BlockEvent; -public class TOOL_Gregtech_AngelGrinder +public class TOOL_Gregtech_AngleGrinder extends GT_Tool { public static final List<String> mEffectiveList = Arrays.asList(new String[]{EntityIronGolem.class.getName(), "EntityTowerGuardian"}); @@ -162,7 +162,7 @@ extends GT_Tool { } public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) { - return !aIsToolHead + return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa : Materials.TungstenSteel.mRGBa; } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_Base.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_Base.java index 97f9a43187..97f9a43187 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_Base.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_Base.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_Choocher.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_Choocher.java index 1fd1e8241a..1fd1e8241a 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_Choocher.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_Choocher.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricButcherKnife.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricButcherKnife.java index 7aa7529817..7aa7529817 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricButcherKnife.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricButcherKnife.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricLighter.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricLighter.java index 395a7c42cb..395a7c42cb 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricLighter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricLighter.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricSnips.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricSnips.java index 3da1763634..2277ce339f 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricSnips.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricSnips.java @@ -1,6 +1,7 @@ package gtPlusPlus.xmod.gregtech.common.tools; import gregtech.GT_Mod; +import gregtech.api.enums.Materials; import gregtech.api.enums.Textures.ItemIcons; import gregtech.api.interfaces.IIconContainer; import gregtech.api.items.GT_MetaGenerated_Tool; @@ -70,9 +71,9 @@ extends GT_Tool_WireCutter { } public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) { - return !aIsToolHead + return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa - : GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa; + : Materials.TungstenSteel.mRGBa; } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/GT_Material_Loader.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/GT_Material_Loader.java index 4c8707e5e8..4c8707e5e8 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/GT_Material_Loader.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/GT_Material_Loader.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/Gregtech_Blocks.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/Gregtech_Blocks.java index e918d8015e..e918d8015e 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/Gregtech_Blocks.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/Gregtech_Blocks.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/ProcessingAngleGrinder.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingAngleGrinder.java index 51316f024a..51316f024a 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/ProcessingAngleGrinder.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingAngleGrinder.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricButcherKnife.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricButcherKnife.java index 9fe9ad7816..9fe9ad7816 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricButcherKnife.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricButcherKnife.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricLighter.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricLighter.java index 5f6c5a0427..5f6c5a0427 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricLighter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricLighter.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricSnips.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricSnips.java index dfcb7de4f8..dfcb7de4f8 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricSnips.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricSnips.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/ProcessingToolHeadChoocher.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingToolHeadChoocher.java index e4858f8cd1..e4858f8cd1 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/ProcessingToolHeadChoocher.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingToolHeadChoocher.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/Processing_Textures_Items.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/Processing_Textures_Items.java index ae559db232..ae559db232 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/Processing_Textures_Items.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/Processing_Textures_Items.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_AlloySmelter.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_AlloySmelter.java index 7754d039cf..7754d039cf 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_AlloySmelter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_AlloySmelter.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Assembler.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Assembler.java index d7244919d8..d7244919d8 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Assembler.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Assembler.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Base.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Base.java index 7e9153679f..7e9153679f 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Base.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Base.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java index 9e00ada163..9e58d486d3 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java @@ -131,13 +131,13 @@ public class RecipeGen_BlastSmelter extends RecipeGen_Base { //Generate Recipes for all singular materials that can be made molten. if (hasMoreInputThanACircuit){ if (M.requiresBlastFurnace()) { - if (CORE.RA.addBlastSmelterRecipe(tItemStackTest, M.getFluid(fluidAmount), 100, (duration/(mTotalPartsCounter > 0 ? mTotalPartsCounter : 1)), (int) aVoltage)){ + if (CORE.RA.addBlastSmelterRecipe(tItemStackTest, M.getFluidStack(fluidAmount), 100, (duration/(mTotalPartsCounter > 0 ? mTotalPartsCounter : 1)), (int) aVoltage)){ Logger.WARNING("[BAS] Success."); Logger.WARNING("[BAS] Success, Also added a Fluid solidifier recipe."); - if (GT_Values.RA.addFluidExtractionRecipe(M.getIngot(1), null, M.getFluid(144), 100, duration, 120)){ + if (GT_Values.RA.addFluidExtractionRecipe(M.getIngot(1), null, M.getFluidStack(144), 100, duration, 120)){ Logger.WARNING("[BAS] Success, Also added a Fluid Extractor recipe."); } - if (GT_Values.RA.addFluidExtractionRecipe(M.getNugget(1), null, M.getFluid(16), 100, duration/9, 120)){ + if (GT_Values.RA.addFluidExtractionRecipe(M.getNugget(1), null, M.getFluidStack(16), 100, duration/9, 120)){ Logger.WARNING("[BAS] Success, Also added a Fluid Extractor recipe."); } /*if (GT_Values.RA.addFluidExtractionRecipe(M.getSmallDust(1), null, M.getFluid(36), 100, duration/4, 120)){ @@ -153,14 +153,14 @@ public class RecipeGen_BlastSmelter extends RecipeGen_Base { } } else { - if (CORE.RA.addBlastSmelterRecipe(tItemStackTest, M.getFluid(fluidAmount), 100, duration/(mTotalPartsCounter > 0 ? mTotalPartsCounter : 1)/2, (int) aVoltage)){ + if (CORE.RA.addBlastSmelterRecipe(tItemStackTest, M.getFluidStack(fluidAmount), 100, duration/(mTotalPartsCounter > 0 ? mTotalPartsCounter : 1)/2, (int) aVoltage)){ Logger.WARNING("[BAS] Success."); - if (GT_Values.RA.addFluidSolidifierRecipe(ItemList.Shape_Mold_Ingot.get(0), M.getFluid(144), M.getIngot(1), duration/2, 60)){ + if (GT_Values.RA.addFluidSolidifierRecipe(ItemList.Shape_Mold_Ingot.get(0), M.getFluidStack(144), M.getIngot(1), duration/2, 60)){ Logger.WARNING("[BAS] Success, Also added a Fluid solidifier recipe."); - if (GT_Values.RA.addFluidExtractionRecipe(M.getIngot(1), null, M.getFluid(144), 100, duration/2, 60)){ + if (GT_Values.RA.addFluidExtractionRecipe(M.getIngot(1), null, M.getFluidStack(144), 100, duration/2, 60)){ Logger.WARNING("[BAS] Success, Also added a Fluid Extractor recipe."); } - if (GT_Values.RA.addFluidExtractionRecipe(M.getNugget(1), null, M.getFluid(16), 100, duration/2/9, 60)){ + if (GT_Values.RA.addFluidExtractionRecipe(M.getNugget(1), null, M.getFluidStack(16), 100, duration/2/9, 60)){ Logger.WARNING("[BAS] Success, Also added a Fluid Extractor recipe."); } /*if (GT_Values.RA.addFluidExtractionRecipe(M.getSmallDust(1), null, M.getFluid(36), 100, duration/2/4, 60)){ @@ -212,7 +212,7 @@ public class RecipeGen_BlastSmelter extends RecipeGen_Base { final int xr = r; if ((xr > 0) && (xr <= 100)){ final int mathmatics = (r*1000); - componentsFluid = FluidUtils.getFluidStack(M.getComposites().get(irc).getStackMaterial().getFluid(mathmatics), mathmatics); + componentsFluid = FluidUtils.getFluidStack(M.getComposites().get(irc).getStackMaterial().getFluidStack(mathmatics), mathmatics); } } else { @@ -254,7 +254,7 @@ public class RecipeGen_BlastSmelter extends RecipeGen_Base { //Adds Recipe if (M.requiresBlastFurnace()) { - if (CORE.RA.addBlastSmelterRecipe(components, componentsFluid, M.getFluid(fluidAmount), 100, duration, (int) aVoltage)){ + if (CORE.RA.addBlastSmelterRecipe(components, componentsFluid, M.getFluidStack(fluidAmount), 100, duration, (int) aVoltage)){ Logger.WARNING("[BAS] Success."); } else { @@ -262,7 +262,7 @@ public class RecipeGen_BlastSmelter extends RecipeGen_Base { } } else { - if (CORE.RA.addBlastSmelterRecipe(components, componentsFluid, M.getFluid(fluidAmount), 100, duration, (int) aVoltage/2)){ + if (CORE.RA.addBlastSmelterRecipe(components, componentsFluid, M.getFluidStack(fluidAmount), 100, duration, (int) aVoltage/2)){ Logger.WARNING("[BAS] Success."); } else { diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT_Ex.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT_Ex.java index e76b769ef6..141e75c8b5 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT_Ex.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT_Ex.java @@ -47,7 +47,7 @@ public class RecipeGen_BlastSmelterGT_Ex implements IOreRecipeRegistrator { if (aMaterial.mBlastFurnaceRequired) { addBlastRecipe(GT_Utility.copyAmount(1L, new Object[]{aStack}), null, null, null, aMaterial.mBlastFurnaceTemp > 1750 ? GT_OreDictUnificator.get(OrePrefixes.ingotHot, aMaterial.mSmeltInto, tDustStack, 1L) : GT_Utility.copyAmount(1L, new Object[]{tDustStack}), null, (int) Math.max(aMaterial.getMass() / 40L, 1L) * aMaterial.mBlastFurnaceTemp, 120, aMaterial); if (aMaterial.mBlastFurnaceTemp <= 1000) { - GT_ModHandler.addRCBlastFurnaceRecipe(GT_Utility.copyAmount(1L, new Object[]{aStack}), GT_Utility.copyAmount(1L, new Object[]{tDustStack}), aMaterial.mBlastFurnaceTemp); + //GT_ModHandler.addRCBlastFurnaceRecipe(GT_Utility.copyAmount(1L, new Object[]{aStack}), GT_Utility.copyAmount(1L, new Object[]{tDustStack}), aMaterial.mBlastFurnaceTemp); } } } @@ -83,8 +83,8 @@ public class RecipeGen_BlastSmelterGT_Ex implements IOreRecipeRegistrator { if (!aMaterial.contains(SubTag.NO_SMELTING)) { if ((aMaterial.mBlastFurnaceRequired) || (aMaterial.mDirectSmelting.mBlastFurnaceRequired)) { addBlastRecipe(GT_Utility.copyAmount(1L, new Object[]{aStack}), null, null, null, aMaterial.mBlastFurnaceTemp > 1750 ? GT_OreDictUnificator.get(OrePrefixes.ingotHot, aMaterial, GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L), 1L) : GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L), null, (int) Math.max(aMaterial.getMass() / 4L, 1L) * aMaterial.mBlastFurnaceTemp, 120, aMaterial); - if (aMaterial.mBlastFurnaceTemp <= 1000) - GT_ModHandler.addRCBlastFurnaceRecipe(GT_Utility.copyAmount(1L, new Object[]{aStack}), GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L), aMaterial.mBlastFurnaceTemp * 2); + //if (aMaterial.mBlastFurnaceTemp <= 1000) + //GT_ModHandler.addRCBlastFurnaceRecipe(GT_Utility.copyAmount(1L, new Object[]{aStack}), GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L), aMaterial.mBlastFurnaceTemp * 2); } } } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT_GTNH.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT_GTNH.java index 63c2d18783..63c2d18783 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT_GTNH.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT_GTNH.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java index a346464eeb..24c8eb488f 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java @@ -38,71 +38,72 @@ public class RecipeGen_DustGeneration extends RecipeGen_Base { this.toGenerate = M; this.disableOptional = O; mRecipeGenMap.add(this); - } - - @Override - public void run() { - generateRecipes(this.toGenerate, this.disableOptional); - } - - private void generateRecipes(final Material material, final boolean disableOptional){ - - Logger.WARNING("Generating Shaped Crafting recipes for "+material.getLocalizedName()); - - final ItemStack normalDust = material.getDust(1); - final ItemStack smallDust = material.getSmallDust(1); - final ItemStack tinyDust = material.getTinyDust(1); - - final ItemStack[] inputStacks = material.getMaterialComposites(); - final ItemStack outputStacks = material.getDust(material.smallestStackSizeWhenProcessing); - - - if (ItemUtils.checkForInvalidItems(tinyDust) && ItemUtils.checkForInvalidItems(normalDust)) { + final ItemStack normalDust = M.getDust(1); + final ItemStack smallDust = M.getSmallDust(1); + final ItemStack tinyDust = M.getTinyDust(1); + if (tinyDust != null && normalDust != null) { if (RecipeUtils.addShapedRecipe( - tinyDust, tinyDust, tinyDust, + tinyDust, tinyDust, tinyDust, tinyDust, tinyDust, tinyDust, tinyDust, tinyDust, tinyDust, normalDust)){ - Logger.WARNING("9 Tiny dust to 1 Dust Recipe: "+material.getLocalizedName()+" - Success"); + Logger.INFO("9 Tiny dust to 1 Dust Recipe: "+M.getLocalizedName()+" - Success"); } else { - Logger.WARNING("9 Tiny dust to 1 Dust Recipe: "+material.getLocalizedName()+" - Failed"); + Logger.INFO("9 Tiny dust to 1 Dust Recipe: "+M.getLocalizedName()+" - Failed"); } if (RecipeUtils.addShapedRecipe( normalDust, null, null, null, null, null, null, null, null, - material.getTinyDust(9))){ - Logger.WARNING("9 Tiny dust from 1 Recipe: "+material.getLocalizedName()+" - Success"); + M.getTinyDust(9))){ + Logger.INFO("9 Tiny dust from 1 Recipe: "+M.getLocalizedName()+" - Success"); } else { - Logger.WARNING("9 Tiny dust from 1 Recipe: "+material.getLocalizedName()+" - Failed"); + Logger.INFO("9 Tiny dust from 1 Recipe: "+M.getLocalizedName()+" - Failed"); } } - if (ItemUtils.checkForInvalidItems(smallDust) && ItemUtils.checkForInvalidItems(normalDust)) { + if (smallDust != null && normalDust != null) { if (RecipeUtils.addShapedRecipe( smallDust, smallDust, null, smallDust, smallDust, null, null, null, null, normalDust)){ - Logger.WARNING("4 Small dust to 1 Dust Recipe: "+material.getLocalizedName()+" - Success"); + Logger.INFO("4 Small dust to 1 Dust Recipe: "+M.getLocalizedName()+" - Success"); } else { - Logger.WARNING("4 Small dust to 1 Dust Recipe: "+material.getLocalizedName()+" - Failed"); + Logger.INFO("4 Small dust to 1 Dust Recipe: "+M.getLocalizedName()+" - Failed"); } if (RecipeUtils.addShapedRecipe( null, normalDust, null, null, null, null, null, null, null, - material.getSmallDust(4))){ - Logger.WARNING("4 Small dust from 1 Dust Recipe: "+material.getLocalizedName()+" - Success"); + M.getSmallDust(4))){ + Logger.INFO("4 Small dust from 1 Dust Recipe: "+M.getLocalizedName()+" - Success"); } else { - Logger.WARNING("4 Small dust from 1 Dust Recipe: "+material.getLocalizedName()+" - Failed"); + Logger.INFO("4 Small dust from 1 Dust Recipe: "+M.getLocalizedName()+" - Failed"); } } + } + + @Override + public void run() { + generateRecipes(this.toGenerate, this.disableOptional); + } + + private void generateRecipes(final Material material, final boolean disableOptional){ + + Logger.INFO("Generating Shaped Crafting recipes for "+material.getLocalizedName()); + + final ItemStack normalDust = material.getDust(1); + final ItemStack smallDust = material.getSmallDust(1); + final ItemStack tinyDust = material.getTinyDust(1); + + final ItemStack[] inputStacks = material.getMaterialComposites(); + final ItemStack outputStacks = material.getDust(material.smallestStackSizeWhenProcessing); //Macerate blocks back to dusts. final ItemStack materialBlock = material.getBlock(1); @@ -192,7 +193,7 @@ public class RecipeGen_DustGeneration extends RecipeGen_Base { if (x.getStackMaterial() != null){ if (x.getStackMaterial().getDust(1) == null){ if (x.getStackMaterial().getState() != MaterialState.SOLID && x.getStackMaterial().getState() != MaterialState.ORE && x.getStackMaterial().getState() != MaterialState.PLASMA){ - oxygen = x.getStackMaterial().getFluid(1000); + oxygen = x.getStackMaterial().getFluidStack(1000); break; } } @@ -297,8 +298,8 @@ public class RecipeGen_DustGeneration extends RecipeGen_Base { if (x.getStackMaterial() != null){ if (x.getStackMaterial().getDust(1) == null){ MaterialState f = x.getStackMaterial().getState(); - if (f == MaterialState.GAS || f == MaterialState.LIQUID || f == MaterialState.PURE_LIQUID){ - oxygen = x.getStackMaterial().getFluid((int) (material.vSmallestRatio[compSlot] * 1000)); + if (f == MaterialState.GAS || f == MaterialState.LIQUID || f == MaterialState.PURE_LIQUID || f == MaterialState.PURE_GAS){ + oxygen = x.getStackMaterial().getFluidStack((int) (material.vSmallestRatio[compSlot] * 1000)); } } } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Extruder.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Extruder.java index cd43d6201c..cd43d6201c 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Extruder.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Extruder.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_FluidCanning.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_FluidCanning.java index 9fe86985f4..9fe86985f4 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_FluidCanning.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_FluidCanning.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java index 3c74c4166d..e87fc08c90 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java @@ -41,8 +41,8 @@ public class RecipeGen_Fluids extends RecipeGen_Base { } // Melting Shapes to fluid - if (material.getFluid(1) != null - && !material.getFluid(1).getUnlocalizedName().toLowerCase().contains("plasma")) { + if (material.getFluidStack(1) != null + && !material.getFluidStack(1).getUnlocalizedName().toLowerCase().contains("plasma")) { if (!material.requiresBlastFurnace()) { @@ -50,7 +50,7 @@ public class RecipeGen_Fluids extends RecipeGen_Base { if (ItemUtils.checkForInvalidItems(material.getIngot(1))) if (CORE.RA.addFluidExtractionRecipe( material.getIngot(1), // Input - material.getFluid(144), // Fluid Output + material.getFluidStack(144), // Fluid Output 1 * 20, // Duration material.vVoltageMultiplier // Eu Tick )) { @@ -65,7 +65,7 @@ public class RecipeGen_Fluids extends RecipeGen_Base { if (ItemUtils.checkForInvalidItems(material.getPlate(1))) if (CORE.RA.addFluidExtractionRecipe( material.getPlate(1), // Input - material.getFluid(144), // Fluid Output + material.getFluidStack(144), // Fluid Output 1 * 20, // Duration material.vVoltageMultiplier // Eu Tick )) { @@ -80,7 +80,7 @@ public class RecipeGen_Fluids extends RecipeGen_Base { if (ItemUtils.checkForInvalidItems(material.getPlateDouble(1))) if (CORE.RA.addFluidExtractionRecipe( material.getPlateDouble(1), // Input - material.getFluid(288), // Fluid Output + material.getFluidStack(288), // Fluid Output 1 * 20, // Duration material.vVoltageMultiplier // Eu Tick )) { @@ -95,7 +95,7 @@ public class RecipeGen_Fluids extends RecipeGen_Base { if (ItemUtils.checkForInvalidItems(material.getNugget(1))) if (CORE.RA.addFluidExtractionRecipe( material.getNugget(1), // Input - material.getFluid(16), // Fluid Output + material.getFluidStack(16), // Fluid Output 16, // Duration material.vVoltageMultiplier // Eu Tick )) { @@ -110,7 +110,7 @@ public class RecipeGen_Fluids extends RecipeGen_Base { if (ItemUtils.checkForInvalidItems(material.getBlock(1))) if (CORE.RA.addFluidExtractionRecipe( material.getBlock(1), // Input - material.getFluid(144 * 9), // Fluid Output + material.getFluidStack(144 * 9), // Fluid Output 288, // Duration material.vVoltageMultiplier // Eu Tick )) { @@ -128,7 +128,7 @@ public class RecipeGen_Fluids extends RecipeGen_Base { // Ingot if (ItemUtils.checkForInvalidItems(material.getIngot(1))) if (GT_Values.RA.addFluidSolidifierRecipe(ItemList.Shape_Mold_Ingot.get(0), // Item Shape - material.getFluid(144), // Fluid Input + material.getFluidStack(144), // Fluid Input material.getIngot(1), // output 32, // Duration material.vVoltageMultiplier // Eu Tick @@ -143,7 +143,7 @@ public class RecipeGen_Fluids extends RecipeGen_Base { // Plate if (ItemUtils.checkForInvalidItems(material.getPlate(1))) if (GT_Values.RA.addFluidSolidifierRecipe(ItemList.Shape_Mold_Plate.get(0), // Item Shape - material.getFluid(144), // Fluid Input + material.getFluidStack(144), // Fluid Input material.getPlate(1), // output 32, // Duration material.vVoltageMultiplier // Eu Tick @@ -158,7 +158,7 @@ public class RecipeGen_Fluids extends RecipeGen_Base { // Nugget if (ItemUtils.checkForInvalidItems(material.getNugget(1))) if (GT_Values.RA.addFluidSolidifierRecipe(ItemList.Shape_Mold_Nugget.get(0), // Item Shape - material.getFluid(16), // Fluid Input + material.getFluidStack(16), // Fluid Input material.getNugget(1), // output 16, // Duration material.vVoltageMultiplier // Eu Tick @@ -173,7 +173,7 @@ public class RecipeGen_Fluids extends RecipeGen_Base { // Gears if (ItemUtils.checkForInvalidItems(material.getGear(1))) if (GT_Values.RA.addFluidSolidifierRecipe(ItemList.Shape_Mold_Gear.get(0), // Item Shape - material.getFluid(576), // Fluid Input + material.getFluidStack(576), // Fluid Input material.getGear(1), // output 128, // Duration material.vVoltageMultiplier // Eu Tick @@ -187,7 +187,7 @@ public class RecipeGen_Fluids extends RecipeGen_Base { // Blocks if (ItemUtils.checkForInvalidItems(material.getBlock(1))) if (GT_Values.RA.addFluidSolidifierRecipe(ItemList.Shape_Mold_Block.get(0), // Item Shape - material.getFluid(144 * 9), // Fluid Input + material.getFluidStack(144 * 9), // Fluid Input material.getBlock(1), // output 288, // Duration material.vVoltageMultiplier // Eu Tick @@ -219,7 +219,7 @@ public class RecipeGen_Fluids extends RecipeGen_Base { // Rod if (ItemUtils.checkForInvalidItems(material.getRod(1))) if (mold_Rod != null && GT_Values.RA.addFluidSolidifierRecipe(mold_Rod.get(0), // Item Shape - material.getFluid(72), // Fluid Input + material.getFluidStack(72), // Fluid Input material.getRod(1), // output 150, // Duration material.vVoltageMultiplier // Eu Tick @@ -235,7 +235,7 @@ public class RecipeGen_Fluids extends RecipeGen_Base { if (ItemUtils.checkForInvalidItems(material.getLongRod(1))) if (mold_Rod_Long != null && GT_Values.RA.addFluidSolidifierRecipe(mold_Rod_Long.get(0), // Item // Shape - material.getFluid(144), // Fluid Input + material.getFluidStack(144), // Fluid Input material.getLongRod(1), // output 300, // Duration material.vVoltageMultiplier // Eu Tick @@ -250,7 +250,7 @@ public class RecipeGen_Fluids extends RecipeGen_Base { // Bolt if (ItemUtils.checkForInvalidItems(material.getBolt(1))) if (mold_Bolt != null && GT_Values.RA.addFluidSolidifierRecipe(mold_Bolt.get(0), // Item Shape - material.getFluid(18), // Fluid Input + material.getFluidStack(18), // Fluid Input material.getBolt(1), // output 50, // Duration material.vVoltageMultiplier // Eu Tick @@ -265,7 +265,7 @@ public class RecipeGen_Fluids extends RecipeGen_Base { // Screw if (ItemUtils.checkForInvalidItems(material.getScrew(1))) if (mold_Screw != null && GT_Values.RA.addFluidSolidifierRecipe(mold_Screw.get(0), // Item Shape - material.getFluid(18), // Fluid Input + material.getFluidStack(18), // Fluid Input material.getScrew(1), // output 50, // Duration material.vVoltageMultiplier // Eu Tick @@ -280,7 +280,7 @@ public class RecipeGen_Fluids extends RecipeGen_Base { // Ring if (ItemUtils.checkForInvalidItems(material.getRing(1))) if (mold_Ring != null && GT_Values.RA.addFluidSolidifierRecipe(mold_Ring.get(0), // Item Shape - material.getFluid(36), // Fluid Input + material.getFluidStack(36), // Fluid Input material.getRing(1), // output 100, // Duration material.vVoltageMultiplier // Eu Tick diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluorite.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluorite.java new file mode 100644 index 0000000000..b285d41652 --- /dev/null +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluorite.java @@ -0,0 +1,224 @@ +package gtPlusPlus.xmod.gregtech.loaders; + +import java.util.HashSet; +import java.util.Set; + +import gregtech.api.enums.GT_Values; +import gregtech.api.util.GT_ModHandler; +import gtPlusPlus.api.interfaces.RunnableWithInfo; +import gtPlusPlus.api.objects.Logger; +import gtPlusPlus.api.objects.data.AutoMap; +import gtPlusPlus.api.objects.data.Pair; +import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.material.Material; +import gtPlusPlus.core.material.MaterialGenerator; +import gtPlusPlus.core.material.MaterialStack; +import gtPlusPlus.core.material.nuclear.FLUORIDES; +import gtPlusPlus.core.material.state.MaterialState; +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.RecipeUtils; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; + +public class RecipeGen_Fluorite extends RecipeGen_Base { + + public final static Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<RunnableWithInfo<Material>>(); + + static { + MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap); + } + + public RecipeGen_Fluorite(final Material material){ + this.toGenerate = material; + mRecipeGenMap.add(this); + + + /** + * Shaped Crafting + */ + RecipeUtils.addShapedRecipe( + CI.craftingToolHammer_Hard, null, null, + material.getCrushedPurified(1), null, null, + null, null, null, + material.getDustPurified(1)); + + RecipeUtils.addShapedRecipe( + CI.craftingToolHammer_Hard, null, null, + material.getCrushed(1), null, null, + null, null, null, + material.getDustImpure(1)); + + RecipeUtils.addShapedRecipe( + CI.craftingToolHammer_Hard, null, null, + material.getCrushedCentrifuged(1), null, null, + null, null, null, + material.getDust(1)); + + + + final ItemStack normalDust = material.getDust(1); + final ItemStack smallDust = material.getSmallDust(1); + final ItemStack tinyDust = material.getTinyDust(1); + + if (RecipeUtils.addShapedRecipe( + tinyDust, tinyDust, tinyDust, + tinyDust, tinyDust, tinyDust, + tinyDust, tinyDust, tinyDust, + normalDust)){ + Logger.WARNING("9 Tiny dust to 1 Dust Recipe: "+material.getLocalizedName()+" - Success"); + } + else { + Logger.WARNING("9 Tiny dust to 1 Dust Recipe: "+material.getLocalizedName()+" - Failed"); + } + + if (RecipeUtils.addShapedRecipe( + normalDust, null, null, + null, null, null, + null, null, null, + material.getTinyDust(9))){ + Logger.WARNING("9 Tiny dust from 1 Recipe: "+material.getLocalizedName()+" - Success"); + } + else { + Logger.WARNING("9 Tiny dust from 1 Recipe: "+material.getLocalizedName()+" - Failed"); + } + + if (RecipeUtils.addShapedRecipe( + smallDust, smallDust, null, + smallDust, smallDust, null, + null, null, null, + normalDust)){ + Logger.WARNING("4 Small dust to 1 Dust Recipe: "+material.getLocalizedName()+" - Success"); + } + else { + Logger.WARNING("4 Small dust to 1 Dust Recipe: "+material.getLocalizedName()+" - Failed"); + } + + if (RecipeUtils.addShapedRecipe( + null, normalDust, null, + null, null, null, + null, null, null, + material.getSmallDust(4))){ + Logger.WARNING("4 Small dust from 1 Dust Recipe: "+material.getLocalizedName()+" - Success"); + } + else { + Logger.WARNING("4 Small dust from 1 Dust Recipe: "+material.getLocalizedName()+" - Failed"); + } + } + + @Override + public void run() { + generateRecipes(this.toGenerate); + } + + public static void generateRecipes(final Material material){ + + int tVoltageMultiplier = MaterialUtils.getVoltageForTier(material.vTier); + + final ItemStack dustStone = ItemUtils.getItemStackOfAmountFromOreDict("dustStone", 1); + + + ItemStack tinyDustA = FLUORIDES.FLUORITE.getTinyDust(1); + ItemStack tinyDustB = FLUORIDES.FLUORITE.getTinyDust(1); + ItemStack matDust = FLUORIDES.FLUORITE.getDust(1); + ItemStack matDustA = FLUORIDES.FLUORITE.getDust(1); + + /** + * Package + */ + //Allow ore dusts to be packaged + if (ItemUtils.checkForInvalidItems(material.getSmallDust(1)) && ItemUtils.checkForInvalidItems(material.getTinyDust(1))) { + RecipeGen_DustGeneration.generatePackagerRecipes(material); + } + + + /** + * Macerate + */ + //Macerate ore to Crushed + if (GT_Values.RA.addPulveriserRecipe(material.getOre(1), new ItemStack[]{material.getCrushed(2)}, new int[]{10000}, 20*20, tVoltageMultiplier/2)){ + Logger.MATERIALS("[Macerator] Added Recipe: 'Macerate ore to Crushed ore'"); + } + //Macerate Centrifuged to Pure Dust + if (GT_Values.RA.addPulveriserRecipe(material.getCrushedCentrifuged(1), new ItemStack[]{matDust, matDustA}, new int[]{10000, 1000}, 20*20, tVoltageMultiplier/2)){ + Logger.MATERIALS("[Macerator] Added Recipe: 'Macerate Centrifuged ore to Pure Dust'"); + } + if (GT_ModHandler.addThermalCentrifugeRecipe(material.getCrushedPurified(1), (int) Math.min(5000L, Math.abs(material.getMass() * 20L)), material.getCrushedCentrifuged(1), tinyDustA, dustStone)){ + Logger.MATERIALS("[ThermalCentrifuge] Added Recipe: 'Washed ore to Centrifuged Ore' | Input: "+material.getCrushedPurified(1).getDisplayName()+" | Outputs: "+material.getCrushedCentrifuged(1).getDisplayName()+", "+tinyDustA.getDisplayName()+", "+dustStone.getDisplayName()+"."); + } + + GT_Values.RA.addChemicalBathRecipe( + FLUORIDES.FLUORITE.getCrushed(2), + FluidUtils.getFluidStack("hydrogen", 2000), + FLUORIDES.FLUORITE.getCrushedPurified(8), + FLUORIDES.FLUORITE.getDustImpure(4), + FLUORIDES.FLUORITE.getDustPurified(2), + new int[] { 10000, 5000, 1000 }, + 30 * 20, + 240); + + /** + * Forge Hammer + */ + if (GT_Values.RA.addForgeHammerRecipe(material.getCrushedCentrifuged(1), matDust, 10, tVoltageMultiplier/4)){ + Logger.MATERIALS("[ForgeHammer] Added Recipe: 'Crushed Centrifuged to Pure Dust'"); + } + + /** + * Centrifuge + */ + //Purified Dust to Clean + if (GT_Values.RA.addCentrifugeRecipe( + material.getDustPurified(1), null, + null, //In Fluid + null, //Out Fluid + matDust, tinyDustA,null, + null, null,null, + new int[]{10000, 10000}, //Chances + (int) Math.max(1L, material.getMass() * 8L), //Time + tVoltageMultiplier/2)){ //Eu + Logger.MATERIALS("[Centrifuge] Added Recipe: Purified Dust to Clean Dust"); + } + + //Impure Dust to Clean + if (GT_Values.RA.addCentrifugeRecipe( + material.getDustImpure(1), null, + null, //In Fluid + null, //Out Fluid + matDust, tinyDustB,null, + null, null,null, + new int[]{10000, 10000}, //Chances + (int) Math.max(1L, material.getMass() * 8L), //Time + tVoltageMultiplier/2)){ //Eu + Logger.MATERIALS("[Centrifuge] Added Recipe: Inpure Dust to Clean Dust"); + } + + // CaF2 + H2SO4 → CaSO4(solid) + 2 HF + FluidStack aGregtechHydro = FluidUtils.getFluidStack("hydrofluoricacid_gt5u", 16000); + if (aGregtechHydro == null) { + aGregtechHydro = FluidUtils.getFluidStack("hydrofluoricacid", 16000); + } + + CORE.RA.addDehydratorRecipe( + new ItemStack[] { + CI.getNumberedAdvancedCircuit(5), + FLUORIDES.FLUORITE.getDust(37), + }, + FluidUtils.getFluidStack("sulfuricacid", 8000), + aGregtechHydro, // Fluid output (slot 2) + new ItemStack[] { + ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumSulfate", 15), + ItemUtils.getItemStackOfAmountFromOreDict("dustSilver", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustGold", 2), + ItemUtils.getItemStackOfAmountFromOreDict("dustTin", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 2) + }, + new int[] { 10000, 1000, 1000, 3000, 2000 }, + 10 * 60 * 20, + 240); // EU + + } + +} diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MaterialProcessing.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MaterialProcessing.java index 90bd1d8f1a..92d7f73ba4 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MaterialProcessing.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MaterialProcessing.java @@ -3,12 +3,7 @@ package gtPlusPlus.xmod.gregtech.loaders; import java.util.HashSet; import java.util.Set; -import net.minecraft.item.ItemStack; - -import gregtech.api.GregTech_API; import gregtech.api.enums.GT_Values; -import gregtech.api.util.GT_Recipe; - import gtPlusPlus.api.interfaces.RunnableWithInfo; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; @@ -18,7 +13,9 @@ import gtPlusPlus.core.material.Material; import gtPlusPlus.core.material.MaterialGenerator; import gtPlusPlus.core.material.MaterialStack; import gtPlusPlus.core.material.state.MaterialState; +import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.minecraft.ItemUtils; +import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; public class RecipeGen_MaterialProcessing extends RecipeGen_Base { @@ -29,16 +26,24 @@ public class RecipeGen_MaterialProcessing extends RecipeGen_Base { } public RecipeGen_MaterialProcessing(final Material M){ - this.toGenerate = M; + this(M, false); + } + + public RecipeGen_MaterialProcessing(final Material M, final boolean O){ + this.toGenerate = M; + this.disableOptional = O; mRecipeGenMap.add(this); } @Override public void run() { - generateRecipes(this.toGenerate); + generateRecipes(this.toGenerate, this.disableOptional); } - private void generateRecipes(final Material material){ + private void generateRecipes(final Material material, final boolean disableOptional){ + if (disableOptional) { + return; + } if (material.getMaterialComposites().length > 1){ Logger.MATERIALS("[Recipe Generator Debug] ["+material.getLocalizedName()+"]"); @@ -64,7 +69,7 @@ public class RecipeGen_MaterialProcessing extends RecipeGen_Base { /** - * Electrolyzer + * Centrifuge */ //Process Dust @@ -78,14 +83,14 @@ public class RecipeGen_MaterialProcessing extends RecipeGen_Base { int mCounter = 0; for (Pair<Integer, Material> f : componentMap){ if (f.getValue().getState() != MaterialState.SOLID){ - Logger.MATERIALS("[Electrolyzer] Found Fluid Component, adding "+f.getKey()+" cells of "+f.getValue().getLocalizedName()+"."); + Logger.MATERIALS("[Centrifuge] Found Fluid Component, adding "+f.getKey()+" cells of "+f.getValue().getLocalizedName()+"."); mInternalOutputs[mCounter++] = f.getValue().getCell(f.getKey()); mCellCount += f.getKey(); mTotalCount += f.getKey(); - Logger.MATERIALS("[Electrolyzer] In total, adding "+mCellCount+" cells for "+material.getLocalizedName()+" processing."); + Logger.MATERIALS("[Centrifuge] In total, adding "+mCellCount+" cells for "+material.getLocalizedName()+" processing."); } else { - Logger.MATERIALS("[Electrolyzer] Found Solid Component, adding "+f.getKey()+" dusts of "+f.getValue().getLocalizedName()+"."); + Logger.MATERIALS("[Centrifuge] Found Solid Component, adding "+f.getKey()+" dusts of "+f.getValue().getLocalizedName()+"."); mInternalOutputs[mCounter++] = f.getValue().getDust(f.getKey()); mTotalCount += f.getKey(); } @@ -93,38 +98,38 @@ public class RecipeGen_MaterialProcessing extends RecipeGen_Base { //Build Output Array for (int g=0;g<mInternalOutputs.length;g++){ - Logger.MATERIALS("[Electrolyzer] Is output["+g+"] valid with a chance? "+(mInternalOutputs[g] != null ? 10000 : 0)); + Logger.MATERIALS("[Centrifuge] Is output["+g+"] valid with a chance? "+(mInternalOutputs[g] != null ? 10000 : 0)); mChances[g] = (mInternalOutputs[g] != null ? 10000 : 0); } ItemStack emptyCell = null; if (mCellCount > 0){ emptyCell = ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", mCellCount); - Logger.MATERIALS("[Electrolyzer] Recipe now requires "+mCellCount+" empty cells as input."); + Logger.MATERIALS("[Centrifuge] Recipe now requires "+mCellCount+" empty cells as input."); } ItemStack mainDust = material.getDust(material.smallestStackSizeWhenProcessing); if (mainDust != null){ - Logger.MATERIALS("[Electrolyzer] Recipe now requires "+material.smallestStackSizeWhenProcessing+"x "+mainDust.getDisplayName()+" as input."); + Logger.MATERIALS("[Centrifuge] Recipe now requires "+material.smallestStackSizeWhenProcessing+"x "+mainDust.getDisplayName()+" as input."); } else { mainDust = material.getDust(mTotalCount); - Logger.MATERIALS("[Electrolyzer] Could not find valid input dust, trying alternative."); + Logger.MATERIALS("[Centrifuge] Could not find valid input dust, trying alternative."); if (mainDust != null){ - Logger.MATERIALS("[Electrolyzer] Recipe now requires "+mTotalCount+"x "+mainDust.getDisplayName()+" as input."); + Logger.MATERIALS("[Centrifuge] Recipe now requires "+mTotalCount+"x "+mainDust.getDisplayName()+" as input."); } else { - Logger.MATERIALS("[Electrolyzer] Could not find valid input dust, exiting."); + Logger.MATERIALS("[Centrifuge] Could not find valid input dust, exiting."); } } for (int j=0;j<mInternalOutputs.length;j++){ if (mInternalOutputs[j] == null){ mInternalOutputs[j] = GT_Values.NI; - Logger.MATERIALS("[Electrolyzer] Set slot "+j+" to null."); + Logger.MATERIALS("[Centrifuge] Set slot "+j+" to null."); } else { - Logger.MATERIALS("[Electrolyzer] Set slot "+j+" to "+mInternalOutputs[j].getDisplayName()+"."); + Logger.MATERIALS("[Centrifuge] Set slot "+j+" to "+mInternalOutputs[j].getDisplayName()+"."); } } @@ -143,10 +148,10 @@ public class RecipeGen_MaterialProcessing extends RecipeGen_Base { mChances, 20*1*(tVoltageMultiplier/10), tVoltageMultiplier)){ - Logger.MATERIALS("[Electrolyzer] Generated Electrolyzer recipe for "+material.getDust(1).getDisplayName()); + Logger.MATERIALS("[Centrifuge] Generated Centrifuge recipe for "+material.getDust(1).getDisplayName()); } else { - Logger.MATERIALS("[Electrolyzer] Failed to generate Electrolyzer recipe for "+material.getDust(1).getDisplayName()); + Logger.MATERIALS("[Centrifuge] Failed to generate Centrifuge recipe for "+material.getDust(1).getDisplayName()); } } catch(Throwable t){ @@ -186,7 +191,7 @@ public class RecipeGen_MaterialProcessing extends RecipeGen_Base { ItemStack emptyCell = null; if (mCellCount > 0){ - emptyCell = ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", mCellCount); + emptyCell = CI.emptyCells(mCellCount); Logger.MATERIALS("[Dehydrator] Recipe now requires "+mCellCount+" empty cells as input."); } @@ -251,23 +256,5 @@ public class RecipeGen_MaterialProcessing extends RecipeGen_Base { public static boolean addCentrifgeRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput1, ItemStack aOutput2, ItemStack aOutput3, ItemStack aOutput4, ItemStack aOutput5, ItemStack aOutput6, int[] aChances, int aDuration, int aEUt) { return GT_Values.RA.addCentrifugeRecipe(aInput1, aInput2, aFluidInput, aFluidOutput, aOutput1, aOutput2, aOutput3, aOutput4, aOutput5, aOutput6, aChances, aDuration, aEUt); } - - public static boolean addElectrolyzerRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput1, ItemStack aOutput2, ItemStack aOutput3, ItemStack aOutput4, ItemStack aOutput5, ItemStack aOutput6, int[] aChances, int aDuration, int aEUt) { - if (((aInput1 == null) && (aFluidInput == null)) || ((aOutput1 == null) && (aFluidOutput == null))) { - Logger.MATERIALS("[Electrolyzer] Either both inputs or outputs are null."); - return false; - } - if ((aInput1 != null) && ((aDuration = GregTech_API.sRecipeFile.get("electrolyzer", aInput1, aDuration)) <= 0)) { - Logger.MATERIALS("[Electrolyzer] Fail 1."); - return false; - } - if ((aFluidInput != null) && ((aDuration = GregTech_API.sRecipeFile.get("electrolyzer", aFluidInput.getFluid().getName(), aDuration)) <= 0)) { - Logger.MATERIALS("[Electrolyzer] Fail 2."); - return false; - } - GT_Recipe.GT_Recipe_Map.sElectrolyzerRecipes.addRecipe(true, new ItemStack[]{aInput1, aInput2}, new ItemStack[]{aOutput1, aOutput2, aOutput3, aOutput4, aOutput5, aOutput6}, null, aChances, new FluidStack[]{aFluidInput}, new FluidStack[]{aFluidOutput}, aDuration, aEUt, 0); - Logger.MATERIALS("[Electrolyzer] Recipe added."); - return true; - } - + } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MetalRecipe.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MetalRecipe.java new file mode 100644 index 0000000000..830fae78ab --- /dev/null +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MetalRecipe.java @@ -0,0 +1,119 @@ +package gtPlusPlus.xmod.gregtech.loaders; + +import gregtech.api.enums.GT_Values; +import gregtech.api.util.GT_ModHandler; +import gtPlusPlus.api.interfaces.RunnableWithInfo; +import gtPlusPlus.api.objects.Logger; +import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.material.Material; +import gtPlusPlus.core.material.MaterialGenerator; +import gtPlusPlus.core.util.minecraft.ItemUtils; + +import java.util.HashSet; +import java.util.Set; + +public class RecipeGen_MetalRecipe extends RecipeGen_Base { + + public final static Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<RunnableWithInfo<Material>>(); + static { + MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap); + } + + public RecipeGen_MetalRecipe(final Material M){ + this.toGenerate = M; + mRecipeGenMap.add(this); + } + + @Override + public void run() { + generateRecipes(this.toGenerate); + } + + private void generateRecipes(final Material material) { + + Logger.WARNING("Generating Metal recipes for "+material.getLocalizedName()); + if (ItemUtils.checkForInvalidItems(material.getIngot(1)) && ItemUtils.checkForInvalidItems(material.getBlock(1))) + if (GT_ModHandler.addCompressionRecipe( + material.getIngot(9), + material.getBlock(1) + )){ + Logger.WARNING("Compress Block Recipe: "+material.getLocalizedName()+" - Success"); + } + else { + Logger.WARNING("Compress Block Recipe: "+material.getLocalizedName()+" - Failed"); + } + + if (ItemUtils.checkForInvalidItems(material.getIngot(1)) && ItemUtils.checkForInvalidItems(material.getRod(1))) + if (GT_Values.RA.addLatheRecipe( + material.getIngot(1), + material.getRod(1), + material.getSmallDust(2), + (int) Math.max(material.getMass() / 8L, 1L), + material.vVoltageMultiplier)){ + Logger.WARNING("Lathe Rod Recipe: "+material.getLocalizedName()+" - Success"); + } + else { + Logger.WARNING("Lathe Rod Recipe: "+material.getLocalizedName()+" - Failed"); + } + + if (ItemUtils.checkForInvalidItems(material.getRod(1)) && ItemUtils.checkForInvalidItems(material.getBolt(1))) + if (GT_Values.RA.addCutterRecipe( + material.getRod(1), + material.getBolt(4), + null, + (int) Math.max(material.getMass() * 2L, 1L), + material.vVoltageMultiplier)){ + Logger.WARNING("Cut Bolt Recipe: "+material.getLocalizedName()+" - Success"); + } + else { + Logger.WARNING("Cut Bolt Recipe: "+material.getLocalizedName()+" - Failed"); + } + + if (ItemUtils.checkForInvalidItems(material.getIngot(1)) && ItemUtils.checkForInvalidItems(material.getHotIngot(1))) + if (CORE.RA.addVacuumFreezerRecipe( + material.getHotIngot(1), + material.getIngot(1), + (int) Math.max(material.getMass() * 3L, 1L), + material.vVoltageMultiplier) + ){ + Logger.WARNING("Cool Hot Ingot Recipe: "+material.getLocalizedName()+" - Success"); + } + else { + Logger.WARNING("Cool Hot Ingot Recipe: "+material.getLocalizedName()+" - Failed"); + } + + if (ItemUtils.checkForInvalidItems(material.getRod(1)) && ItemUtils.checkForInvalidItems(material.getLongRod(1))) { + if (GT_Values.RA.addForgeHammerRecipe( + material.getRod(2), + material.getLongRod(1), + (int) Math.max(material.getMass(), 1L), + 16)){ + Logger.WARNING("Hammer Long Rod Recipe: "+material.getLocalizedName()+" - Success"); + } + else { + Logger.WARNING("Hammer Long Rod Recipe: "+material.getLocalizedName()+" - Failed"); + } + + GT_Values.RA.addCutterRecipe( + material.getLongRod(1), + material.getRod(2), + null, + (int) Math.max(material.getMass(), 1L), + 4); + } + + if (ItemUtils.checkForInvalidItems(material.getBolt(1)) && ItemUtils.checkForInvalidItems(material.getScrew(1))) + if (GT_Values.RA.addLatheRecipe( + material.getBolt(1), + material.getScrew(1), + null, + (int) Math.max(material.getMass() / 8L, 1L), + 4)){ + Logger.WARNING("Lathe Screw Recipe: "+material.getLocalizedName()+" - Success"); + } + else { + Logger.WARNING("Lathe Screw Recipe: "+material.getLocalizedName()+" - Failed"); + } + + } +}
\ No newline at end of file diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MultisUsingFluidInsteadOfCells.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MultisUsingFluidInsteadOfCells.java index 90d7aaa806..a76322e4f4 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MultisUsingFluidInsteadOfCells.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MultisUsingFluidInsteadOfCells.java @@ -151,6 +151,11 @@ public class RecipeGen_MultisUsingFluidInsteadOfCells { for (int i = 0; i < aOutputFluidsMap.size(); i++) { aNewFluidOutputs[i] = aOutputFluidsMap.get(i); } + + if (!ItemUtils.checkForInvalidItems(aNewItemInputs, aNewItemOutputs)) { + aInvalidRecipesToConvert++; + continue recipe; // Skip this recipe entirely if we find an item we don't like + } // Add Recipe to map GT_Recipe aNewRecipe = new GTPP_Recipe( diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java index b7043b5983..f3ff935d6e 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java @@ -33,20 +33,25 @@ public class RecipeGen_Ore extends RecipeGen_Base { static { MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap); } - + public RecipeGen_Ore(final Material M){ + this(M, false); + } + + public RecipeGen_Ore(final Material M, final boolean O){ this.toGenerate = M; + this.disableOptional = O; mRecipeGenMap.add(this); } @Override public void run() { - generateRecipes(this.toGenerate); + generateRecipes(this.toGenerate, this.disableOptional); } private static Material mStone; - public static void generateRecipes(final Material material){ + private void generateRecipes(final Material material, final boolean disableOptional){ if (mStone == null) { mStone = MaterialUtils.generateMaterialFromGtENUM(Materials.Stone); @@ -225,13 +230,13 @@ public class RecipeGen_Ore extends RecipeGen_Base { try { //.08 compat - if (GT_ModHandler.addThermalCentrifugeRecipe(material.getCrushed(1), 200, material.getCrushedCentrifuged(1), tinyDustB, dustStone)){ + if (GT_ModHandler.addThermalCentrifugeRecipe(material.getCrushed(1), (int) Math.min(5000L, Math.abs(material.getMass() * 20L)), material.getCrushedCentrifuged(1), tinyDustB, dustStone)){ Logger.MATERIALS("[ThermalCentrifuge] Added Recipe: 'Crushed ore to Centrifuged Ore' | Input: "+material.getCrushed(1).getDisplayName()+" | Outputs: "+material.getCrushedCentrifuged(1).getDisplayName()+", "+tinyDustB.getDisplayName()+", "+dustStone.getDisplayName()+"."); } } catch (Throwable t) {} try { - if (GT_ModHandler.addThermalCentrifugeRecipe(material.getCrushedPurified(1), 200, material.getCrushedCentrifuged(1), tinyDustA, dustStone)){ + if (GT_ModHandler.addThermalCentrifugeRecipe(material.getCrushedPurified(1), (int) Math.min(5000L, Math.abs(material.getMass() * 20L)), material.getCrushedCentrifuged(1), tinyDustA, dustStone)){ Logger.MATERIALS("[ThermalCentrifuge] Added Recipe: 'Washed ore to Centrifuged Ore' | Input: "+material.getCrushedPurified(1).getDisplayName()+" | Outputs: "+material.getCrushedCentrifuged(1).getDisplayName()+", "+tinyDustA.getDisplayName()+", "+dustStone.getDisplayName()+"."); } } @@ -262,7 +267,7 @@ public class RecipeGen_Ore extends RecipeGen_Base { matDust, tinyDustA,null, null, null,null, new int[]{10000, 10000}, //Chances - 5*20, //Time + (int) Math.max(1L, material.getMass() * 8L), //Time tVoltageMultiplier/2)){ //Eu Logger.MATERIALS("[Centrifuge] Added Recipe: Purified Dust to Clean Dust"); } @@ -275,7 +280,7 @@ public class RecipeGen_Ore extends RecipeGen_Base { matDust, tinyDustB,null, null, null,null, new int[]{10000, 10000}, //Chances - 5*20, //Time + (int) Math.max(1L, material.getMass() * 8L), //Time tVoltageMultiplier/2)){ //Eu Logger.MATERIALS("[Centrifuge] Added Recipe: Inpure Dust to Clean Dust"); } @@ -285,6 +290,7 @@ public class RecipeGen_Ore extends RecipeGen_Base { * Electrolyzer */ + if (!disableOptional) { //Process Dust if (componentMap.size() > 0 && componentMap.size() <= 6){ @@ -434,9 +440,7 @@ public class RecipeGen_Ore extends RecipeGen_Base { } } - try{ - - + try{ if (CORE.RA.addDehydratorRecipe( new ItemStack[]{mainDust, emptyCell}, null, @@ -446,6 +450,10 @@ public class RecipeGen_Ore extends RecipeGen_Base { (int) Math.max(material.getMass() * 4L * 1, 1), tVoltageMultiplier)){ Logger.MATERIALS("[Dehydrator] Generated Dehydrator recipe for "+matDust.getDisplayName()); + Logger.MATERIALS("Inputs: "+mainDust.getDisplayName()+" x"+mainDust.stackSize+", "+(emptyCell == null ? "No Cells" : ""+emptyCell.getDisplayName()+" x"+emptyCell.stackSize)); + Logger.MATERIALS("Outputs "+ItemUtils.getArrayStackNames(mInternalOutputs)); + Logger.MATERIALS("Time: "+((int) Math.max(material.getMass() * 4L * 1, 1))); + Logger.MATERIALS("EU: "+tVoltageMultiplier); } else { Logger.MATERIALS("[Dehydrator] Failed to generate Dehydrator recipe for "+matDust.getDisplayName()); @@ -457,6 +465,7 @@ public class RecipeGen_Ore extends RecipeGen_Base { } + } /** diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plasma.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plasma.java new file mode 100644 index 0000000000..5f53defc2f --- /dev/null +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plasma.java @@ -0,0 +1,42 @@ +package gtPlusPlus.xmod.gregtech.loaders; + +import java.util.HashSet; +import java.util.Set; + +import gregtech.api.enums.GT_Values; +import gregtech.api.util.GT_Utility; +import gtPlusPlus.api.interfaces.RunnableWithInfo; +import gtPlusPlus.core.material.Material; +import gtPlusPlus.core.material.MaterialGenerator; +import net.minecraft.item.ItemStack; + +public class RecipeGen_Plasma extends RecipeGen_Base { + + public final static Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<RunnableWithInfo<Material>>(); + static { + MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap); + } + + public RecipeGen_Plasma(final Material M){ + this.toGenerate = M; + mRecipeGenMap.add(this); + } + + @Override + public void run() { + generateRecipes(this.toGenerate); + } + + private void generateRecipes(final Material material) { + // Cool Plasma + ItemStack aPlasmaCell = material.getPlasmaCell(1); + ItemStack aCell = material.getCell(1); + if (material.getPlasmaCell(1) != null){ + GT_Values.RA.addFuel(GT_Utility.copyAmount(1L, aPlasmaCell), GT_Utility.getFluidForFilledItem(aPlasmaCell, true) == null ? GT_Utility.getContainerItem(aPlasmaCell, true) : null, (int) Math.max(1024L, 1024L * material.getMass()), 4); + } + if (material.getCell(1) != null && material.getPlasmaCell(1) != null){ + GT_Values.RA.addVacuumFreezerRecipe(aPlasmaCell, aCell, (int) Math.max(material.getMass() * 2L, 1L)); + } + } + +} diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plates.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plates.java index 56d11520d0..56d11520d0 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plates.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plates.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Recycling.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Recycling.java index 84188a44aa..acb7e5fe02 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Recycling.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Recycling.java @@ -137,9 +137,9 @@ public class RecipeGen_Recycling implements Runnable { //Fluid Extractor if (ItemUtils.checkForInvalidItems(tempStack)) { // mValidItems[mSlotIndex++] = tempStack; - if ((mDust != null) && CORE.RA.addFluidExtractionRecipe(tempStack, material.getFluid(mFluidAmount), 30, material.vVoltageMultiplier)) { + if ((mDust != null) && CORE.RA.addFluidExtractionRecipe(tempStack, material.getFluidStack(mFluidAmount), 30, material.vVoltageMultiplier)) { Logger.WARNING("Fluid Recycle Recipe: " + material.getLocalizedName() + " - Success - Recycle " - + tempStack.getDisplayName() + " and obtain " + mFluidAmount+"mb of "+material.getFluid(1).getLocalizedName()+"."); + + tempStack.getDisplayName() + " and obtain " + mFluidAmount+"mb of "+material.getFluidStack(1).getLocalizedName()+"."); } else { Logger.WARNING("Fluid Recycle Recipe: " + material.getLocalizedName() + " - Failed"); diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java index ea129a2b0e..ea129a2b0e 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/misc/AddCustomMachineToPA.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/misc/AddCustomMachineToPA.java new file mode 100644 index 0000000000..2e6de159d0 --- /dev/null +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/misc/AddCustomMachineToPA.java @@ -0,0 +1,28 @@ +package gtPlusPlus.xmod.gregtech.loaders.misc; + +import gregtech.api.util.GTPP_Recipe; +import gregtech.api.util.GT_ProcessingArray_Manager; +import gregtech.api.util.GT_Recipe.GT_Recipe_Map; +import gtPlusPlus.api.objects.Logger; + +public class AddCustomMachineToPA { + + public static final void registerRecipeMapForID(int aID, GT_Recipe_Map aMap) { + Logger.INFO("Attempting to add map "+aMap.mNEIName+" to Processing Array for Meta Tile "+aID+". Success? "+GT_ProcessingArray_Manager.registerRecipeMapForMeta(aID, aMap)); + } + + public static final void registerRecipeMapBetweenRangeOfIDs(int aMin, int aMax, GT_Recipe_Map aMap) { + for (int i=aMin; i<=aMax;i++) { + registerRecipeMapForID(i, aMap); + } + } + + public static void register() { + + // Simple Washers + registerRecipeMapForID(767, GTPP_Recipe.GTPP_Recipe_Map.sSimpleWasherRecipes); + registerRecipeMapBetweenRangeOfIDs(31017, 31020, GTPP_Recipe.GTPP_Recipe_Map.sSimpleWasherRecipes); + + } + +} diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/misc/AssLineAchievements.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/misc/AssLineAchievements.java index 351a4cc546..351a4cc546 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/misc/AssLineAchievements.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/misc/AssLineAchievements.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_AlgaeFarm.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_AlgaeFarm.java index 053c71c89d..053c71c89d 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_AlgaeFarm.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_AlgaeFarm.java diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_GTNH.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_GTNH.java new file mode 100644 index 0000000000..0197142e96 --- /dev/null +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_GTNH.java @@ -0,0 +1,22 @@ +package gtPlusPlus.xmod.gregtech.loaders.recipe; + +import gregtech.api.enums.GT_Values; +import gregtech.api.enums.ItemList; +import gregtech.api.enums.Materials; +import gtPlusPlus.core.material.ELEMENT; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; + +public class RecipeLoader_GTNH { + + public static void generate() { + GT_Values.RA.addFluidSolidifierRecipe(ItemList.Shape_Mold_Ball.get(0L), new FluidStack(FluidRegistry.getFluid("ender"), 250), new ItemStack(Items.ender_pearl, 1, 0), 100, 30); + //MK4 + GT_Values.RA.addFusionReactorRecipe(Materials.Plutonium241.getMolten(144), Materials.Helium.getGas(1000), ELEMENT.getInstance().CURIUM.getFluidStack(144), 96, 98304, 500000000); + GT_Values.RA.addFusionReactorRecipe(ELEMENT.getInstance().CURIUM.getFluidStack(144), Materials.Helium.getPlasma(144), ELEMENT.getInstance().CALIFORNIUM.getFluidStack(144), 128, 196608, 750000000); + GT_Values.RA.addFusionReactorRecipe(Materials.Plutonium241.getMolten(144), Materials.Calcium.getPlasma(144), Materials.Flerovium.getMolten(144), 160, 196608, 1000000000); + } + +} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_LFTR.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_LFTR.java new file mode 100644 index 0000000000..a09cbcce0d --- /dev/null +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_LFTR.java @@ -0,0 +1,173 @@ +package gtPlusPlus.xmod.gregtech.loaders.recipe; + +import gregtech.api.enums.Materials; +import gregtech.api.util.GTPP_Recipe; +import gregtech.api.util.GT_Recipe; +import gregtech.api.util.GasSpargingRecipeMap; +import gtPlusPlus.api.objects.data.AutoMap; +import gtPlusPlus.core.material.ELEMENT; +import gtPlusPlus.core.material.nuclear.FLUORIDES; +import gtPlusPlus.core.material.nuclear.NUCLIDE; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; + +public class RecipeLoader_LFTR { + + private static AutoMap<Fluid> mNobleGases; + private static AutoMap<Fluid> mFluorideGases; + private static AutoMap<Fluid> mSpargeGases; + + private static void configureSparging() { + if (mSpargeGases == null) { + mSpargeGases = new AutoMap<Fluid>(); + mSpargeGases.add(Materials.Helium.getGas(1).getFluid()); + mSpargeGases.add(Materials.Fluorine.getGas(1).getFluid()); + } + if (mNobleGases == null) { + mNobleGases = new AutoMap<Fluid>(); + mNobleGases.add(mSpargeGases.get(0)); + mNobleGases.add(ELEMENT.getInstance().XENON.getFluid()); + mNobleGases.add(ELEMENT.getInstance().NEON.getFluid()); + mNobleGases.add(ELEMENT.getInstance().ARGON.getFluid()); + mNobleGases.add(ELEMENT.getInstance().KRYPTON.getFluid()); + mNobleGases.add(ELEMENT.getInstance().RADON.getFluid()); + } + if (mFluorideGases == null) { + mFluorideGases = new AutoMap<Fluid>(); + mFluorideGases.add(mSpargeGases.get(1)); + mFluorideGases.add(FLUORIDES.LITHIUM_FLUORIDE.getFluid()); + mFluorideGases.add(FLUORIDES.NEPTUNIUM_HEXAFLUORIDE.getFluid()); + mFluorideGases.add(FLUORIDES.TECHNETIUM_HEXAFLUORIDE.getFluid()); + mFluorideGases.add(FLUORIDES.SELENIUM_HEXAFLUORIDE.getFluid()); + mFluorideGases.add(FLUORIDES.THORIUM_TETRAFLUORIDE.getFluid()); + } + } + + public static void generate() { + // Fli2BeF4 + Thorium TetraFluoride = Uranium233 + //72k Ticks/hr + //1l/4t = 1000l/hr + //1l/40t = 1000l/10hr (Probably better) LiFBeF2ThF4UF4 + //1l/20t= 1000l/2.5hr LiFBeF2ZrF4UF4 + //1l/10t= 1000l/2.5hr LiFBeF2ZrF4U235 + + configureSparging(); + FluidStack Li2BeF4 = NUCLIDE.Li2BeF4.getFluidStack(200); + + //LiFBeF2ThF4UF4 - T3 + GT_Recipe LFTR1 = new GTPP_Recipe( + false, + new ItemStack[] {}, + new ItemStack[] {}, + null, new int[] {10000, 10000, 5000, 2500}, + new FluidStack[] { + NUCLIDE.LiFBeF2ThF4UF4.getFluidStack(100), + Li2BeF4 + }, + new FluidStack[] { + NUCLIDE.LiFBeF2UF4FP.getFluidStack(100), + NUCLIDE.LiFBeF2ThF4.getFluidStack(200), + FLUORIDES.URANIUM_HEXAFLUORIDE.getFluidStack(20), + FLUORIDES.URANIUM_HEXAFLUORIDE.getFluidStack(10) + }, + 400 * 20,//time + 0,//cost + 8192*4//fuel value + ); + + //LiFBeF2ZrF4UF4 - T2 + GT_Recipe LFTR2 = new GTPP_Recipe( + false, + new ItemStack[] {}, + new ItemStack[] {}, + null, new int[] {10000, 10000, 2500, 1250}, + new FluidStack[] { + NUCLIDE.LiFBeF2ZrF4UF4.getFluidStack(100), + Li2BeF4 + }, + new FluidStack[] { + NUCLIDE.LiFBeF2UF4FP.getFluidStack(50), + NUCLIDE.LiFBeF2ThF4.getFluidStack(100), + FLUORIDES.URANIUM_HEXAFLUORIDE.getFluidStack(10), + FLUORIDES.URANIUM_HEXAFLUORIDE.getFluidStack(5) + }, + 400 * 20,//time + 0,//cost + 8192//fuel value + ); + + //LiFBeF2ZrF4U235 - T1 + GT_Recipe LFTR3 = new GTPP_Recipe( + false, + new ItemStack[] {}, + new ItemStack[] {}, + null, new int[] {10000, 10000, 1000, 500}, + new FluidStack[] { + NUCLIDE.LiFBeF2ZrF4U235.getFluidStack(100), + Li2BeF4 + }, + new FluidStack[] { + NUCLIDE.LiFBeF2UF4FP.getFluidStack(25), + NUCLIDE.LiFThF4.getFluidStack(50), + FLUORIDES.URANIUM_HEXAFLUORIDE.getFluidStack(4), + FLUORIDES.URANIUM_HEXAFLUORIDE.getFluidStack(2) + }, + 100 *20,//time + 0,//cost + 8192//fuel value + ); + + // Sparging NEI Recipes + GasSpargingRecipeMap.addRecipe( + new FluidStack(mSpargeGases.get(0), 50), + NUCLIDE.LiFBeF2UF4FP.getFluidStack(50), + NUCLIDE.Sparged_LiFBeF2UF4FP.getFluidStack(50), + new FluidStack[] { + new FluidStack(mNobleGases.get(1), 10), + new FluidStack(mNobleGases.get(2), 10), + new FluidStack(mNobleGases.get(3), 10), + new FluidStack(mNobleGases.get(4), 10), + new FluidStack(mNobleGases.get(5), 10) + }, + new int[] { + 1000, 1000, 1000, 1000, 1000 + }); + + GasSpargingRecipeMap.addRecipe( + new FluidStack(mSpargeGases.get(1), 50), + NUCLIDE.LiFThF4.getFluidStack(50), + NUCLIDE.Sparged_LiFThF4.getFluidStack(50), + new FluidStack[] { + new FluidStack(mFluorideGases.get(1), 5), + new FluidStack(mFluorideGases.get(2), 5), + new FluidStack(mFluorideGases.get(3), 5), + new FluidStack(mFluorideGases.get(4), 5), + new FluidStack(mFluorideGases.get(5), 5) + }, + new int[] { + 500, 500, 500, 500, 500 + }); + + GasSpargingRecipeMap.addRecipe( + new FluidStack(mSpargeGases.get(1), 50), + NUCLIDE.LiFBeF2ThF4.getFluidStack(50), + NUCLIDE.Sparged_LiFBeF2ThF4.getFluidStack(50), + new FluidStack[] { + new FluidStack(mFluorideGases.get(1), 10), + new FluidStack(mFluorideGases.get(2), 10), + new FluidStack(mFluorideGases.get(3), 10), + new FluidStack(mFluorideGases.get(4), 10), + new FluidStack(mFluorideGases.get(5), 10) + }, + new int[] { + 1000, 1000, 1000, 1000, 1000 + }); + + GTPP_Recipe.GTPP_Recipe_Map.sLiquidFluorineThoriumReactorRecipes.add(LFTR1); + GTPP_Recipe.GTPP_Recipe_Map.sLiquidFluorineThoriumReactorRecipes.add(LFTR2); + GTPP_Recipe.GTPP_Recipe_Map.sLiquidFluorineThoriumReactorRecipes.add(LFTR3); + + + } +} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_Nuclear.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_Nuclear.java new file mode 100644 index 0000000000..330d507115 --- /dev/null +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_Nuclear.java @@ -0,0 +1,695 @@ +package gtPlusPlus.xmod.gregtech.loaders.recipe; + +import static gtPlusPlus.core.lib.CORE.GTNH; + +import gregtech.api.enums.GT_Values; +import gregtech.api.enums.ItemList; +import gregtech.api.util.GT_ModHandler; +import gtPlusPlus.api.objects.Logger; +import gtPlusPlus.core.item.chemistry.GenericChem; +import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.LoadedMods; +import gtPlusPlus.core.material.ELEMENT; +import gtPlusPlus.core.material.MISC_MATERIALS; +import gtPlusPlus.core.material.nuclear.FLUORIDES; +import gtPlusPlus.core.material.nuclear.NUCLIDE; +import gtPlusPlus.core.recipe.common.CI; +import gtPlusPlus.core.util.Utils; +import gtPlusPlus.core.util.minecraft.FluidUtils; +import gtPlusPlus.core.util.minecraft.ItemUtils; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; + +public class RecipeLoader_Nuclear { + + + + public static void generate() { + createRecipes(); + RecipeLoader_LFTR.generate(); + RecipeLoader_NuclearFuelProcessing.generate(); + } + + private static void createRecipes() { + autoclave(); + blastFurnace(); + centrifugeRecipes(); + chemicalBathRecipes(); + chemicalReactorRecipes(); + dehydratorRecipes(); + electroMagneticSeperator(); + fluidExtractorRecipes(); + fluidHeater(); + macerator(); + mixerRecipes(); + sifter(); + } + + private static void autoclave() { + + GT_Values.RA.addAutoclaveRecipe( + ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 9), + FluidUtils.getFluidStack("chlorine", 9 * 4 * 144), + ItemUtils.getItemStackOfAmountFromOreDict("pelletZirconium", 9), + 0, + 120 * 20, + 30); + + } + + private static void blastFurnace() { + + GT_Values.RA.addBlastRecipe( + FLUORIDES.LITHIUM_FLUORIDE.getDust(2), + FLUORIDES.BERYLLIUM_FLUORIDE.getDust(1), + GT_Values.NF, + GT_Values.NF, + NUCLIDE.Li2BeF4.getDust(3), + null, + 60 * 20, 2000, + 3000); + + GT_Values.RA.addBlastRecipe( + ItemUtils.getItemStackOfAmountFromOreDict("dustZrCl4", 1), + null, + GT_Values.NF, + GT_Values.NF, + ItemUtils.getItemStackOfAmountFromOreDict("dustCookedZrCl4", 1), + null, + 60 * 20, + 340, + 300); + + } + + + private static void centrifugeRecipes() { + + //Process Used Fuel Rods for Krypton + + //Uranium + GT_Values.RA.addCentrifugeRecipe( + CI.getNumberedCircuit(20), + ItemUtils.getItemStackFromFQRN("IC2:reactorUraniumSimpledepleted", 8), + GT_Values.NF, + ELEMENT.getInstance().KRYPTON.getFluidStack(60), + ItemList.IC2_Fuel_Rod_Empty.get(8), + ELEMENT.getInstance().URANIUM238.getDust(2), + ELEMENT.getInstance().URANIUM232.getSmallDust(1), + ELEMENT.getInstance().URANIUM233.getSmallDust(1), + ELEMENT.getInstance().URANIUM235.getSmallDust(1), + ELEMENT.getInstance().PLUTONIUM239.getTinyDust(1), + new int[] { 0, 0, 1000, 1000, 1000, 500 }, 500 * 20, 4000); + //Mox + GT_Values.RA.addCentrifugeRecipe( + CI.getNumberedCircuit(20), + ItemUtils.getItemStackFromFQRN("IC2:reactorMOXSimpledepleted", 8), + GT_Values.NF, + ELEMENT.getInstance().KRYPTON.getFluidStack(90), + ItemList.IC2_Fuel_Rod_Empty.get(8), + ELEMENT.getInstance().PLUTONIUM244.getDust(2), + ELEMENT.getInstance().PLUTONIUM241.getTinyDust(1), + ELEMENT.getInstance().PLUTONIUM239.getTinyDust(1), + ELEMENT.getInstance().PLUTONIUM238.getTinyDust(1), + ELEMENT.getInstance().PLUTONIUM239.getTinyDust(1), + new int[] { 0, 0, 500, 500, 500, 500 }, 750 * 20, 4000); + + //Thorium + GT_Values.RA.addCentrifugeRecipe( + CI.getNumberedCircuit(20), + ItemList.Depleted_Thorium_1.get(8), + GT_Values.NF, + ELEMENT.getInstance().KRYPTON.getFluidStack(30), + ItemList.IC2_Fuel_Rod_Empty.get(8), + ELEMENT.getInstance().THORIUM.getDust(2), + ELEMENT.getInstance().THORIUM232.getDust(1), + ELEMENT.getInstance().LUTETIUM.getSmallDust(1), + ELEMENT.getInstance().POLONIUM.getSmallDust(1), + ELEMENT.getInstance().THALLIUM.getTinyDust(1), + new int[] { 0, 0, 5000, 5000, 5000, 2500 }, 250 * 20, 4000); + + } + + + private static void chemicalBathRecipes() { + + int[] chances = {9000, 6000, 3000}; + GT_Values.RA.addChemicalBathRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustTin", 12), + FluidUtils.getFluidStack("chlorine", 2400), + ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 3), + ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 4), + ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 5), + chances, + 30 * 20, + 480); + + chances = new int[]{9000, 3000, 1000}; + GT_Values.RA.addChemicalBathRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustRutile", 5), + FluidUtils.getFluidStack("chlorine", 4000), + ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 3), + ItemUtils.getItemStackOfAmountFromOreDict("dustTitanium", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustHafnium", 1), + chances, + 30 * 20, + 1024); + + GT_Values.RA.addChemicalBathRecipe( + ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumCarbonate", 10), + FluidUtils.getFluidStack("hydrofluoricacid", 10 * 144), + ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumFluoride", 10), + null, + null, + new int[] {}, + 90 * 20, + 500); + + } + + + private static void chemicalReactorRecipes() { + + ItemStack aGtHydrofluoricAcid = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cellHydrofluoricAcid_GT5U", 2); + + GT_Values.RA.addChemicalRecipe( + ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumCarbonate", 5), // Input + ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumHydroxide", 5), // Input + null, // Fluid Input + null, // Fluid Output + ItemUtils.getItemStackOfAmountFromOreDict("dustLi2CO3CaOH2", 10), + 600 * 20); + + GT_Values.RA.addChemicalRecipe( + ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroxide", 5), // Input + null, // Input Stack 2 + FluidUtils.getFluidStack("hydrofluoricacid", 5 * 144), + FluidUtils.getFluidStack("water", 5 * 144), // Fluid Output + ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumFluoride", 5), + 600 * 20); + + GT_Values.RA.addChemicalRecipe( + ItemUtils.getItemStackOfAmountFromOreDict("dustLithium7", 1), null, + FluidUtils.getFluidStack("sulfuricacid", 144 * 8), + FluidUtils.getFluidStack("sulfuriclithium", 144 * 2), + ItemUtils.getItemStackOfAmountFromOreDict("dustSmallLithium7", 1), + 20 * 20); + + GT_Values.RA.addChemicalRecipe( + ItemUtils.getItemStackOfAmountFromOreDict("cellOxygen", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustLithium7", 16), + FluidUtils.getFluidStack("water", 1000), + FluidUtils.getFluidStack("lithiumhydroxide", 144 * 4), + CI.emptyCells(1), + 300 * 20); + + // LFTR Fuel Related Compounds + if (GTNH) { + // Hydroxide + GT_Values.RA.addChemicalRecipe( + ItemUtils.getGregtechCircuit(3), + ELEMENT.getInstance().OXYGEN.getCell(1), + ELEMENT.getInstance().HYDROGEN.getFluidStack(1000), + MISC_MATERIALS.HYDROXIDE.getFluidStack(2000), + CI.emptyCells(2), + GT_Values.NI, + 8 * 20, + 30); + // Beryllium Hydroxide + GT_Values.RA.addChemicalRecipe( + ItemUtils.getGregtechCircuit(3), + ELEMENT.getInstance().BERYLLIUM.getDust(7), + MISC_MATERIALS.HYDROXIDE.getFluidStack(1000), + FLUORIDES.BERYLLIUM_HYDROXIDE.getFluidStack(2000), + GT_Values.NI, + 8 * 20, + 30); + // Ammonium Bifluoride + GT_Values.RA.addChemicalRecipe( + ItemUtils.getGregtechCircuit(3), + ItemUtils.getItemStackOfAmountFromOreDict("cellHydrofluoricAcid", 1), + MISC_MATERIALS.AMMONIUM.getFluidStack(1000), + FLUORIDES.AMMONIUM_BIFLUORIDE.getFluidStack(2000), + CI.emptyCells(1), + 20 * 20, + 30); + if (aGtHydrofluoricAcid != null) { + // Ammonium Bifluoride + GT_Values.RA.addChemicalRecipe( + ItemUtils.getGregtechCircuit(3), + aGtHydrofluoricAcid, + MISC_MATERIALS.AMMONIUM.getFluidStack(1000), + FLUORIDES.AMMONIUM_BIFLUORIDE.getFluidStack(2000), + CI.emptyCells(2), + 40 * 20, + 30); + } + // Ammonium + GT_Values.RA.addChemicalRecipe( + ItemUtils.getGregtechCircuit(3), + ELEMENT.getInstance().HYDROGEN.getCell(1), + MISC_MATERIALS.AMMONIA.getFluidStack(1000), + MISC_MATERIALS.AMMONIUM.getFluidStack(2000), + CI.emptyCells(1), + GT_Values.NI, + 20 * 20, + 30); + } + + if (!GTNH) { + // Hydroxide + GT_Values.RA.addChemicalRecipe( + ItemUtils.getGregtechCircuit(3), + ELEMENT.getInstance().OXYGEN.getCell(1), + ELEMENT.getInstance().HYDROGEN.getFluidStack(1000), + MISC_MATERIALS.HYDROXIDE.getFluidStack(2000), + CI.emptyCells(2), + GT_Values.NI, + 8 * 20, + 30); + // Beryllium Hydroxide + GT_Values.RA.addChemicalRecipe( + ItemUtils.getGregtechCircuit(3), + ELEMENT.getInstance().BERYLLIUM.getDust(7), + MISC_MATERIALS.HYDROXIDE.getFluidStack(1000), + FLUORIDES.BERYLLIUM_HYDROXIDE.getFluidStack(2000), + GT_Values.NI, + 8 * 20, + 30); + // Ammonium Bifluoride + GT_Values.RA.addChemicalRecipe( + ItemUtils.getGregtechCircuit(3), + ItemUtils.getItemStackOfAmountFromOreDict("cellHydrofluoricAcid", 1), + MISC_MATERIALS.AMMONIUM.getFluidStack(1000), + FLUORIDES.AMMONIUM_BIFLUORIDE.getFluidStack(3000), + CI.emptyCells(1), + 20 * 20, + 30); + + if (aGtHydrofluoricAcid != null) { + // Ammonium Bifluoride + GT_Values.RA.addChemicalRecipe( + ItemUtils.getGregtechCircuit(3), + aGtHydrofluoricAcid, + MISC_MATERIALS.AMMONIUM.getFluidStack(1000), + FLUORIDES.AMMONIUM_BIFLUORIDE.getFluidStack(2000), + CI.emptyCells(2), + 40 * 20, + 30); + } + + // Ammonium + GT_Values.RA.addChemicalRecipe( + ItemUtils.getGregtechCircuit(3), + ELEMENT.getInstance().HYDROGEN.getCell(1), + MISC_MATERIALS.AMMONIA.getFluidStack(1000), + MISC_MATERIALS.AMMONIUM.getFluidStack(2000), + CI.emptyCells(1), + GT_Values.NI, + 20 * 20, + 30); + // Ammonia + GT_Values.RA.addChemicalRecipe( + ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogen", 3), + ItemUtils.getItemStackOfAmountFromOreDict("dustMagnetite", 0), + FluidUtils.getFluidStack("nitrogen", 1000), + FluidUtils.getFluidStack("ammonia", 1000), + CI.emptyCells(3), + 14 * 20); + } + + + //Technetium + GT_Values.RA.addChemicalRecipe( + CI.getNumberedAdvancedCircuit(22), + ItemUtils.getItemStackOfAmountFromOreDict("dustTechnetium99", 1), + FluidUtils.getFluidStack("sulfuricacid", 1000), + FluidUtils.getFluidStack("sulfuricacid", 144 * 2), + ItemUtils.getItemStackOfAmountFromOreDict("dustTechnetium", 1), + 100 * 20); + + // Sodium Hydroxide + GT_Values.RA.addChemicalRecipe( + CI.getNumberedBioCircuit(15), + ItemUtils.getItemStackOfAmountFromOreDict("dustSodiumHydroxide", 1), + FluidUtils.getFluidStack("hydrofluoricacid", 500), + FluidUtils.getWater(1000), + FLUORIDES.SODIUM_FLUORIDE.getDust(1), + 60 * 20); + + if (FluidUtils.doesFluidExist("hydrofluoricacid_gt5u")) { + GT_Values.RA.addChemicalRecipe( + CI.getNumberedBioCircuit(15), + ItemUtils.getItemStackOfAmountFromOreDict("dustSodiumHydroxide", 1), + FluidUtils.getFluidStack("hydrofluoricacid_gt5u", 1000), + FluidUtils.getWater(1000), + FLUORIDES.SODIUM_FLUORIDE.getDust(1), + 60 * 20); + } + + } + + private static void dehydratorRecipes() { + + // Makes 7-Lithium + CORE.RA.addDehydratorRecipe( + new ItemStack[] { + CI.getNumberedAdvancedCircuit(14), + ItemUtils.getItemStackOfAmountFromOreDict("cellSulfuricLithium", 1) + }, + FluidUtils.getFluidStack("sulfuriclithium", 440), + null, + new ItemStack[] { + CI.emptyCells(1), + ItemUtils.getItemStackOfAmountFromOreDict("dustSulfur", 3), + ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustSodium", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustCarbon", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustLithium7", 4) + }, + new int[] {10000, 10000, 10000, 10000, 10000}, + 30 * 20, + 30); + + // Makes Lithium Carbonate + CORE.RA.addDehydratorRecipe( + new ItemStack[] { + CI.emptyCells(12), + ItemUtils.getItemStackOfAmountFromOreDict("dustLepidolite", 20) + }, // Item input (Array, up to 2) + FluidUtils.getFluidStack("sulfuricacid", 10000), + FluidUtils.getFluidStack("sulfuriclithium", 10000), + new ItemStack[] { + ItemUtils.getItemStackOfAmountFromOreDict("dustPotassium", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustAluminium", 4), + ItemUtils.getItemStackOfAmountFromOreDict("cellOxygen", 10), + ItemUtils.getItemStackOfAmountFromOreDict("cellFluorine", 2), + ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumCarbonate", 3), // LithiumCarbonate + }, // Output Array of Items - Upto 9, + new int[] { 10000, 10000, 10000, 10000, 10000 }, + 75 * 20, // Time in ticks + 1000); // EU + + // Calcium Hydroxide + if ((ItemUtils.checkForInvalidItems(ItemUtils.getItemStackOfAmountFromOreDict("dustQuicklime", 1))) || LoadedMods.IHL) { + CORE.RA.addDehydratorRecipe( + new ItemStack[] { + CI.getNumberedBioCircuit(20), + ItemUtils.getItemStackOfAmountFromOreDict("dustQuicklime", 10) + }, + FluidUtils.getFluidStack("water", 10000), + null, // Fluid output (slot 2) + new ItemStack[] { + ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumHydroxide", 20) + }, // Output + new int[] { 10000 }, + 120 * 20, // Time in ticks + 120); // EU + } + else { + Logger.INFO("[dustCalciumHydroxide] FAILED TO LOAD RECIPE"); + if (!ItemUtils.checkForInvalidItems(ItemUtils.getItemStackOfAmountFromOreDict("dustQuicklime", 1))) { + Logger.INFO("Could not find dustQuicklime, cannot make dustCalciumHydroxide."); + } + else if (!LoadedMods.IHL) { + Logger.INFO("IHL not loaded."); + } + } + + // 2 LiOH + CaCO3 + CORE.RA.addDehydratorRecipe( + new ItemStack[] { + CI.getNumberedAdvancedCircuit(20), + ItemUtils.getItemStackOfAmountFromOreDict("dustLi2CO3CaOH2", 5) + }, // Item + null, // Fluid input (slot 1) + null, // Fluid output (slot 2) + new ItemStack[] { + ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroxide", 2), + ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumCarbonate", 3) + }, // Output + new int[] { 10000, 10000 }, + 120 * 20, // Time in ticks + 1000); // EU + + // LiOH Liquid to Dust + CORE.RA.addDehydratorRecipe( + new ItemStack[] { + CI.getNumberedAdvancedCircuit(22) + }, + FluidUtils.getFluidStack("lithiumhydroxide", 144), + null, + new ItemStack[] { + ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroxide", 1) + }, + new int[] { 10000 }, + 1 * 20, // Time in ticks + 64); // EU + + // Zirconium Chloride -> TetraFluoride + FluidStack aHydrogenChloride = new FluidStack(GenericChem.HydrochloricAcid, 9000); + CORE.RA.addDehydratorRecipe( + new ItemStack[] { + CI.getNumberedAdvancedCircuit(11), + ItemUtils.getItemStackOfAmountFromOreDict("dustCookedZrCl4", 9), + }, // Item + FluidUtils.getFluidStack("hydrofluoricacid", 9 * 144), + aHydrogenChloride, + new ItemStack[] { + FLUORIDES.ZIRCONIUM_TETRAFLUORIDE.getDust(9) + }, + new int[] { 10000 }, + 120 * 20, // Time in ticks + 500); // EU + + // Zirconium Chloride -> TetraFluoride + FluidStack aGregtechHydro = FluidUtils.getFluidStack("hydrofluoricacid_gt5u", 1); + if (aGregtechHydro != null || Utils.getGregtechVersionAsInt() >= 50929) { + CORE.RA.addDehydratorRecipe( + new ItemStack[] { + CI.getNumberedAdvancedCircuit(10), + ItemUtils.getItemStackOfAmountFromOreDict("dustCookedZrCl4", 9) + }, + FluidUtils.getFluidStack("hydrofluoricacid_gt5u", 18 * 144), + aHydrogenChloride, + new ItemStack[] { + FLUORIDES.ZIRCONIUM_TETRAFLUORIDE.getDust(9) + }, + new int[] { 10000 }, + 240 * 20, // Time in ticks + 500); // EU + } + + // Be(OH)2 + 2 (NH4)HF2 → (NH4)2BeF4 + 2 H2O + CORE.RA.addDehydratorRecipe( + new ItemStack[] { + CI.getNumberedAdvancedCircuit(6), + FLUORIDES.AMMONIUM_BIFLUORIDE.getCell(4) + }, + FLUORIDES.BERYLLIUM_HYDROXIDE.getFluidStack(2000), // Fluid input (slot 1) + FLUORIDES.AMMONIUM_TETRAFLUOROBERYLLATE.getFluidStack(6000), + new ItemStack[] { + ItemUtils.getItemStackOfAmountFromOreDict("cellWater", 4) + }, + new int[] { 10000}, + 32 * 20, // Time in ticks + 64); // EU + + // (NH4)2BeF4 → 2 NH3 + 2 HF + BeF2 + CORE.RA.addDehydratorRecipe( + new ItemStack[] { + CI.getNumberedAdvancedCircuit(17), + CI.emptyCells(5) + }, + FLUORIDES.AMMONIUM_TETRAFLUOROBERYLLATE.getFluidStack(5000), + null, + new ItemStack[] { + MISC_MATERIALS.AMMONIA.getCell(2), + ItemUtils.getItemStackOfAmountFromOreDict("cellHydrofluoricAcid", 2), + FLUORIDES.BERYLLIUM_FLUORIDE.getCell(1) + }, + new int[] {10000, 10000, 10000}, + 5 * 60 * 20, + 120); + + } + + private static void electroMagneticSeperator() { + + // Zirconium + GT_Values.RA.addElectromagneticSeparatorRecipe( + ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedBauxite", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustBauxite", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustSmallRutile", 1), + ItemUtils.getItemStackOfAmountFromOreDict("nuggetZirconium", 1), + new int[] { 10000, 2500, 4000 }, + 20 * 20, + 24); + + // Zircon + GT_Values.RA.addElectromagneticSeparatorRecipe( + ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedMagnetite", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustMagnetite", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustSmallZircon", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustTinyZircon", 1), + new int[] { 10000, 1250, 2500 }, + 20 * 20, + 24); + GT_Values.RA.addElectromagneticSeparatorRecipe( + ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedCassiterite", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustCassiterite", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustSmallZircon", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustTinyZircon", 1), + new int[] { 10000, 1250, 2500 }, + 20 * 20, + 24); + + } + + private static void fluidExtractorRecipes() { + + //FLiBe fuel + CORE.RA.addFluidExtractionRecipe( + NUCLIDE.Li2BeF4.getDust(1), + NUCLIDE.Li2BeF4.getFluidStack(144), + 100, + 500); + //LFTR Fuel 1 + CORE.RA.addFluidExtractionRecipe( + NUCLIDE.LiFBeF2ZrF4U235.getDust(1), + NUCLIDE.LiFBeF2ZrF4U235.getFluidStack(144), + 250, + 1000); + CORE.RA.addFluidExtractionRecipe( + NUCLIDE.LiFBeF2ZrF4UF4.getDust(1), + NUCLIDE.LiFBeF2ZrF4UF4.getFluidStack(144), + 150, + 1500); + CORE.RA.addFluidExtractionRecipe( + NUCLIDE.LiFBeF2ThF4UF4.getDust(1), + NUCLIDE.LiFBeF2ThF4UF4.getFluidStack(144), + 150, + 2000); + + //ZIRCONIUM_TETRAFLUORIDE + CORE.RA.addFluidExtractionRecipe( + FLUORIDES.ZIRCONIUM_TETRAFLUORIDE.getDust(1), + FLUORIDES.ZIRCONIUM_TETRAFLUORIDE.getFluidStack(144), + 200, + 512+256); + + } + + private static void macerator() { + + GT_ModHandler.addPulverisationRecipe( + ItemUtils.getItemStackOfAmountFromOreDict("pelletZirconium", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustZrCl4", 1)); + + } + + private static void mixerRecipes() { + + GT_Values.RA.addMixerRecipe( + ItemUtils.getItemStackOfAmountFromOreDict("dustUranium233", 4), + ItemUtils.getItemStackOfAmountFromOreDict("dustUranium235", 1), + null, + null, + FluidUtils.getFluidStack("hydrofluoricacid", 5000), + FLUORIDES.URANIUM_TETRAFLUORIDE.getFluidStack(5000), + null, + 3000, + 500); + + } + + + private static void sifter() { + + // Zirconium + GT_Values.RA.addSifterRecipe( + ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedIlmenite", 1), + new ItemStack[] { + ItemUtils.getItemStackOfAmountFromOreDict("dustIron", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustTinyWroughtIron", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustHafnium", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustHafnium", 1) }, + new int[] { 5000, 2500, 1000, 1000, 300, 300 }, + 20 * 30, + 500); + GT_Values.RA.addSifterRecipe( + ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedTin", 1), + new ItemStack[] { + ItemUtils.getItemStackOfAmountFromOreDict("dustTin", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustTinyZinc", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1) }, + new int[] { 10000, 5000, 1500, 1000, 500, 500 }, + 20 * 30, + 500); + GT_Values.RA.addSifterRecipe( + ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedCassiterite", 1), + new ItemStack[] { + ItemUtils.getItemStackOfAmountFromOreDict("dustCassiterite", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustTinyTin", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1) }, + new int[] { 10000, 5000, 1500, 1000, 500, 500 }, + 20 * 30, + 500); + + // Radium + GT_Values.RA.addSifterRecipe( + ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedUranium", 1), + new ItemStack[] { + ItemUtils.getItemStackOfAmountFromOreDict("dustUranium", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustTinyLead", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1) }, + new int[] { 10000, 5000, 1000, 500, 500, 500 }, + 20 * 30, + 500); + GT_Values.RA.addSifterRecipe( + ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedUraninite", 1), + new ItemStack[] { + ItemUtils.getItemStackOfAmountFromOreDict("dustUraninite", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustTinyUranium", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1) }, + new int[] { 10000, 5000, 500, 250, 250, 250 }, + 20 * 30, + 500); + GT_Values.RA.addSifterRecipe( + ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedPitchblende", 1), + new ItemStack[] { + ItemUtils.getItemStackOfAmountFromOreDict("dustPitchblende", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustTinyLead", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1) }, + new int[] { 10000, 5000, 500, 250, 250, 250 }, + 20 * 30, + 500); + } + + private static void fluidHeater() { + + CORE.RA.addFluidHeaterRecipe( + FLUORIDES.SODIUM_FLUORIDE.getDust(1), + null, + FLUORIDES.SODIUM_FLUORIDE.getFluidStack(144), + 20 * 30, + 500); + + } + +} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_NuclearFuelProcessing.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_NuclearFuelProcessing.java new file mode 100644 index 0000000000..c2c8c01f45 --- /dev/null +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_NuclearFuelProcessing.java @@ -0,0 +1,372 @@ +package gtPlusPlus.xmod.gregtech.loaders.recipe; + +import gregtech.api.enums.GT_Values; +import gtPlusPlus.core.item.ModItems; +import gtPlusPlus.core.item.chemistry.NuclearChem; +import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.material.ELEMENT; +import gtPlusPlus.core.material.nuclear.FLUORIDES; +import gtPlusPlus.core.material.nuclear.NUCLIDE; +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 net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; + +public class RecipeLoader_NuclearFuelProcessing { + + public static void generate() { + + // Create Fuels + + final FluidStack aLithiumFluoride = FLUORIDES.LITHIUM_FLUORIDE.getFluidStack(100); + final FluidStack aBerylliumFluoride = FLUORIDES.BERYLLIUM_FLUORIDE.getFluidStack(100); + final FluidStack aThoriumFluoride = FLUORIDES.THORIUM_TETRAFLUORIDE.getFluidStack(100); + final FluidStack aZirconiumFluoride = FLUORIDES.ZIRCONIUM_TETRAFLUORIDE.getFluidStack(100); + final FluidStack aUraniumTetraFluoride = FLUORIDES.URANIUM_TETRAFLUORIDE.getFluidStack(100); + final FluidStack aUranium235 = ELEMENT.getInstance().URANIUM235.getFluidStack(1000); + final FluidStack aLiFBeF2ZrF4U235 = NUCLIDE.LiFBeF2ZrF4U235.getFluidStack(100); + final FluidStack aLiFBeF2ZrF4UF4 = NUCLIDE.LiFBeF2ZrF4UF4.getFluidStack(100); + final FluidStack aLiFBeF2ThF4UF4 = NUCLIDE.LiFBeF2ThF4UF4.getFluidStack(100); + + // 7LiF - BeF2 - ZrF4 - U235 - 590C + CORE.RA.addFissionFuel( + FluidUtils.getFluidStack(aLithiumFluoride, 550), + FluidUtils.getFluidStack(aBerylliumFluoride, 150), + FluidUtils.getFluidStack(aZirconiumFluoride, 60), + FluidUtils.getFluidStack(aUranium235, 240), + null, null, null, null, null, // Extra 5 inputs + FluidUtils.getFluidStack(aLiFBeF2ZrF4U235, 1000), + null, + 90 * 60 * 20, // Duration + MaterialUtils.getVoltageForTier(4) + ); + + // 7LiF - BeF2 - ZrF4 - UF4 - 650C + CORE.RA.addFissionFuel( + FluidUtils.getFluidStack(aLithiumFluoride, 600), + FluidUtils.getFluidStack(aBerylliumFluoride, 250), + FluidUtils.getFluidStack(aZirconiumFluoride, 80), + FluidUtils.getFluidStack(aUraniumTetraFluoride, 70), + null, null, null, null, null, // Extra 5 inputs + FluidUtils.getFluidStack(aLiFBeF2ZrF4UF4, 1000), + null, + 120 * 60 * 20, + MaterialUtils.getVoltageForTier(5) + ); + + // 7liF - BeF2 - ThF4 - UF4 - 566C + CORE.RA.addFissionFuel( + FluidUtils.getFluidStack(aLithiumFluoride, 580), + FluidUtils.getFluidStack(aBerylliumFluoride, 270), + FluidUtils.getFluidStack(aThoriumFluoride, 80), + FluidUtils.getFluidStack(aUraniumTetraFluoride, 70), + null, null, null, null, null, // Extra 5 inputs + FluidUtils.getFluidStack(aLiFBeF2ThF4UF4, 1000), + null, + 150 * 60 * 20, // Duration + MaterialUtils.getVoltageForTier(5) + ); + + + // Reprocess Fuels + + + // Reactor Blanket step 1 - Fluorination + CORE.RA.addReactorProcessingUnitRecipe( + CI.getNumberedAdvancedCircuit(17), + ELEMENT.getInstance().FLUORINE.getCell(6), + NUCLIDE.LiFThF4.getFluidStack(10000), + new ItemStack[] { + CI.emptyCells(5), + FLUORIDES.LITHIUM_FLUORIDE.getCell(1), + ItemUtils.getSimpleStack(ModItems.dustProtactinium233), + ItemUtils.getSimpleStack(ModItems.dustProtactinium233), + ItemUtils.getSimpleStack(ModItems.dustProtactinium233), + ItemUtils.getSimpleStack(ModItems.dustProtactinium233), + ItemUtils.getSimpleStack(ModItems.dustProtactinium233), + ItemUtils.getSimpleStack(ModItems.dustProtactinium233) + }, + new int[] {10000, 10000, 500, 500, 500, 250, 250, 250}, + NUCLIDE.UF6F2.getFluidStack(1500), + 20 * 60 * 10, + MaterialUtils.getVoltageForTier(5)); + CORE.RA.addReactorProcessingUnitRecipe( + CI.getNumberedAdvancedCircuit(18), + ELEMENT.getInstance().FLUORINE.getCell(6), + NUCLIDE.LiFBeF2ThF4.getFluidStack(10000), + new ItemStack[] { + CI.emptyCells(4), + FLUORIDES.LITHIUM_FLUORIDE.getCell(1), + FLUORIDES.BERYLLIUM_FLUORIDE.getCell(1), + ItemUtils.getSimpleStack(ModItems.dustProtactinium233), + ItemUtils.getSimpleStack(ModItems.dustProtactinium233), + ItemUtils.getSimpleStack(ModItems.dustProtactinium233), + ItemUtils.getSimpleStack(ModItems.dustProtactinium233), + ItemUtils.getSimpleStack(ModItems.dustProtactinium233), + ItemUtils.getSimpleStack(ModItems.dustProtactinium233) + }, + new int[] {10000, 10000, 10000, 1000, 1000, 1000, 500, 500, 500}, + NUCLIDE.UF6F2.getFluidStack(3000), + 20 * 60 * 10, + MaterialUtils.getVoltageForTier(5)); + + // Reactor Blanket step 1 - Fluorination + CORE.RA.addReactorProcessingUnitRecipe( + CI.getNumberedAdvancedCircuit(7), + ELEMENT.getInstance().FLUORINE.getCell(6), + NUCLIDE.Sparged_LiFThF4.getFluidStack(10000), + new ItemStack[] { + CI.emptyCells(4), + FLUORIDES.LITHIUM_FLUORIDE.getCell(2), + ItemUtils.getSimpleStack(ModItems.dustProtactinium233), + ItemUtils.getSimpleStack(ModItems.dustProtactinium233), + ItemUtils.getSimpleStack(ModItems.dustProtactinium233), + ItemUtils.getSimpleStack(ModItems.dustProtactinium233), + ItemUtils.getSimpleStack(ModItems.dustProtactinium233), + ItemUtils.getSimpleStack(ModItems.dustProtactinium233) + }, + new int[] {10000, 10000, 1000, 1000, 1000, 1000, 1000, 1000}, + NUCLIDE.UF6F2.getFluidStack(3000), + 20 * 60 * 5, + MaterialUtils.getVoltageForTier(5)); + CORE.RA.addReactorProcessingUnitRecipe( + CI.getNumberedAdvancedCircuit(8), + ELEMENT.getInstance().FLUORINE.getCell(6), + NUCLIDE.Sparged_LiFBeF2ThF4.getFluidStack(10000), + new ItemStack[] { + CI.emptyCells(2), + FLUORIDES.LITHIUM_FLUORIDE.getCell(2), + FLUORIDES.BERYLLIUM_FLUORIDE.getCell(2), + ItemUtils.getSimpleStack(ModItems.dustProtactinium233), + ItemUtils.getSimpleStack(ModItems.dustProtactinium233), + ItemUtils.getSimpleStack(ModItems.dustProtactinium233), + ItemUtils.getSimpleStack(ModItems.dustProtactinium233), + ItemUtils.getSimpleStack(ModItems.dustProtactinium233), + ItemUtils.getSimpleStack(ModItems.dustProtactinium233) + }, + new int[] {10000, 10000, 10000, 2000, 2000, 2000, 2000, 2000, 2000}, + NUCLIDE.UF6F2.getFluidStack(6000), + 20 * 60 * 5, + MaterialUtils.getVoltageForTier(5)); + + + // Reactor Blanket step 2 - Sorption + Cold Trap + CORE.RA.addColdTrapRecipe( + 8, + FLUORIDES.SODIUM_FLUORIDE.getCell(4), + NUCLIDE.UF6F2.getFluidStack(3000), + new ItemStack[] { + ELEMENT.getInstance().FLUORINE.getCell(2), + FLUORIDES.URANIUM_HEXAFLUORIDE.getCell(2), + ELEMENT.getInstance().URANIUM233.getDust(1), + ELEMENT.getInstance().URANIUM233.getDust(1), + ELEMENT.getInstance().URANIUM233.getDust(1) + }, + new int[] {10000, 10000, 3000, 2000, 1000}, + FLUORIDES.SODIUM_FLUORIDE.getFluidStack(2000), + 20 * 60 * 10, + MaterialUtils.getVoltageForTier(3)); + + + + + // Reactor Core step 0 - Process Burnt Salt + // Tier 1 Fuel - Gives back FLIBE and breeds U233 + /* CORE.RA.addReactorProcessingUnitRecipe( + CI.getNumberedAdvancedCircuit(1), + CI.emptyCells(2), + new FluidStack(NuclearChem.Burnt_LiFBeF2ZrF4U235, 4000), + new ItemStack[] { + FLUORIDES.LITHIUM_FLUORIDE.getCell(1), + ELEMENT.getInstance().URANIUM233.getCell(1) + }, + new int[] {10000, 10000}, + NUCLIDE.LiFBeF2.getFluidStack(2000), + 20 * 60 * 60, + MaterialUtils.getVoltageForTier(3));*/ + + + + // LiBeF2UF4FP + F2 = LiFBeF2 & UF6F2FP + // Reactor Core step 1 - Process Burnt Salt + CORE.RA.addReactorProcessingUnitRecipe( + CI.getNumberedAdvancedCircuit(1), + ELEMENT.getInstance().FLUORINE.getCell(1), + NUCLIDE.LiFBeF2UF4FP.getFluidStack(1000), + new ItemStack[] { + NUCLIDE.UF6F2FP.getCell(1) + }, + new int[] {10000}, + FluidUtils.getFluidStack(NuclearChem.Impure_LiFBeF2, 1000), + 20 * 60 * 120, + MaterialUtils.getVoltageForTier(3)); + + // LiBeF2UF4FP + F2 = LiFBeF2 & UF6F2FP + // Reactor Core step 1 - Process Burnt Salt + CORE.RA.addReactorProcessingUnitRecipe( + CI.getNumberedAdvancedCircuit(1), + ELEMENT.getInstance().FLUORINE.getCell(3), + NUCLIDE.Sparged_LiFBeF2UF4FP.getFluidStack(1000), + new ItemStack[] { + CI.emptyCells(1), + NUCLIDE.UF6F2FP.getCell(2) + }, + new int[] {10000}, + FluidUtils.getFluidStack(NuclearChem.Impure_LiFBeF2, 2000), + 20 * 60 * 60, + MaterialUtils.getVoltageForTier(3)); + + + + // Reactor Core step 2A - Sorption + Cold Trap + CORE.RA.addColdTrapRecipe( + 8, + FLUORIDES.SODIUM_FLUORIDE.getCell(3), + NUCLIDE.UF6F2FP.getFluidStack(2000), + new ItemStack[] { + ELEMENT.getInstance().FLUORINE.getCell(1), + FLUORIDES.URANIUM_HEXAFLUORIDE.getCell(2), + ELEMENT.getInstance().PHOSPHORUS.getDust(1), + ELEMENT.getInstance().PHOSPHORUS.getDust(1), + ELEMENT.getInstance().PHOSPHORUS.getDust(1), + ELEMENT.getInstance().PHOSPHORUS.getDust(1), + ELEMENT.getInstance().PHOSPHORUS.getDust(1), + ELEMENT.getInstance().PHOSPHORUS.getDust(1), + ELEMENT.getInstance().PHOSPHORUS.getDust(1) + }, + new int[] {10000, 10000, 5000, 5000, 5000, 5000, 5000, 5000, 5000}, + FLUORIDES.SODIUM_FLUORIDE.getFluidStack(2000), + 20 * 60 * 10, + MaterialUtils.getVoltageForTier(4)); + + + // Reactor Core step 2B - Distillation + GT_Values.RA.addDistillationTowerRecipe( + FluidUtils.getFluidStack(NuclearChem.Impure_LiFBeF2, 1000), + new FluidStack[] { + NUCLIDE.LiFBeF2.getFluidStack(250) + }, + null, + 120 * 60 * 20, + MaterialUtils.getVoltageForTier(3)); + + + // UF6 -> UF4 reduction + // UF6 + LiFBeF2 + H2 -> LiFBeF2UF4 + HF + CORE.RA.addBlastRecipe( + new ItemStack[] { + FLUORIDES.URANIUM_HEXAFLUORIDE.getCell(1), + NUCLIDE.LiFBeF2.getCell(1) + }, + new FluidStack[] { + ELEMENT.getInstance().HYDROGEN.getFluidStack(2000) + }, + new ItemStack[] { + ItemUtils.getItemStackOfAmountFromOreDict("cellHydrofluoricAcid", 2), + CI.emptyCells(1) + }, + new FluidStack[] { + NUCLIDE.LiFBeF2UF4.getFluidStack(3000) + }, + 20 * 60 * 10, + MaterialUtils.getVoltageForTier(4), + 6500); + + + + + // LiFBeF2ZrF4U235 - We can't add both ZrF4 and U235 here, so best we leave this disabled. + /*CORE.RA.addReactorProcessingUnitRecipe( + CI.getNumberedAdvancedCircuit(8), + NUCLIDE.LiFBeF2UF4.getCell(9), + ELEMENT.getInstance().URANIUM235.getFluidStack(1000), + new ItemStack[] { + CI.emptyCells(9) + }, + new int[] {10000}, + NUCLIDE.LiFBeF2ZrF4U235.getFluidStack(10000), + 20 * 60 * 5, + MaterialUtils.getVoltageForTier(4));*/ + + // LiFBeF2ZrF4UF4 + /*CORE.RA.addReactorProcessingUnitRecipe( + CI.getNumberedAdvancedCircuit(9), + NUCLIDE.LiFBeF2UF4.getCell(9), + FLUORIDES.ZIRCONIUM_TETRAFLUORIDE.getFluidStack(1000), + new ItemStack[] { + CI.emptyCells(9) + }, + new int[] {10000}, + NUCLIDE.LiFBeF2ZrF4UF4.getFluidStack(10000), + 20 * 60 * 5, + MaterialUtils.getVoltageForTier(5)); + + CORE.RA.addReactorProcessingUnitRecipe( + CI.getNumberedAdvancedCircuit(9), + FLUORIDES.ZIRCONIUM_TETRAFLUORIDE.getCell(1), + NUCLIDE.LiFBeF2UF4.getFluidStack(9000), + new ItemStack[] { + CI.emptyCells(1) + }, + new int[] {10000}, + NUCLIDE.LiFBeF2ZrF4UF4.getFluidStack(10000), + 20 * 60 * 5, + MaterialUtils.getVoltageForTier(5));*/ + + CORE.RA.addFissionFuel( + FLUORIDES.ZIRCONIUM_TETRAFLUORIDE.getFluidStack(1000), + NUCLIDE.LiFBeF2UF4.getFluidStack(9000), + null, + null, + null, null, null, null, null, + NUCLIDE.LiFBeF2ZrF4UF4.getFluidStack(10000), + null, + 20 * 60 * 120, // Duration + MaterialUtils.getVoltageForTier(5) + ); + + // LiFBeF2ThF4UF4 + /*CORE.RA.addReactorProcessingUnitRecipe( + CI.getNumberedAdvancedCircuit(10), + NUCLIDE.LiFBeF2UF4.getCell(9), + FLUORIDES.THORIUM_TETRAFLUORIDE.getFluidStack(1000), + new ItemStack[] { + CI.emptyCells(9) + }, + new int[] {10000}, + NUCLIDE.LiFBeF2ThF4UF4.getFluidStack(10000), + 20 * 60 * 5, + MaterialUtils.getVoltageForTier(5)); + + CORE.RA.addReactorProcessingUnitRecipe( + CI.getNumberedAdvancedCircuit(10), + FLUORIDES.THORIUM_TETRAFLUORIDE.getCell(1), + NUCLIDE.LiFBeF2UF4.getFluidStack(9000), + new ItemStack[] { + CI.emptyCells(1) + }, + new int[] {10000}, + NUCLIDE.LiFBeF2ThF4UF4.getFluidStack(10000), + 20 * 60 * 5, + MaterialUtils.getVoltageForTier(5));*/ + + + CORE.RA.addFissionFuel( + FLUORIDES.THORIUM_TETRAFLUORIDE.getFluidStack(1000), + NUCLIDE.LiFBeF2UF4.getFluidStack(9000), + null, + null, + null, null, null, null, null, + NUCLIDE.LiFBeF2ThF4UF4.getFluidStack(10000), + null, + 20 * 60 * 150, // Duration + MaterialUtils.getVoltageForTier(5) + ); + + + + + } +} diff --git a/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java b/src/main/java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java index 0b4649e414..2b324fc172 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java @@ -1,17 +1,23 @@ package gtPlusPlus.xmod.gregtech.recipes; +import static gregtech.GT_Mod.GT_FML_LOGGER; import static gtPlusPlus.core.lib.CORE.GTNH; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import gregtech.api.GregTech_API; import gregtech.api.enums.ConfigCategories; import gregtech.api.enums.GT_Values; +import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.interfaces.internal.IGT_RecipeAdder; import gregtech.api.util.*; +import gregtech.api.util.GTPP_Recipe.GTPP_Recipe_Map; +import gregtech.api.util.GT_Recipe.GT_Recipe_AssemblyLine; import gregtech.api.util.GT_Recipe.GT_Recipe_Map; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; @@ -157,6 +163,30 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder { return false; } } + + + @Override + public boolean addCokeOvenRecipe(int aCircuit, ItemStack aInput2, FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs, ItemStack[] aOutputs, int aDuration, int aEUt) { + return addCokeOvenRecipe(CI.getNumberedCircuit(aCircuit), aInput2, aFluidInputs, aFluidOutputs, aOutputs, aDuration, aEUt); + } + + @Override + public boolean addCokeOvenRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs, ItemStack[] aOutputs, int aDuration, int aEUt) { + GTPP_Recipe aSpecialRecipe = new GTPP_Recipe( + true, + new ItemStack[] { aInput1, aInput2 }, + aOutputs, + null, + new int[] {}, + aFluidInputs, + aFluidOutputs, + Math.max(1, aDuration), + Math.max(1, aEUt), + 0); + int aSize = GTPP_Recipe.GTPP_Recipe_Map.sCokeOvenRecipes.mRecipeList.size(); + GTPP_Recipe.GTPP_Recipe_Map.sCokeOvenRecipes.add(aSpecialRecipe); + return GTPP_Recipe.GTPP_Recipe_Map.sCokeOvenRecipes.mRecipeList.size() > aSize; + } @Override public boolean addMatterFabricatorRecipe(final FluidStack aFluidInput, final FluidStack aFluidOutput, @@ -332,7 +362,7 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder { * aOutputItems, aDuration, aEUt); return true; } */ - @Override + /*@Override public boolean addDehydratorRecipe(final ItemStack aInput, final FluidStack aFluid, final ItemStack[] aOutput, int aDuration, final int aEUt) { Logger.WARNING("Trying to add a Dehydrator recipe."); @@ -363,7 +393,7 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder { Logger.WARNING("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE"); return false; } - } + }*/ @Override public boolean addDehydratorRecipe(final ItemStack[] aInput, final FluidStack aFluidInput, @@ -371,32 +401,26 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder { final int aEUt) throws IndexOutOfBoundsException { Logger.WARNING("Trying to add a Dehydrator recipe."); try { - if (aInput[0] != null) { - Logger.WARNING("Recipe requires input: " + aInput[0].getDisplayName() + " x" + aInput[0].stackSize); - } - if (aInput.length > 1) { - if (aInput[1] != null) { - Logger.WARNING("Recipe requires input: " + aInput[1].getDisplayName() + " x" + aInput[1].stackSize); + if (aInput != null && aInput.length > 0) { + if (aInput[0] != null) { + Logger.WARNING("Recipe requires input: " + aInput[0].getDisplayName() + " x" + aInput[0].stackSize); + } + if (aInput.length > 1) { + if (aInput[1] != null) { + Logger.WARNING("Recipe requires input: " + aInput[1].getDisplayName() + " x" + aInput[1].stackSize); + } } } if (aFluidInput != null) { Logger.WARNING("Recipe requires input: " + aFluidInput.getFluid().getName() + " " + aFluidInput.amount - + "mbst"); - } - if (((aInput[0] == null) && (aFluidInput == null)) || ((aOutputItems == null) && (aFluidOutput == null))) { - return false; + + "mbs"); } - if ((aOutputItems != null) - && ((aDuration = GregTech_API.sRecipeFile.get("dehydrator", aOutputItems[0], aDuration)) <= 0)) { + if (((aInput == null || aInput.length == 0) && (aFluidInput == null)) || ((aOutputItems == null || aOutputItems.length == 0) && (aFluidOutput == null))) { return false; } if (aOutputItems != null) { Logger.WARNING("Recipe will output: " + ItemUtils.getArrayStackNames(aOutputItems)); } - if ((aFluidOutput != null) && ((aDuration = GregTech_API.sRecipeFile.get("dehydrator", - aFluidOutput.getFluid().getName(), aDuration)) <= 0)) { - return false; - } if (aFluidOutput != null) { Logger.WARNING("Recipe will output: " + aFluidOutput.getFluid().getName()); } @@ -542,21 +566,29 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder { new FluidStack[] { aInput1, aInput2 }, new FluidStack[] { aOutput1 }, aDuration, aEUt, 16000); return true; } - + @Override public boolean addFissionFuel(final FluidStack aInput1, final FluidStack aInput2, final FluidStack aInput3, final FluidStack aInput4, final FluidStack aInput5, final FluidStack aInput6, final FluidStack aInput7, final FluidStack aInput8, final FluidStack aInput9, final FluidStack aOutput1, final FluidStack aOutput2, final int aDuration, final int aEUt) { + return addFissionFuel(false, aInput1, aInput2, aInput3, aInput4, aInput5, aInput6, aInput7, aInput8, aInput9, aOutput1, aOutput2, aDuration, aEUt); + } - if ((aInput1 == null) || (aInput2 == null) || (aOutput1 == null) || (aDuration < 1) || (aEUt < 1)) { + @Override + public boolean addFissionFuel(final boolean aOptimise, final FluidStack aInput1, final FluidStack aInput2, final FluidStack aInput3, + final FluidStack aInput4, final FluidStack aInput5, final FluidStack aInput6, final FluidStack aInput7, + final FluidStack aInput8, final FluidStack aInput9, final FluidStack aOutput1, final FluidStack aOutput2, + final int aDuration, final int aEUt) { + + if ((aInput1 == null) || (aOutput1 == null) || (aDuration < 1) || (aEUt < 1)) { return false; } final FluidStack inputs[] = { aInput1, aInput2, aInput3, aInput4, aInput5, aInput6, aInput7, aInput8, aInput9 }; final FluidStack outputs[] = { aOutput1, aOutput2 }; GTPP_Recipe aSpecialRecipe = new GTPP_Recipe( - true, + aOptimise, new ItemStack[] {}, new ItemStack[] {}, null, @@ -626,14 +658,6 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder { if (((aInput1 == null) && (aFluidInput == null)) || ((aOutput1 == null) && (aFluidOutput == null))) { return false; } - if ((aOutput1 != null) - && ((aDuration = GregTech_API.sRecipeFile.get("advancedmixer", aOutput1, aDuration)) <= 0)) { - return false; - } - if ((aFluidOutput != null) && ((aDuration = GregTech_API.sRecipeFile.get("advancedmixer", - aFluidOutput.getFluid().getName(), aDuration)) <= 0)) { - return false; - } GTPP_Recipe aSpecialRecipe = new GTPP_Recipe( true, new ItemStack[] { aInput1, aInput2, aInput3, aInput4 }, @@ -646,17 +670,9 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder { Math.max(1, aEUt), 0); - int aSize = GTPP_Recipe.GTPP_Recipe_Map.sAdvancedMixerRecipes.mRecipeList.size(); - int aSize2 = aSize; - GTPP_Recipe.GTPP_Recipe_Map.sAdvancedMixerRecipes.add(aSpecialRecipe); - aSize = GTPP_Recipe.GTPP_Recipe_Map.sAdvancedMixerRecipes.mRecipeList.size(); - - /*GTPP_Recipe.GTPP_Recipe_Map.sAdvancedMixerRecipes.addRecipe(true, - new ItemStack[] { aInput1, aInput2, aInput3, aInput4 }, - new ItemStack[] { aOutput1, aOutput2, aOutput3, aOutput4 }, null, null, - new FluidStack[] { aFluidInput }, new FluidStack[] { aFluidOutput }, aDuration, aEUt, 0);*/ - - return aSize > aSize2; + int aSize = GT_Recipe_Map.sMixerRecipes.mRecipeList.size(); + GT_Recipe_Map.sMixerRecipes.add(aSpecialRecipe); + return GT_Recipe_Map.sMixerRecipes.mRecipeList.size() > aSize; } // Machine Component Assembler @@ -1004,67 +1020,74 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder { return CORE.RA.addComponentMakerRecipe(aInputs, aInputFluid, aOutput1, aDuration, aEUt); } - public boolean addAssemblylineRecipe(ItemStack aResearchItem, int aResearchTime, ItemStack[] aInputs, FluidStack[] aFluidInputs_OLD, ItemStack aOutput, int aDuration, int aEUt) { - - FluidStack[] aFluidInputs = new FluidStack[4]; - AutoMap<FluidStack> aNewFluidMap = new AutoMap<FluidStack>(); - if (aFluidInputs_OLD.length > 4) { - for (FluidStack s : aFluidInputs_OLD) { - aNewFluidMap.put(s); - } - for (int i = 0; i < 4; i++) { - aFluidInputs[i] = aNewFluidMap.get(i); - } - } - else { - aFluidInputs = aFluidInputs_OLD; - } - - - if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) { - if (aInputs.length < 6 && aFluidInputs.length < 2) { - ItemStack[] aInputStack = new ItemStack[] {aResearchItem, aInputs[0], aInputs[1], aInputs[2], aInputs[3], aInputs[4]}; - return addSixSlotAssemblingRecipe(aInputStack, aFluidInputs[0], aOutput, aDuration, aEUt); - } - return false; - } - else { - if ((aResearchItem==null)||(aResearchTime<=0)||(aInputs == null) || (aOutput == null) || aInputs.length>15 || aInputs.length<4) { - return false; - } - else { - if (mAssemblyLine != null) { - try { - if (!tryAddTecTechScannerRecipe(aResearchItem, aInputs, aFluidInputs, aOutput, aDuration, aEUt)) { - try { - Logger.INFO("Failed to generate TecTech recipe for "+ItemUtils.getItemName(aResearchItem)+", please report this to Alkalus."); - } - catch (Throwable t) { - t.printStackTrace(); - } - } - return (boolean) mAssemblyLine.invoke(GT_Values.RA, aResearchItem, aResearchTime, aInputs, - aFluidInputs, aOutput, aDuration, aEUt); - } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) { - if (aInputs.length < 6 && aFluidInputs.length < 2) { - ItemStack[] aInputStack = new ItemStack[] { aResearchItem, aInputs[0], aInputs[1], - aInputs[2], aInputs[3], aInputs[4] }; - return addSixSlotAssemblingRecipe(aInputStack, aFluidInputs[0], aOutput, aDuration, - aEUt); - } - return false; - } - } else { - if (aInputs.length < 6 && aFluidInputs.length < 2) { - ItemStack[] aInputStack = new ItemStack[] { aResearchItem, aInputs[0], aInputs[1], aInputs[2], - aInputs[3], aInputs[4] }; - return addSixSlotAssemblingRecipe(aInputStack, aFluidInputs[0], aOutput, aDuration, - aEUt); - } - return false; - } - } - } + @Override + public boolean addAssemblylineRecipe(ItemStack aResearchItem, int aResearchTime, ItemStack[] aInputs, FluidStack[] aFluidInputs, ItemStack aOutput, int aDuration, int aEUt) { + if ((aResearchItem==null)||(aResearchTime<=0)||(aInputs == null) || (aOutput == null) || aInputs.length>15 || aInputs.length<4) { + return false; + } + if ((aDuration = GregTech_API.sRecipeFile.get("assemblingline", aOutput, aDuration)) <= 0) { + return false; + } + for(ItemStack tItem : aInputs){ + if(tItem==null){ + GT_FML_LOGGER.info("addAssemblingLineRecipe "+aResearchItem.getDisplayName()+" --> "+aOutput.getUnlocalizedName()+" there is some null item in that recipe"); + } + } + GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes.addFakeRecipe(false, new ItemStack[]{aResearchItem}, new ItemStack[]{aOutput}, new ItemStack[]{ItemList.Tool_DataStick.getWithName(1L, "Writes Research result", new Object[0])}, null, null, aResearchTime, 30, -201); + GT_Recipe.GT_Recipe_Map.sAssemblylineVisualRecipes.addFakeRecipe(false, aInputs, new ItemStack[]{aOutput}, new ItemStack[]{ItemList.Tool_DataStick.getWithName(1L, "Reads Research result", new Object[0])}, aFluidInputs, null, aDuration, aEUt, 0,true); + GT_Recipe.GT_Recipe_AssemblyLine.sAssemblylineRecipes.add(new GT_Recipe_AssemblyLine( aResearchItem, aResearchTime, aInputs, aFluidInputs, aOutput, aDuration, aEUt)); + return true; + } + + @Override + public boolean addAssemblylineRecipe(ItemStack aResearchItem, int aResearchTime, Object[] aInputs, FluidStack[] aFluidInputs, ItemStack aOutput, int aDuration, int aEUt) { + if ((aResearchItem==null)||(aResearchTime<=0)||(aInputs == null) || (aOutput == null) || aInputs.length>15 || aInputs.length<4) { + return false; + } + if ((aDuration = GregTech_API.sRecipeFile.get("assemblingline", aOutput, aDuration)) <= 0) { + return false; + } + ItemStack[] tInputs = new ItemStack[aInputs.length]; + ItemStack[][] tAlts = new ItemStack[aInputs.length][]; + for(int i = 0; i < aInputs.length; i++){ + Object obj = aInputs[i]; + if (obj instanceof ItemStack) { + tInputs[i] = (ItemStack) obj; + tAlts[i] = null; + continue; + } else if (obj instanceof ItemStack[]) { + ItemStack[] aStacks = (ItemStack[]) obj; + if (aStacks.length > 0) { + tInputs[i] = aStacks[0]; + tAlts[i] = (ItemStack[]) Arrays.copyOf(aStacks, aStacks.length); + continue; + } + } else if (obj instanceof Object[]) { + Object[] objs = (Object[]) obj; + List<ItemStack> tList; + if (objs.length >= 2 && !(tList = GT_OreDictUnificator.getOres(objs[0])).isEmpty()) { + try { + int tAmount = ((Number) objs[1]).intValue(); + List<ItemStack> uList = new ArrayList<>(); + for (ItemStack tStack : tList) { + ItemStack uStack = GT_Utility.copyAmount(tAmount, tStack); + if (GT_Utility.isStackValid(uStack)) { + uList.add(uStack); + if (tInputs[i] == null) + tInputs[i] = uStack; + } + } + tAlts[i] = uList.toArray(new ItemStack[uList.size()]); + continue; + } catch (Exception t) {} + } + } + GT_FML_LOGGER.info("addAssemblingLineRecipe "+aResearchItem.getDisplayName()+" --> "+aOutput.getUnlocalizedName()+" there is some null item in that recipe"); + } + GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes.addFakeRecipe(false, new ItemStack[]{aResearchItem}, new ItemStack[]{aOutput}, new ItemStack[]{ItemList.Tool_DataStick.getWithName(1L, "Writes Research result", new Object[0])}, null, null, aResearchTime, 30, -201); + GT_Recipe.GT_Recipe_Map.sAssemblylineVisualRecipes.addFakeRecipe(false,tInputs,new ItemStack[]{aOutput},new ItemStack[]{ItemList.Tool_DataStick.getWithName(1L, "Reads Research result", new Object[0])},aFluidInputs,null,aDuration,aEUt,0,tAlts,true); + GT_Recipe.GT_Recipe_AssemblyLine.sAssemblylineRecipes.add(new GT_Recipe_AssemblyLine( aResearchItem, aResearchTime, tInputs, aFluidInputs, aOutput, aDuration, aEUt, tAlts)); + return true; } private boolean tryAddTecTechScannerRecipe(ItemStack aResearchItem, Object[] aInputs, FluidStack[] aFluidInputs, ItemStack aOutput, int assDuration, int assEUt) { @@ -1406,18 +1429,18 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder { } @Override - public boolean addUvLaserRecipe(ItemStack aInput1, ItemStack aInput2, ItemStack aOutput, int time, long eu) { + public boolean addUvLaserRecipe(ItemStack aInput1, ItemStack aOutput, int time, long eu) { // Generate Special Laser Recipe GT_Recipe u = new GTPP_Recipe( false, new ItemStack[] { aInput1, - aInput2, + GregtechItemList.Laser_Lens_WoodsGlass.get(1), }, new ItemStack[] { aOutput }, - GregtechItemList.Laser_Lens_WoodsGlass.get(1), + null, new int[] { 10000 }, @@ -1430,8 +1453,8 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder { } @Override - public boolean addIrLaserRecipe(ItemStack aInput1, ItemStack aInput2, ItemStack aOutput, int time, long eu) { - return addUvLaserRecipe(aInput1, aInput2, aOutput, time, eu); + public boolean addIrLaserRecipe(ItemStack aInput1, ItemStack aOutput, int time, long eu) { + return addUvLaserRecipe(aInput1, aOutput, time, eu); } @@ -1731,8 +1754,77 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder { } + @Override + public boolean addColdTrapRecipe(int aCircuit, ItemStack aInput, FluidStack aFluidInput, ItemStack[] aOutputs, int[] aChances, FluidStack aFluidOutput, int aTime, int aEU) { + GTPP_Recipe aRecipe = new GTPP_Recipe( + false, + new ItemStack[] {CI.getNumberedAdvancedCircuit(aCircuit), aInput}, + aOutputs, + null, + aChances, + new FluidStack[] {aFluidInput}, + new FluidStack[] {aFluidOutput}, + aTime, + aEU, + 0); + + int aSize = GTPP_Recipe_Map.sColdTrapRecipes.mRecipeList.size(); + GTPP_Recipe_Map.sColdTrapRecipes.add(aRecipe); + return GTPP_Recipe_Map.sColdTrapRecipes.mRecipeList.size() > aSize; + } + + @Override + public boolean addReactorProcessingUnitRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput, ItemStack[] aOutputs, int[] aChances, FluidStack aFluidOutput, int aTime, int aEU) { + GTPP_Recipe aRecipe = new GTPP_Recipe( + false, + new ItemStack[] {aInput1, aInput2}, + aOutputs, + null, + aChances, + new FluidStack[] {aFluidInput}, + new FluidStack[] {aFluidOutput}, + aTime, + aEU, + 0); + + int aSize = GTPP_Recipe_Map.sReactorProcessingUnitRecipes.mRecipeList.size(); + GTPP_Recipe_Map.sReactorProcessingUnitRecipes.add(aRecipe); + return GTPP_Recipe_Map.sReactorProcessingUnitRecipes.mRecipeList.size() > aSize; + } + + + @Override + public boolean addFluidHeaterRecipe(ItemStack aInput, FluidStack aFluidInput, FluidStack aOutput, int aDuration, int aEUt) { + if ((aInput == null && aFluidInput == null) || (aOutput == null)) { + return false; + } + GT_Recipe.GT_Recipe_Map.sFluidHeaterRecipes.addRecipe(true, new ItemStack[]{aInput}, null, null, new FluidStack[]{aFluidInput}, new FluidStack[]{aOutput}, aDuration, aEUt, 0); + return true; + } + + + @Override + public boolean addVacuumFreezerRecipe(ItemStack aInput, ItemStack aOutput, int aDuration, int aEUt) { + if ((aInput == null) || (aOutput == null)) { + return false; + } + GTPP_Recipe aRecipe = new GTPP_Recipe( + false, + new ItemStack[] {aInput}, + new ItemStack[] {aOutput}, + null, + new int[] {10000}, + new FluidStack[] {}, + new FluidStack[] {}, + aDuration, + aEUt, + 0); + int aSize = GT_Recipe_Map.sVacuumRecipes.mRecipeList.size(); + GT_Recipe_Map.sVacuumRecipes.add(aRecipe); + return GT_Recipe_Map.sVacuumRecipes.mRecipeList.size() > aSize; + } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/recipes/RecipesToRemove.java b/src/main/java/gtPlusPlus/xmod/gregtech/recipes/RecipesToRemove.java index 99e3d5c4d9..99e3d5c4d9 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/recipes/RecipesToRemove.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/recipes/RecipesToRemove.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_AssemblyLine.java b/src/main/java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_AssemblyLine.java index 15115647ae..15115647ae 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_AssemblyLine.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_AssemblyLine.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_CokeOven.java b/src/main/java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_CokeOven.java index cd06f86ef9..cd06f86ef9 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_CokeOven.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_CokeOven.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_Dehydrator.java b/src/main/java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_Dehydrator.java index 402d47d3e5..402d47d3e5 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_Dehydrator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_Dehydrator.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_MatterFabricator.java b/src/main/java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_MatterFabricator.java index df51f1ad77..df51f1ad77 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_MatterFabricator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/recipes/machines/RECIPEHANDLER_MatterFabricator.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java index 0817202e85..0817202e85 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedBoilers.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedBoilers.java index d50a8f3924..d50a8f3924 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedBoilers.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedBoilers.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedMixer.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedMixer.java index 3cefaa1bf7..3cefaa1bf7 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedMixer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedMixer.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAlgaeContent.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAlgaeContent.java index 6ddc971f85..6ddc971f85 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAlgaeContent.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAlgaeContent.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAmazonWarehouse.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAmazonWarehouse.java index 8adf580011..8adf580011 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAmazonWarehouse.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAmazonWarehouse.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechBedrockPlatforms.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechBedrockPlatforms.java index 43a9402be2..43a9402be2 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechBedrockPlatforms.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechBedrockPlatforms.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechBufferDynamos.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechBufferDynamos.java index f236002505..f236002505 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechBufferDynamos.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechBufferDynamos.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechComponentAssembler.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechComponentAssembler.java index 73d29b2174..73d29b2174 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechComponentAssembler.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechComponentAssembler.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java index 9a5fa6f6de..9a5fa6f6de 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java index 64e77393bd..b93933d088 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java @@ -68,7 +68,12 @@ public class GregtechCustomHatches { // Multiblock Air Intake Hatch GregtechItemList.Hatch_Air_Intake.set(new GT_MetaTileEntity_Hatch_AirIntake(861, "hatch.air.intake.tier.00", "Air Intake Hatch", 5).getStackForm(1L)); + GregtechItemList.Hatch_Air_Intake_Extreme.set(new GT_MetaTileEntity_Hatch_AirIntake_Extreme(31070, "hatch.air.intake.tier.01", "Extreme Air Intake Hatch", 6).getStackForm(1L)); + // Multiblock Reservoir Hatch + GregtechItemList.Hatch_Reservoir.set(new GT_MetaTileEntity_Hatch_Reservoir(31071, "hatch.water.intake.tier.00", "Reservoir Hatch", 6).getStackForm(1L)); + + // Steam Hatch GregtechItemList.Hatch_Input_Steam .set(new GT_MetaTileEntity_Hatch_CustomFluidBase(FluidUtils.getSteam(1).getFluid(), // Fluid diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCyclotron.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCyclotron.java index e095ed4cbe..e095ed4cbe 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCyclotron.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCyclotron.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java index 5f6f557b11..a8b5aea0e6 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java @@ -1,12 +1,10 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; -import net.minecraft.item.ItemStack; - -import gregtech.api.enums.*; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_GT_Recipe; +import gregtech.api.enums.GT_Values; +import gregtech.api.enums.ItemList; +import gregtech.api.enums.Materials; +import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GTPP_Recipe; - import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.lib.LoadedMods; @@ -14,8 +12,9 @@ import gtPlusPlus.core.material.ALLOY; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Dehydrator; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.GregtechMetaTileEntity_IndustrialDehydrator; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.advanced.GregtechMetaTileEntity_Adv_EBF; +import net.minecraft.item.ItemStack; public class GregtechDehydrator { public static void run() { @@ -44,37 +43,67 @@ public class GregtechDehydrator { //Basic GregtechItemList.GT_Dehydrator_MV - .set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(911, "machine.dehydrator.tier.00", - "Basic Dehydrator I", 2, "This dehydrates your Grapes into Raisins. ", - GTPP_Recipe.GTPP_Recipe_Map.sChemicalDehydratorRecipes, 2, 9, 16000, 2, 5, "Dehydrator.png", - "", false, false, 0, "UNBOXINATOR", null).getStackForm(1L)); + .set(new GT_MetaTileEntity_Dehydrator( + 911, + "machine.dehydrator.tier.00", + "Basic Dehydrator I", + 2, + "This dehydrates your Grapes into Raisins.", + 16000) + .getStackForm(1L)); + GregtechItemList.GT_Dehydrator_HV - .set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(912, "machine.dehydrator.tier.01", - "Basic Dehydrator II", 3, "This dehydrates your Grapes into Raisins. ", - GTPP_Recipe.GTPP_Recipe_Map.sChemicalDehydratorRecipes, 2, 9, 32000, 2, 5, "Dehydrator.png", - "", false, false, 0, "UNBOXINATOR", null).getStackForm(1L)); + .set(new GT_MetaTileEntity_Dehydrator( + 912, + "machine.dehydrator.tier.01", + "Basic Dehydrator II", + 3, + "This dehydrates your Grapes into Raisins.", + 32000) + .getStackForm(1L)); + //Chemical + GregtechItemList.GT_Dehydrator_EV - .set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(813, "advancedmachine.dehydrator.tier.01", - "Chemical Dehydrator I", 4, "This dehydrates your Grapes into Raisins. ", - GTPP_Recipe.GTPP_Recipe_Map.sChemicalDehydratorRecipes, 2, 9, 48000, 2, 5, "Dehydrator.png", - "", false, false, 0, "UNBOXINATOR", null).getStackForm(1L)); - GregtechItemList.GT_Dehydrator_IV.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(814, - "advancedmachine.dehydrator.tier.02", "Chemical Dehydrator II", 5, - "A hangover is the way your body reacts to dehydration. ", - GTPP_Recipe.GTPP_Recipe_Map.sChemicalDehydratorRecipes, 2, 9, 64000, 2, 5, "Dehydrator.png", "", - false, false, 0, "UNBOXINATOR", null).getStackForm(1L)); - GregtechItemList.GT_Dehydrator_LuV.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(815, - "advancedmachine.dehydrator.tier.03", "Chemical Dehydrator III", 6, - "You could probably make space icecream with this.. ", - GTPP_Recipe.GTPP_Recipe_Map.sChemicalDehydratorRecipes, 2, 9, 64000, 2, 5, "Dehydrator.png", "", - false, false, 0, "UNBOXINATOR", null).getStackForm(1L)); - GregtechItemList.GT_Dehydrator_ZPM.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(816, - "advancedmachine.dehydrator.tier.04", "Chemical Dehydrator IV", 7, - "You can definitely make space icecream with this.. ", - GTPP_Recipe.GTPP_Recipe_Map.sChemicalDehydratorRecipes, 2, 9, 64000, 2, 5, "Dehydrator.png", "", - false, false, 0, "UNBOXINATOR", null).getStackForm(1L)); + .set(new GT_MetaTileEntity_Dehydrator( + 813, + "advancedmachine.dehydrator.tier.01", + "Chemical Dehydrator I", + 4, + "A hangover is the way your body reacts to dehydration.", + 48000) + .getStackForm(1L)); + + GregtechItemList.GT_Dehydrator_IV + .set(new GT_MetaTileEntity_Dehydrator( + 814, + "advancedmachine.dehydrator.tier.02", + "Chemical Dehydrator II", + 5, + "A hangover is the way your body reacts to dehydration.", + 48000) + .getStackForm(1L)); + + GregtechItemList.GT_Dehydrator_LuV + .set(new GT_MetaTileEntity_Dehydrator( + 815, + "advancedmachine.dehydrator.tier.03", + "Chemical Dehydrator III", + 6, + "You could probably make space icecream with this..", + 64000) + .getStackForm(1L)); + + GregtechItemList.GT_Dehydrator_ZPM + .set(new GT_MetaTileEntity_Dehydrator( + 816, + "advancedmachine.dehydrator.tier.04", + "Chemical Dehydrator IV", + 7, + "You can definitely make space icecream with this..", + 64000) + .getStackForm(1L)); //Advanced GregtechItemList.Controller_Vacuum_Furnace.set(new GregtechMetaTileEntity_IndustrialDehydrator(995, "multimachine.adv.vacuumfurnace", "Utupu-Tanuri").getStackForm(1L)); diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java index e82fade029..e82fade029 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechFactoryGradeReplacementMultis.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechFactoryGradeReplacementMultis.java index 8340b7088c..8340b7088c 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechFactoryGradeReplacementMultis.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechFactoryGradeReplacementMultis.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechFluidReactor.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechFluidReactor.java index 86146640fd..86146640fd 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechFluidReactor.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechFluidReactor.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeneratorsULV b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeneratorsULV index d063d85b1f..d063d85b1f 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeneratorsULV +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeneratorsULV diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeneratorsULV.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeneratorsULV.java index 1663c9ada4..1663c9ada4 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeneratorsULV.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeneratorsULV.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java index 2e7e96dd2f..2e7e96dd2f 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechHiAmpTransformer.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechHiAmpTransformer.java index a69c91e93b..a69c91e93b 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechHiAmpTransformer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechHiAmpTransformer.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialAlloySmelter.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialAlloySmelter.java index 6587e3a253..6587e3a253 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialAlloySmelter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialAlloySmelter.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialArcFurnace.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialArcFurnace.java index fb8f69e865..fb8f69e865 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialArcFurnace.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialArcFurnace.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialBlastSmelter.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialBlastSmelter.java index 15c2d9b238..15c2d9b238 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialBlastSmelter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialBlastSmelter.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCentrifuge.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCentrifuge.java index dfbe7304ef..dfbe7304ef 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCentrifuge.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCentrifuge.java diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialChisel.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialChisel.java new file mode 100644 index 0000000000..2027e6b190 --- /dev/null +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialChisel.java @@ -0,0 +1,25 @@ +package gtPlusPlus.xmod.gregtech.registration.gregtech; + +import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaTileEntity_AutoChisel; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.GregtechMetaTileEntity_IndustrialChisel; + +public class GregtechIndustrialChisel { + + public static void run() { + GregtechItemList.GT_Chisel_LV.set(new GregtechMetaTileEntity_AutoChisel(31066, + "chisel.tier.01", "Basic Auto-Chisel", 1).getStackForm(1L)); + GregtechItemList.GT_Chisel_MV.set(new GregtechMetaTileEntity_AutoChisel(31067, + "chisel.tier.02", "Advanced Auto-Chisel", 2).getStackForm(1L)); + GregtechItemList.GT_Chisel_HV.set(new GregtechMetaTileEntity_AutoChisel(31068, + "chisel.tier.03", "Precision Auto-Chisel", 3).getStackForm(1L)); + + GregtechItemList.Controller_IndustrialAutoChisel.set( + new GregtechMetaTileEntity_IndustrialChisel(31069, + "multimachine.adv.chisel", + "Industrial 3D Copying Machine").getStackForm(1L)); + + + } + +} diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCokeOven.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCokeOven.java index 7afc73709a..7afc73709a 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCokeOven.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCokeOven.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCuttingFactory.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCuttingFactory.java index f6133f6bf3..f6133f6bf3 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCuttingFactory.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCuttingFactory.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElectrolyzer.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElectrolyzer.java index 10d7510625..10d7510625 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElectrolyzer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElectrolyzer.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElementDuplicator.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElementDuplicator.java index 59b6d78a4f..9e940dff26 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElementDuplicator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElementDuplicator.java @@ -1,10 +1,8 @@ -/* package gtPlusPlus.xmod.gregtech.registration.gregtech; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_ElementalDataOrbHolder; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Steam_BusInput; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GregtechMTE_ElementalDuplicator; public class GregtechIndustrialElementDuplicator { @@ -19,4 +17,4 @@ public class GregtechIndustrialElementDuplicator { } } -*/ + diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialExtruder.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialExtruder.java index 51b2f4b0d5..51b2f4b0d5 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialExtruder.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialExtruder.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFishPond.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFishPond.java index 681256a385..681256a385 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFishPond.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFishPond.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFuelRefinery.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFuelRefinery.java index 0b6dcb1b94..0b6dcb1b94 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFuelRefinery.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFuelRefinery.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialGeneratorArray.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialGeneratorArray.java index 9bdcf231d0..9bdcf231d0 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialGeneratorArray.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialGeneratorArray.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMacerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMacerator.java index c67296fc53..c67296fc53 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMacerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMacerator.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java index f07be17ffd..f07be17ffd 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMixer.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMixer.java index 9c8673682c..9c8673682c 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMixer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMixer.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMultiMachine.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMultiMachine.java index 40d6c12f0b..40d6c12f0b 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMultiMachine.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMultiMachine.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMultiTank.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMultiTank.java index 1d723784ac..1d723784ac 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMultiTank.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMultiTank.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialPlatePress.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialPlatePress.java index ecf1e73675..ecf1e73675 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialPlatePress.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialPlatePress.java diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialRockBreaker.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialRockBreaker.java new file mode 100644 index 0000000000..562693ee3e --- /dev/null +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialRockBreaker.java @@ -0,0 +1,13 @@ +package gtPlusPlus.xmod.gregtech.registration.gregtech; + +import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GregtechMetaTileEntity_IndustrialRockBreaker; + +public class GregtechIndustrialRockBreaker { + + public static void run() { + GregtechItemList.Controller_IndustrialRockBreaker.set(new GregtechMetaTileEntity_IndustrialRockBreaker(31065, + "industrialrockcrusher.controller.tier.single", "Boldarnator").getStackForm(1L)); + } + +} diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialSifter.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialSifter.java index 15bf42c9d4..8fa4cb6cb1 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialSifter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialSifter.java @@ -18,7 +18,6 @@ public class GregtechIndustrialSifter { } private static void run1() { - // Industrial Maceration Stack Multiblock GregtechItemList.Industrial_Sifter.set(new GregtechMetaTileEntity_IndustrialSifter(840, "industrialsifter.controller.tier.single", "Large Sifter Control Block").getStackForm(1L)); diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialThermalCentrifuge.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialThermalCentrifuge.java index 01c04b4668..01c04b4668 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialThermalCentrifuge.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialThermalCentrifuge.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialTreeFarm.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialTreeFarm.java index 47dd3c265f..47dd3c265f 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialTreeFarm.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialTreeFarm.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWashPlant.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWashPlant.java index f66ebca60e..f66ebca60e 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWashPlant.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWashPlant.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWiremill.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWiremill.java index 6d575991bd..6d575991bd 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWiremill.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWiremill.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIronBlastFurnace.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIronBlastFurnace.java index 1bcd0f3300..1bcd0f3300 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIronBlastFurnace.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIronBlastFurnace.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIsaMill.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIsaMill.java index 19c361be93..19c361be93 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIsaMill.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIsaMill.java diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLFTR.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLFTR.java new file mode 100644 index 0000000000..cef60ba712 --- /dev/null +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLFTR.java @@ -0,0 +1,36 @@ +package gtPlusPlus.xmod.gregtech.registration.gregtech; + +import gtPlusPlus.api.objects.Logger; +import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaTileEntity_ReactorColdTrap; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaTileEntity_ReactorProcessingUnit; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.GregtechMetaTileEntity_SpargeTower; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GregtechMTE_NuclearReactor; + +public class GregtechLFTR { + + public static void run() { + if (gtPlusPlus.core.lib.LoadedMods.Gregtech) { + Logger.INFO("Gregtech5u Content | Registering Liquid Fluorine Thorium Reactor [LFTR]."); + if (CORE.ConfigSwitches.enableMultiblock_LiquidFluorideThoriumReactor) { + run1(); + } + } + + } + + private static void run1() { + // LFTR + GregtechItemList.ThoriumReactor.set(new GregtechMTE_NuclearReactor(751, "lftr.controller.single", "Thorium Reactor [LFTR]").getStackForm(1L)); + // Reactor Processing Units + GregtechItemList.ReactorProcessingUnit_IV.set(new GregtechMetaTileEntity_ReactorProcessingUnit(31031, "rpu.tier.01", "Reactor Processing Unit I", 5).getStackForm(1L)); + GregtechItemList.ReactorProcessingUnit_ZPM.set(new GregtechMetaTileEntity_ReactorProcessingUnit(31032, "rpu.tier.02", "Reactor Processing Unit II", 7).getStackForm(1L)); + // Cold Traps + GregtechItemList.ColdTrap_IV.set(new GregtechMetaTileEntity_ReactorColdTrap(31033, "coldtrap.tier.01", "Cold Trap I", 5).getStackForm(1L)); + GregtechItemList.ColdTrap_ZPM.set(new GregtechMetaTileEntity_ReactorColdTrap(31034, "coldtrap.tier.02", "Cold Trap II", 7).getStackForm(1L)); + // Sparge Tower + GregtechItemList.Controller_Sparge_Tower.set(new GregtechMetaTileEntity_SpargeTower(31035, "sparge.controller.single", "Sparge Tower Controller").getStackForm(1L)); + + } +} diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLargeTurbinesAndHeatExchanger.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLargeTurbinesAndHeatExchanger.java index 9b9f5fd59b..9b9f5fd59b 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLargeTurbinesAndHeatExchanger.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLargeTurbinesAndHeatExchanger.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechMiniRaFusion.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechMiniRaFusion.java index aea40c564c..aea40c564c 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechMiniRaFusion.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechMiniRaFusion.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechNaqReactor.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechNaqReactor.java index e2c63c77da..e2c63c77da 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechNaqReactor.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechNaqReactor.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechNitroDieselFix.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechNitroDieselFix.java index 6095413150..6095413150 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechNitroDieselFix.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechNitroDieselFix.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPollutionDevices.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPollutionDevices.java index c470243822..c470243822 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPollutionDevices.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPollutionDevices.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPowerBreakers.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPowerBreakers.java index 3e9582b80a..3e9582b80a 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPowerBreakers.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPowerBreakers.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPowerSubStation.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPowerSubStation.java index 9e94d633f6..9e94d633f6 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPowerSubStation.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPowerSubStation.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRTG.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRTG.java index a7332657ce..a7332657ce 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRTG.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRTG.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRocketFuelGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRocketFuelGenerator.java index 5a7d3a50d7..5a7d3a50d7 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRocketFuelGenerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRocketFuelGenerator.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSafeBlock.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSafeBlock.java index 124b5d114d..124b5d114d 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSafeBlock.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSafeBlock.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSemiFluidgenerators.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSemiFluidgenerators.java index 6b38415db1..6b38415db1 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSemiFluidgenerators.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSemiFluidgenerators.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSimpleWasher.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSimpleWasher.java index d2087b22f4..d2087b22f4 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSimpleWasher.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSimpleWasher.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSolarGenerators.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSolarGenerators.java index 45f78d660b..45f78d660b 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSolarGenerators.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSolarGenerators.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSolarTower.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSolarTower.java index d7f8f7f4d5..d7f8f7f4d5 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSolarTower.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSolarTower.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSteamCondenser.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSteamCondenser.java index 60e6b31936..60e6b31936 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSteamCondenser.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSteamCondenser.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSteamMultis.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSteamMultis.java index add0400d87..add0400d87 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSteamMultis.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSteamMultis.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSuperChests.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSuperChests.java index 5027e2d6e8..5027e2d6e8 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSuperChests.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSuperChests.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSuperConductionPoint.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSuperConductionPoint.java index 1376f4313d..1376f4313d 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSuperConductionPoint.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSuperConductionPoint.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTeslaTower.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTeslaTower.java index 1c5181130b..1c5181130b 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTeslaTower.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTeslaTower.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechThaumcraftDevices.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechThaumcraftDevices.java index 398d2caf01..398d2caf01 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechThaumcraftDevices.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechThaumcraftDevices.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechThreadedBuffers.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechThreadedBuffers.java index 23c9f7e666..23c9f7e666 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechThreadedBuffers.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechThreadedBuffers.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredChunkloaders.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredChunkloaders.java index bbfd568e54..bbfd568e54 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredChunkloaders.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredChunkloaders.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredFluidTanks.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredFluidTanks.java index 2a4a2b9f85..2a4a2b9f85 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredFluidTanks.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredFluidTanks.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTreeFarmerTE.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTreeFarmerTE.java index 07139da024..07139da024 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTreeFarmerTE.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTreeFarmerTE.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechWirelessChargers.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechWirelessChargers.java index ca90724400..ca90724400 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechWirelessChargers.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechWirelessChargers.java diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/NewHorizonsAccelerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/NewHorizonsAccelerator.java index d5b95a61bf..d5b95a61bf 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/NewHorizonsAccelerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/NewHorizonsAccelerator.java diff --git a/src/Java/gtPlusPlus/xmod/growthcraft/HANDLER_GC.java b/src/main/java/gtPlusPlus/xmod/growthcraft/HANDLER_GC.java index d2f85e5daa..d2f85e5daa 100644 --- a/src/Java/gtPlusPlus/xmod/growthcraft/HANDLER_GC.java +++ b/src/main/java/gtPlusPlus/xmod/growthcraft/HANDLER_GC.java diff --git a/src/Java/gtPlusPlus/xmod/growthcraft/fishtrap/FishTrapHandler.java b/src/main/java/gtPlusPlus/xmod/growthcraft/fishtrap/FishTrapHandler.java index 43347949b6..43347949b6 100644 --- a/src/Java/gtPlusPlus/xmod/growthcraft/fishtrap/FishTrapHandler.java +++ b/src/main/java/gtPlusPlus/xmod/growthcraft/fishtrap/FishTrapHandler.java diff --git a/src/Java/gtPlusPlus/xmod/growthcraft/fishtrap/Growthcraft_New.java b/src/main/java/gtPlusPlus/xmod/growthcraft/fishtrap/Growthcraft_New.java index 41fec179b5..41fec179b5 100644 --- a/src/Java/gtPlusPlus/xmod/growthcraft/fishtrap/Growthcraft_New.java +++ b/src/main/java/gtPlusPlus/xmod/growthcraft/fishtrap/Growthcraft_New.java diff --git a/src/Java/gtPlusPlus/xmod/growthcraft/fishtrap/Growthcraft_Old.java b/src/main/java/gtPlusPlus/xmod/growthcraft/fishtrap/Growthcraft_Old.java index ab11c062e0..ab11c062e0 100644 --- a/src/Java/gtPlusPlus/xmod/growthcraft/fishtrap/Growthcraft_Old.java +++ b/src/main/java/gtPlusPlus/xmod/growthcraft/fishtrap/Growthcraft_Old.java diff --git a/src/Java/gtPlusPlus/xmod/ic2/CustomInternalName.java b/src/main/java/gtPlusPlus/xmod/ic2/CustomInternalName.java index a349d7f86e..a349d7f86e 100644 --- a/src/Java/gtPlusPlus/xmod/ic2/CustomInternalName.java +++ b/src/main/java/gtPlusPlus/xmod/ic2/CustomInternalName.java diff --git a/src/Java/gtPlusPlus/xmod/ic2/HANDLER_IC2.java b/src/main/java/gtPlusPlus/xmod/ic2/HANDLER_IC2.java index bb97132ab4..bb97132ab4 100644 --- a/src/Java/gtPlusPlus/xmod/ic2/HANDLER_IC2.java +++ b/src/main/java/gtPlusPlus/xmod/ic2/HANDLER_IC2.java diff --git a/src/Java/gtPlusPlus/xmod/ic2/block/RTGGenerator/BlockRTG.java b/src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/BlockRTG.java index 2a1b5ab44d..2a1b5ab44d 100644 --- a/src/Java/gtPlusPlus/xmod/ic2/block/RTGGenerator/BlockRTG.java +++ b/src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/BlockRTG.java diff --git a/src/Java/gtPlusPlus/xmod/ic2/block/RTGGenerator/TileEntityRTG.java b/src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/TileEntityRTG.java index aa50243914..aa50243914 100644 --- a/src/Java/gtPlusPlus/xmod/ic2/block/RTGGenerator/TileEntityRTG.java +++ b/src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/TileEntityRTG.java diff --git a/src/Java/gtPlusPlus/xmod/ic2/block/RTGGenerator/gui/CONTAINER_RTG.java b/src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/gui/CONTAINER_RTG.java index 0afe47c983..0afe47c983 100644 --- a/src/Java/gtPlusPlus/xmod/ic2/block/RTGGenerator/gui/CONTAINER_RTG.java +++ b/src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/gui/CONTAINER_RTG.java diff --git a/src/Java/gtPlusPlus/xmod/ic2/block/RTGGenerator/gui/GUI_RTG.java b/src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/gui/GUI_RTG.java index c6e09a78d1..c6e09a78d1 100644 --- a/src/Java/gtPlusPlus/xmod/ic2/block/RTGGenerator/gui/GUI_RTG.java +++ b/src/main/java/gtPlusPlus/xmod/ic2/block/RTGGenerator/gui/GUI_RTG.java diff --git a/src/Java/gtPlusPlus/xmod/ic2/block/kieticgenerator/IC2_BlockKineticGenerator.java b/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/IC2_BlockKineticGenerator.java index 95e785d1a1..95e785d1a1 100644 --- a/src/Java/gtPlusPlus/xmod/ic2/block/kieticgenerator/IC2_BlockKineticGenerator.java +++ b/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/IC2_BlockKineticGenerator.java diff --git a/src/Java/gtPlusPlus/xmod/ic2/block/kieticgenerator/IC2_TEComponent.java b/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/IC2_TEComponent.java index 2c4c2e1d16..2c4c2e1d16 100644 --- a/src/Java/gtPlusPlus/xmod/ic2/block/kieticgenerator/IC2_TEComponent.java +++ b/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/IC2_TEComponent.java diff --git a/src/Java/gtPlusPlus/xmod/ic2/block/kieticgenerator/container/ContainerKineticWindgenerator.java b/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/container/ContainerKineticWindgenerator.java index 2a5b4dc9ae..2a5b4dc9ae 100644 --- a/src/Java/gtPlusPlus/xmod/ic2/block/kieticgenerator/container/ContainerKineticWindgenerator.java +++ b/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/container/ContainerKineticWindgenerator.java diff --git a/src/Java/gtPlusPlus/xmod/ic2/block/kieticgenerator/container/IC2_ContainerBase.java b/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/container/IC2_ContainerBase.java index 740991c5d3..740991c5d3 100644 --- a/src/Java/gtPlusPlus/xmod/ic2/block/kieticgenerator/container/IC2_ContainerBase.java +++ b/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/container/IC2_ContainerBase.java diff --git a/src/Java/gtPlusPlus/xmod/ic2/block/kieticgenerator/gui/GuiKineticWindGenerator.java b/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/gui/GuiKineticWindGenerator.java index 44053ed2e0..44053ed2e0 100644 --- a/src/Java/gtPlusPlus/xmod/ic2/block/kieticgenerator/gui/GuiKineticWindGenerator.java +++ b/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/gui/GuiKineticWindGenerator.java diff --git a/src/Java/gtPlusPlus/xmod/ic2/block/kieticgenerator/tileentity/TileEntityKineticWindGenerator.java b/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/tileentity/TileEntityKineticWindGenerator.java index a2c39cb17b..a2c39cb17b 100644 --- a/src/Java/gtPlusPlus/xmod/ic2/block/kieticgenerator/tileentity/TileEntityKineticWindGenerator.java +++ b/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/tileentity/TileEntityKineticWindGenerator.java diff --git a/src/Java/gtPlusPlus/xmod/ic2/item/CustomKineticRotor.java b/src/main/java/gtPlusPlus/xmod/ic2/item/CustomKineticRotor.java index 92d711101b..92d711101b 100644 --- a/src/Java/gtPlusPlus/xmod/ic2/item/CustomKineticRotor.java +++ b/src/main/java/gtPlusPlus/xmod/ic2/item/CustomKineticRotor.java diff --git a/src/Java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradual.java b/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradual.java index bd1ad91588..bd1ad91588 100644 --- a/src/Java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradual.java +++ b/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradual.java diff --git a/src/Java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradualInteger.java b/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradualInteger.java index 3ccb2cb0ee..3ccb2cb0ee 100644 --- a/src/Java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradualInteger.java +++ b/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_ItemGradualInteger.java diff --git a/src/Java/gtPlusPlus/xmod/ic2/item/IC2_ItemIC2.java b/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_ItemIC2.java index 897e831b73..897e831b73 100644 --- a/src/Java/gtPlusPlus/xmod/ic2/item/IC2_ItemIC2.java +++ b/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_ItemIC2.java diff --git a/src/Java/gtPlusPlus/xmod/ic2/item/IC2_Items.java b/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_Items.java index 8c8b2ea7ad..8c8b2ea7ad 100644 --- a/src/Java/gtPlusPlus/xmod/ic2/item/IC2_Items.java +++ b/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_Items.java diff --git a/src/Java/gtPlusPlus/xmod/ic2/item/ItemGenerators.java b/src/main/java/gtPlusPlus/xmod/ic2/item/ItemGenerators.java index 0df2c8d7f1..0df2c8d7f1 100644 --- a/src/Java/gtPlusPlus/xmod/ic2/item/ItemGenerators.java +++ b/src/main/java/gtPlusPlus/xmod/ic2/item/ItemGenerators.java diff --git a/src/Java/gtPlusPlus/xmod/ic2/item/RotorBase.java b/src/main/java/gtPlusPlus/xmod/ic2/item/RotorBase.java index b9f9ab68ef..b9f9ab68ef 100644 --- a/src/Java/gtPlusPlus/xmod/ic2/item/RotorBase.java +++ b/src/main/java/gtPlusPlus/xmod/ic2/item/RotorBase.java diff --git a/src/Java/gtPlusPlus/xmod/ic2/item/RotorIridium.java b/src/main/java/gtPlusPlus/xmod/ic2/item/RotorIridium.java index b9dffbd371..b9dffbd371 100644 --- a/src/Java/gtPlusPlus/xmod/ic2/item/RotorIridium.java +++ b/src/main/java/gtPlusPlus/xmod/ic2/item/RotorIridium.java diff --git a/src/Java/gtPlusPlus/xmod/ic2/item/reactor/IC2_FuelRod_Base.java b/src/main/java/gtPlusPlus/xmod/ic2/item/reactor/IC2_FuelRod_Base.java index 01151024c4..01151024c4 100644 --- a/src/Java/gtPlusPlus/xmod/ic2/item/reactor/IC2_FuelRod_Base.java +++ b/src/main/java/gtPlusPlus/xmod/ic2/item/reactor/IC2_FuelRod_Base.java diff --git a/src/Java/gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java b/src/main/java/gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java index e22a609814..1b090cc51a 100644 --- a/src/Java/gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java +++ b/src/main/java/gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java @@ -272,7 +272,7 @@ public class RECIPE_IC2 { ItemUtils.getSimpleStack(aCoilIC2, 8), ItemUtils.getSimpleStack(aGearSmallAluminium, 4), }, - aRubber.getFluid(144 * 4), + aRubber.getFluidStack(144 * 4), GregtechItemList.Armour_Hazmat_Advanced_Helmet.get(1), 30 * 20, MaterialUtils.getVoltageForTier(2)); @@ -287,7 +287,7 @@ public class RECIPE_IC2 { ItemUtils.getSimpleStack(aPlateCobalt, 16), ItemUtils.getSimpleStack(aGearSiliconCarbide, 8), }, - aRubber.getFluid(144 * 10), + aRubber.getFluidStack(144 * 10), GregtechItemList.Armour_Hazmat_Advanced_Chest.get(1), 90 * 20, MaterialUtils.getVoltageForTier(2)); @@ -302,7 +302,7 @@ public class RECIPE_IC2 { ItemUtils.getSimpleStack(aPlateCobalt, 8), ItemUtils.getSimpleStack(aGearSiliconCarbide, 4), }, - aRubber.getFluid(144 * 8), + aRubber.getFluidStack(144 * 8), GregtechItemList.Armour_Hazmat_Advanced_Legs.get(1), 75 * 20, MaterialUtils.getVoltageForTier(2)); @@ -317,7 +317,7 @@ public class RECIPE_IC2 { ItemUtils.getSimpleStack(aGearSmallSteel, 8), ItemUtils.getSimpleStack(aGearPotin, 4), }, - aRubber.getFluid(144 * 6), + aRubber.getFluidStack(144 * 6), GregtechItemList.Armour_Hazmat_Advanced_Boots.get(1), 45 * 20, MaterialUtils.getVoltageForTier(2)); diff --git a/src/Java/gtPlusPlus/xmod/mekanism/HANDLER_Mekanism.java b/src/main/java/gtPlusPlus/xmod/mekanism/HANDLER_Mekanism.java index 9073f2ec7f..9073f2ec7f 100644 --- a/src/Java/gtPlusPlus/xmod/mekanism/HANDLER_Mekanism.java +++ b/src/main/java/gtPlusPlus/xmod/mekanism/HANDLER_Mekanism.java diff --git a/src/Java/gtPlusPlus/xmod/ob/GliderHandler.java b/src/main/java/gtPlusPlus/xmod/ob/GliderHandler.java index a190511b02..a190511b02 100644 --- a/src/Java/gtPlusPlus/xmod/ob/GliderHandler.java +++ b/src/main/java/gtPlusPlus/xmod/ob/GliderHandler.java diff --git a/src/Java/gtPlusPlus/xmod/ob/HANDLER_OpenBlocks.java b/src/main/java/gtPlusPlus/xmod/ob/HANDLER_OpenBlocks.java index c1b678f5ee..c1b678f5ee 100644 --- a/src/Java/gtPlusPlus/xmod/ob/HANDLER_OpenBlocks.java +++ b/src/main/java/gtPlusPlus/xmod/ob/HANDLER_OpenBlocks.java diff --git a/src/Java/gtPlusPlus/xmod/ob/SprinklerHandler.java b/src/main/java/gtPlusPlus/xmod/ob/SprinklerHandler.java index 85f8ded290..85f8ded290 100644 --- a/src/Java/gtPlusPlus/xmod/ob/SprinklerHandler.java +++ b/src/main/java/gtPlusPlus/xmod/ob/SprinklerHandler.java diff --git a/src/Java/gtPlusPlus/xmod/railcraft/HANDLER_Railcraft.java b/src/main/java/gtPlusPlus/xmod/railcraft/HANDLER_Railcraft.java index a21a759a77..a21a759a77 100644 --- a/src/Java/gtPlusPlus/xmod/railcraft/HANDLER_Railcraft.java +++ b/src/main/java/gtPlusPlus/xmod/railcraft/HANDLER_Railcraft.java diff --git a/src/Java/gtPlusPlus/xmod/railcraft/utils/RailcraftUtils.java b/src/main/java/gtPlusPlus/xmod/railcraft/utils/RailcraftUtils.java index eb1456d53e..eb1456d53e 100644 --- a/src/Java/gtPlusPlus/xmod/railcraft/utils/RailcraftUtils.java +++ b/src/main/java/gtPlusPlus/xmod/railcraft/utils/RailcraftUtils.java diff --git a/src/Java/gtPlusPlus/xmod/reliquary/HANDLER_Reliquary.java b/src/main/java/gtPlusPlus/xmod/reliquary/HANDLER_Reliquary.java index 7ebb4c7b1f..7ebb4c7b1f 100644 --- a/src/Java/gtPlusPlus/xmod/reliquary/HANDLER_Reliquary.java +++ b/src/main/java/gtPlusPlus/xmod/reliquary/HANDLER_Reliquary.java diff --git a/src/Java/gtPlusPlus/xmod/reliquary/item/ReliquaryItems.java b/src/main/java/gtPlusPlus/xmod/reliquary/item/ReliquaryItems.java index d1fb67a7d3..d1fb67a7d3 100644 --- a/src/Java/gtPlusPlus/xmod/reliquary/item/ReliquaryItems.java +++ b/src/main/java/gtPlusPlus/xmod/reliquary/item/ReliquaryItems.java diff --git a/src/Java/gtPlusPlus/xmod/reliquary/util/AlkahestRecipeWrapper.java b/src/main/java/gtPlusPlus/xmod/reliquary/util/AlkahestRecipeWrapper.java index 6086b74ec4..6086b74ec4 100644 --- a/src/Java/gtPlusPlus/xmod/reliquary/util/AlkahestRecipeWrapper.java +++ b/src/main/java/gtPlusPlus/xmod/reliquary/util/AlkahestRecipeWrapper.java diff --git a/src/Java/gtPlusPlus/xmod/reliquary/util/ReliquaryRecipeHandler.java b/src/main/java/gtPlusPlus/xmod/reliquary/util/ReliquaryRecipeHandler.java index 1133e67fe6..1133e67fe6 100644 --- a/src/Java/gtPlusPlus/xmod/reliquary/util/ReliquaryRecipeHandler.java +++ b/src/main/java/gtPlusPlus/xmod/reliquary/util/ReliquaryRecipeHandler.java diff --git a/src/Java/gtPlusPlus/xmod/sc2/HANDLER_SC2.java b/src/main/java/gtPlusPlus/xmod/sc2/HANDLER_SC2.java index f39a69dfbc..f39a69dfbc 100644 --- a/src/Java/gtPlusPlus/xmod/sc2/HANDLER_SC2.java +++ b/src/main/java/gtPlusPlus/xmod/sc2/HANDLER_SC2.java diff --git a/src/Java/gtPlusPlus/xmod/sc2/modules/ModuleExoticSeeds.java b/src/main/java/gtPlusPlus/xmod/sc2/modules/ModuleExoticSeeds.java index dfaec8b703..dfaec8b703 100644 --- a/src/Java/gtPlusPlus/xmod/sc2/modules/ModuleExoticSeeds.java +++ b/src/main/java/gtPlusPlus/xmod/sc2/modules/ModuleExoticSeeds.java diff --git a/src/Java/gtPlusPlus/xmod/sol/HANDLER_SpiceOfLife.java b/src/main/java/gtPlusPlus/xmod/sol/HANDLER_SpiceOfLife.java index 11cc5da89c..11cc5da89c 100644 --- a/src/Java/gtPlusPlus/xmod/sol/HANDLER_SpiceOfLife.java +++ b/src/main/java/gtPlusPlus/xmod/sol/HANDLER_SpiceOfLife.java diff --git a/src/Java/gtPlusPlus/xmod/thaumcraft/HANDLER_Thaumcraft.java b/src/main/java/gtPlusPlus/xmod/thaumcraft/HANDLER_Thaumcraft.java index b1353cc481..b1353cc481 100644 --- a/src/Java/gtPlusPlus/xmod/thaumcraft/HANDLER_Thaumcraft.java +++ b/src/main/java/gtPlusPlus/xmod/thaumcraft/HANDLER_Thaumcraft.java diff --git a/src/Java/gtPlusPlus/xmod/thaumcraft/aspect/GTPP_AspectCompat.java b/src/main/java/gtPlusPlus/xmod/thaumcraft/aspect/GTPP_AspectCompat.java index 56ad95c5e3..56ad95c5e3 100644 --- a/src/Java/gtPlusPlus/xmod/thaumcraft/aspect/GTPP_AspectCompat.java +++ b/src/main/java/gtPlusPlus/xmod/thaumcraft/aspect/GTPP_AspectCompat.java diff --git a/src/Java/gtPlusPlus/xmod/thaumcraft/aspect/GTPP_AspectStack.java b/src/main/java/gtPlusPlus/xmod/thaumcraft/aspect/GTPP_AspectStack.java index 23e9035f40..23e9035f40 100644 --- a/src/Java/gtPlusPlus/xmod/thaumcraft/aspect/GTPP_AspectStack.java +++ b/src/main/java/gtPlusPlus/xmod/thaumcraft/aspect/GTPP_AspectStack.java diff --git a/src/Java/gtPlusPlus/xmod/thaumcraft/commands/CommandDumpAspects.java b/src/main/java/gtPlusPlus/xmod/thaumcraft/commands/CommandDumpAspects.java index dda5a62b27..dda5a62b27 100644 --- a/src/Java/gtPlusPlus/xmod/thaumcraft/commands/CommandDumpAspects.java +++ b/src/main/java/gtPlusPlus/xmod/thaumcraft/commands/CommandDumpAspects.java diff --git a/src/Java/gtPlusPlus/xmod/thaumcraft/objects/ThreadAspectScanner.java b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/ThreadAspectScanner.java index fdcf7b8498..fdcf7b8498 100644 --- a/src/Java/gtPlusPlus/xmod/thaumcraft/objects/ThreadAspectScanner.java +++ b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/ThreadAspectScanner.java diff --git a/src/Java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/aspect/TC_AspectList_Wrapper.java b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/aspect/TC_AspectList_Wrapper.java index 9df38ca384..9df38ca384 100644 --- a/src/Java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/aspect/TC_AspectList_Wrapper.java +++ b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/aspect/TC_AspectList_Wrapper.java diff --git a/src/Java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/aspect/TC_Aspect_Wrapper.java b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/aspect/TC_Aspect_Wrapper.java index fda0fd27c5..fda0fd27c5 100644 --- a/src/Java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/aspect/TC_Aspect_Wrapper.java +++ b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/aspect/TC_Aspect_Wrapper.java diff --git a/src/Java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/recipe/Base_Recipe_Wrapper.java b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/recipe/Base_Recipe_Wrapper.java index 914144445c..914144445c 100644 --- a/src/Java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/recipe/Base_Recipe_Wrapper.java +++ b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/recipe/Base_Recipe_Wrapper.java diff --git a/src/Java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/recipe/TC_CrucibleRecipe_Wrapper.java b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/recipe/TC_CrucibleRecipe_Wrapper.java index 8ee4e7011d..8ee4e7011d 100644 --- a/src/Java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/recipe/TC_CrucibleRecipe_Wrapper.java +++ b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/recipe/TC_CrucibleRecipe_Wrapper.java diff --git a/src/Java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/recipe/TC_IArcaneRecipe_Wrapper.java b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/recipe/TC_IArcaneRecipe_Wrapper.java index fede079f7b..fede079f7b 100644 --- a/src/Java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/recipe/TC_IArcaneRecipe_Wrapper.java +++ b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/recipe/TC_IArcaneRecipe_Wrapper.java diff --git a/src/Java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/recipe/TC_InfusionEnchantmentRecipe_Wrapper.java b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/recipe/TC_InfusionEnchantmentRecipe_Wrapper.java index b52fa0e6a7..b52fa0e6a7 100644 --- a/src/Java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/recipe/TC_InfusionEnchantmentRecipe_Wrapper.java +++ b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/recipe/TC_InfusionEnchantmentRecipe_Wrapper.java diff --git a/src/Java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/recipe/TC_InfusionRecipe_Wrapper.java b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/recipe/TC_InfusionRecipe_Wrapper.java index a0c539f937..a0c539f937 100644 --- a/src/Java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/recipe/TC_InfusionRecipe_Wrapper.java +++ b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/recipe/TC_InfusionRecipe_Wrapper.java diff --git a/src/Java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_PageType_Wrapper.java b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_PageType_Wrapper.java index d6c7f66988..d6c7f66988 100644 --- a/src/Java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_PageType_Wrapper.java +++ b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_PageType_Wrapper.java diff --git a/src/Java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchCategories_Wrapper.java b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchCategories_Wrapper.java index 93869cb8d8..93869cb8d8 100644 --- a/src/Java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchCategories_Wrapper.java +++ b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchCategories_Wrapper.java diff --git a/src/Java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchCategoryList_Wrapper.java b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchCategoryList_Wrapper.java index 3e6f5b78f2..3e6f5b78f2 100644 --- a/src/Java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchCategoryList_Wrapper.java +++ b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchCategoryList_Wrapper.java diff --git a/src/Java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchItem_Wrapper.java b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchItem_Wrapper.java index 6372cc0371..6372cc0371 100644 --- a/src/Java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchItem_Wrapper.java +++ b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchItem_Wrapper.java diff --git a/src/Java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchNoteData_Wrapper.java b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchNoteData_Wrapper.java index 5adf0150d9..5adf0150d9 100644 --- a/src/Java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchNoteData_Wrapper.java +++ b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchNoteData_Wrapper.java diff --git a/src/Java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchPage_Wrapper.java b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchPage_Wrapper.java index 998f37bf8c..998f37bf8c 100644 --- a/src/Java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchPage_Wrapper.java +++ b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchPage_Wrapper.java diff --git a/src/Java/gtPlusPlus/xmod/thaumcraft/util/ThaumcraftUtils.java b/src/main/java/gtPlusPlus/xmod/thaumcraft/util/ThaumcraftUtils.java index 4f1006693e..4f1006693e 100644 --- a/src/Java/gtPlusPlus/xmod/thaumcraft/util/ThaumcraftUtils.java +++ b/src/main/java/gtPlusPlus/xmod/thaumcraft/util/ThaumcraftUtils.java diff --git a/src/Java/gtPlusPlus/xmod/thermalfoundation/HANDLER_TF.java b/src/main/java/gtPlusPlus/xmod/thermalfoundation/HANDLER_TF.java index fe9a82c6b5..fe9a82c6b5 100644 --- a/src/Java/gtPlusPlus/xmod/thermalfoundation/HANDLER_TF.java +++ b/src/main/java/gtPlusPlus/xmod/thermalfoundation/HANDLER_TF.java diff --git a/src/Java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Cryotheum.java b/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Cryotheum.java index a0480e907e..a0480e907e 100644 --- a/src/Java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Cryotheum.java +++ b/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Cryotheum.java diff --git a/src/Java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Ender.java b/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Ender.java index 513fe51fd9..513fe51fd9 100644 --- a/src/Java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Ender.java +++ b/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Ender.java diff --git a/src/Java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Pyrotheum.java b/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Pyrotheum.java index 5444e8d5ad..5444e8d5ad 100644 --- a/src/Java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Pyrotheum.java +++ b/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Pyrotheum.java diff --git a/src/Java/gtPlusPlus/xmod/thermalfoundation/block/TF_Blocks.java b/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Blocks.java index 6b56262b1a..6b56262b1a 100644 --- a/src/Java/gtPlusPlus/xmod/thermalfoundation/block/TF_Blocks.java +++ b/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Blocks.java diff --git a/src/Java/gtPlusPlus/xmod/thermalfoundation/fluid/TF_Fluids.java b/src/main/java/gtPlusPlus/xmod/thermalfoundation/fluid/TF_Fluids.java index 6ebae64384..6ebae64384 100644 --- a/src/Java/gtPlusPlus/xmod/thermalfoundation/fluid/TF_Fluids.java +++ b/src/main/java/gtPlusPlus/xmod/thermalfoundation/fluid/TF_Fluids.java diff --git a/src/Java/gtPlusPlus/xmod/thermalfoundation/item/TF_Items.java b/src/main/java/gtPlusPlus/xmod/thermalfoundation/item/TF_Items.java index a628b9c5b6..a628b9c5b6 100644 --- a/src/Java/gtPlusPlus/xmod/thermalfoundation/item/TF_Items.java +++ b/src/main/java/gtPlusPlus/xmod/thermalfoundation/item/TF_Items.java diff --git a/src/Java/gtPlusPlus/xmod/thermalfoundation/recipe/TF_Gregtech_Recipes.java b/src/main/java/gtPlusPlus/xmod/thermalfoundation/recipe/TF_Gregtech_Recipes.java index 85485b5565..85485b5565 100644 --- a/src/Java/gtPlusPlus/xmod/thermalfoundation/recipe/TF_Gregtech_Recipes.java +++ b/src/main/java/gtPlusPlus/xmod/thermalfoundation/recipe/TF_Gregtech_Recipes.java diff --git a/src/Java/gtPlusPlus/xmod/tinkers/HANDLER_Tinkers.java b/src/main/java/gtPlusPlus/xmod/tinkers/HANDLER_Tinkers.java index 4a3f9cd504..4a3f9cd504 100644 --- a/src/Java/gtPlusPlus/xmod/tinkers/HANDLER_Tinkers.java +++ b/src/main/java/gtPlusPlus/xmod/tinkers/HANDLER_Tinkers.java diff --git a/src/Java/gtPlusPlus/xmod/tinkers/material/BaseTinkersMaterial.java b/src/main/java/gtPlusPlus/xmod/tinkers/material/BaseTinkersMaterial.java index 6f47909a01..0d2c79db08 100644 --- a/src/Java/gtPlusPlus/xmod/tinkers/material/BaseTinkersMaterial.java +++ b/src/main/java/gtPlusPlus/xmod/tinkers/material/BaseTinkersMaterial.java @@ -204,7 +204,7 @@ public class BaseTinkersMaterial { try { aMatBlock = aMaterial.getBlock(); aMelt = aMaterial.getMeltingPointC(); - aFluid = aMaterial.getFluid(0).getFluid(); + aFluid = aMaterial.getFluidStack(0).getFluid(); } catch (Throwable t) { return false; @@ -217,14 +217,14 @@ public class BaseTinkersMaterial { //Smeltery.addMelting(new ItemStack(ExtraUtils.unstableIngot, 1, 0), ExtraUtils.decorative1, 5, 850, aMaterial.getFluid(72)); TinkersUtils.registerFluidType(mLocalName, aMatBlock, 0, aMelt, aFluid, true); - TinkersUtils.addMelting(aMaterial.getBlock(1), aMatBlock, 0, aMelt, aMaterial.getFluid(144*9)); - TinkersUtils.addMelting(aMaterial.getIngot(1), aMatBlock, 0, aMelt, aMaterial.getFluid(144)); + TinkersUtils.addMelting(aMaterial.getBlock(1), aMatBlock, 0, aMelt, aMaterial.getFluidStack(144*9)); + TinkersUtils.addMelting(aMaterial.getIngot(1), aMatBlock, 0, aMelt, aMaterial.getFluidStack(144)); if (aMelt <= 3600) { ItemStack ingotcast = TinkersUtils.getPattern(1); TinkersUtils.addBasinRecipe(aMaterial.getBlock(1), - aMaterial.getFluid(144*9), (ItemStack) null, true, 100); + aMaterial.getFluidStack(144*9), (ItemStack) null, true, 100); TinkersUtils.addCastingTableRecipe(aMaterial.getIngot(1), - aMaterial.getFluid(144), ingotcast, false, 50); + aMaterial.getFluidStack(144), ingotcast, false, 50); } boolean extended = TinkersUtils.generateCastingRecipes(aMaterial, aID); diff --git a/src/Java/gtPlusPlus/xmod/tinkers/util/TinkersDryingRecipe.java b/src/main/java/gtPlusPlus/xmod/tinkers/util/TinkersDryingRecipe.java index 8bc7ffef29..8bc7ffef29 100644 --- a/src/Java/gtPlusPlus/xmod/tinkers/util/TinkersDryingRecipe.java +++ b/src/main/java/gtPlusPlus/xmod/tinkers/util/TinkersDryingRecipe.java diff --git a/src/Java/gtPlusPlus/xmod/tinkers/util/TinkersUtils.java b/src/main/java/gtPlusPlus/xmod/tinkers/util/TinkersUtils.java index 15ca3b497e..cf3284bfae 100644 --- a/src/Java/gtPlusPlus/xmod/tinkers/util/TinkersUtils.java +++ b/src/main/java/gtPlusPlus/xmod/tinkers/util/TinkersUtils.java @@ -180,8 +180,8 @@ public class TinkersUtils { public static boolean addBaseMeltingRecipes(Material aMaterial) { - return addMelting(aMaterial.getBlock(1), aMaterial.getBlock(), 0, aMaterial.getMeltingPointC(), aMaterial.getFluid(144*9)) && - addMelting(aMaterial.getIngot(1), aMaterial.getBlock(), 0, aMaterial.getMeltingPointC(), aMaterial.getFluid(144)); + return addMelting(aMaterial.getBlock(1), aMaterial.getBlock(), 0, aMaterial.getMeltingPointC(), aMaterial.getFluidStack(144*9)) && + addMelting(aMaterial.getIngot(1), aMaterial.getBlock(), 0, aMaterial.getMeltingPointC(), aMaterial.getFluidStack(144)); } public static boolean addMelting(ItemStack input, Block block, int metadata, int temperature, FluidStack liquid) { @@ -221,7 +221,7 @@ public class TinkersUtils { public static boolean addBaseBasinRecipes(Material aMaterial) { - return addBasinRecipe(aMaterial.getBlock(1), aMaterial.getFluid(144*9), (ItemStack) null, true, 100); + return addBasinRecipe(aMaterial.getBlock(1), aMaterial.getFluidStack(144*9), (ItemStack) null, true, 100); } public static boolean addBasinRecipe(ItemStack output, FluidStack metal, ItemStack cast, boolean consume, int delay) { @@ -245,7 +245,7 @@ public class TinkersUtils { public static boolean addBaseCastingRecipes(Material aMaterial) { ItemStack ingotcast = getPattern(1); - return addCastingTableRecipe(aMaterial.getIngot(1), aMaterial.getFluid(144), ingotcast, false, 50); + return addCastingTableRecipe(aMaterial.getIngot(1), aMaterial.getFluidStack(144), ingotcast, false, 50); } public static boolean addCastingTableRecipe(ItemStack output, FluidStack metal, ItemStack cast, boolean consume, int delay) { @@ -482,7 +482,7 @@ public class TinkersUtils { //CastingRecipe recipe = (CastingRecipe) i$.next(); ItemStack output = recipe.getResult().copy(); output.setItemDamage(aID); - FluidStack liquid2 = new FluidStack(aMaterial.getFluid(0).getFluid(), recipe.castingMetal.amount); + FluidStack liquid2 = new FluidStack(aMaterial.getFluidStack(0).getFluid(), recipe.castingMetal.amount); addCastingTableRecipe(output, liquid2, recipe.cast, recipe.consumeCast, recipe.coolTime); addMelting(ft, output, 0, liquid2.amount / 2); } diff --git a/src/Java/gtPlusPlus/xmod/witchery/WitchUtils.java b/src/main/java/gtPlusPlus/xmod/witchery/WitchUtils.java index 35f9f4bbe8..35f9f4bbe8 100644 --- a/src/Java/gtPlusPlus/xmod/witchery/WitchUtils.java +++ b/src/main/java/gtPlusPlus/xmod/witchery/WitchUtils.java diff --git a/src/Java/vswe/stevescarts/ModuleData/GppModuleData.java b/src/main/java/vswe/stevescarts/ModuleData/GppModuleData.java index eb8a8f319f..eb8a8f319f 100644 --- a/src/Java/vswe/stevescarts/ModuleData/GppModuleData.java +++ b/src/main/java/vswe/stevescarts/ModuleData/GppModuleData.java diff --git a/src/resources/assets/forestry/AlvearyFrame.png b/src/main/resources/assets/forestry/AlvearyFrame.png Binary files differindex c69ead8dd0..c69ead8dd0 100644 --- a/src/resources/assets/forestry/AlvearyFrame.png +++ b/src/main/resources/assets/forestry/AlvearyFrame.png diff --git a/src/resources/assets/forestry/AlvearyMutator.png b/src/main/resources/assets/forestry/AlvearyMutator.png Binary files differindex 2225f2748f..2225f2748f 100644 --- a/src/resources/assets/forestry/AlvearyMutator.png +++ b/src/main/resources/assets/forestry/AlvearyMutator.png diff --git a/src/resources/assets/forestry/textures/blocks/apiculture/alveary.framehousing.off.png b/src/main/resources/assets/forestry/textures/blocks/apiculture/alveary.framehousing.off.png Binary files differindex f21e59ec96..f21e59ec96 100644 --- a/src/resources/assets/forestry/textures/blocks/apiculture/alveary.framehousing.off.png +++ b/src/main/resources/assets/forestry/textures/blocks/apiculture/alveary.framehousing.off.png diff --git a/src/resources/assets/forestry/textures/blocks/apiculture/alveary.framehousing.on.png b/src/main/resources/assets/forestry/textures/blocks/apiculture/alveary.framehousing.on.png Binary files differindex f21e59ec96..f21e59ec96 100644 --- a/src/resources/assets/forestry/textures/blocks/apiculture/alveary.framehousing.on.png +++ b/src/main/resources/assets/forestry/textures/blocks/apiculture/alveary.framehousing.on.png diff --git a/src/resources/assets/forestry/textures/blocks/apiculture/alveary.mutator.off.png b/src/main/resources/assets/forestry/textures/blocks/apiculture/alveary.mutator.off.png Binary files differindex 51336c00b9..51336c00b9 100644 --- a/src/resources/assets/forestry/textures/blocks/apiculture/alveary.mutator.off.png +++ b/src/main/resources/assets/forestry/textures/blocks/apiculture/alveary.mutator.off.png diff --git a/src/resources/assets/forestry/textures/blocks/apiculture/alveary.mutator.on.png b/src/main/resources/assets/forestry/textures/blocks/apiculture/alveary.mutator.on.png Binary files differindex 51336c00b9..51336c00b9 100644 --- a/src/resources/assets/forestry/textures/blocks/apiculture/alveary.mutator.on.png +++ b/src/main/resources/assets/forestry/textures/blocks/apiculture/alveary.mutator.on.png diff --git a/src/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang index e2120fdf7b..4f6b835f67 100644 --- a/src/resources/assets/gregtech/lang/en_US.lang +++ b/src/main/resources/assets/gregtech/lang/en_US.lang @@ -210,28 +210,13 @@ achievement.decay.technetium99m.desc=Cyclotron Product achievement.decay.technetium99=Technetium 99 achievement.decay.technetium99.desc=Cyclotron Product - - //24/11/19 achievement.gt.blockmachines.hatch.turbine.input.tier.00=Turbine Housing achievement.gt.blockmachines.hatch.turbine.input.tier.00.desc=[AL] Pickup this item to see the recipe in NEI - - - - - - - - - - - - - - - - - - +//Added 6/12/21 +achievement.gt.blockmachines.gtpp.multimachine.flotationcell=Flotation Cell +achievement.gt.blockmachines.gtpp.multimachine.flotationcell.desc=[AL] Pickup this item to see the recipe in NEI +achievement.gt.blockmachines.gtpp.multimachine.isamill=IsaMill +achievement.gt.blockmachines.gtpp.multimachine.isamill.desc=[AL] Pickup this item to see the recipe in NEI diff --git a/src/resources/assets/gregtech/lang/zh_CN.lang b/src/main/resources/assets/gregtech/lang/zh_CN.lang index 1731d7c3cb..1731d7c3cb 100644 --- a/src/resources/assets/gregtech/lang/zh_CN.lang +++ b/src/main/resources/assets/gregtech/lang/zh_CN.lang diff --git a/src/resources/assets/gregtech/textures/blocks/fluids/fluid.argon.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.argon.png Binary files differindex e29ce83f82..e29ce83f82 100644 --- a/src/resources/assets/gregtech/textures/blocks/fluids/fluid.argon.png +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.argon.png diff --git a/src/resources/assets/gregtech/textures/blocks/fluids/fluid.nitrofuel_old.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.nitrofuel_old.png Binary files differindex 4569cb8af3..4569cb8af3 100644 --- a/src/resources/assets/gregtech/textures/blocks/fluids/fluid.nitrofuel_old.png +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.nitrofuel_old.png diff --git a/src/resources/assets/gregtech/textures/blocks/fluids/fluid.nitrofuel_old.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.nitrofuel_old.png.mcmeta index 0df7234a79..0df7234a79 100644 --- a/src/resources/assets/gregtech/textures/blocks/fluids/fluid.nitrofuel_old.png.mcmeta +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.nitrofuel_old.png.mcmeta diff --git a/src/resources/assets/gregtech/textures/blocks/iconsets/GAS_TURBINE_SIDE_ACTIVE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GAS_TURBINE_SIDE_ACTIVE.png Binary files differindex e1d4a0f009..e1d4a0f009 100644 --- a/src/resources/assets/gregtech/textures/blocks/iconsets/GAS_TURBINE_SIDE_ACTIVE.png +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GAS_TURBINE_SIDE_ACTIVE.png diff --git a/src/resources/assets/gregtech/textures/blocks/iconsets/GAS_TURBINE_SIDE_ACTIVE.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GAS_TURBINE_SIDE_ACTIVE.png.mcmeta index dfae8cae16..dfae8cae16 100644 --- a/src/resources/assets/gregtech/textures/blocks/iconsets/GAS_TURBINE_SIDE_ACTIVE.png.mcmeta +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GAS_TURBINE_SIDE_ACTIVE.png.mcmeta diff --git a/src/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ACCELERATOR.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ACCELERATOR.png Binary files differindex cac886f252..cac886f252 100644 --- a/src/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ACCELERATOR.png +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ACCELERATOR.png diff --git a/src/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ACCELERATOR_ACTIVE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ACCELERATOR_ACTIVE.png Binary files differindex 6de133ad06..6de133ad06 100644 --- a/src/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ACCELERATOR_ACTIVE.png +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ACCELERATOR_ACTIVE.png diff --git a/src/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ACCELERATOR_ACTIVE.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ACCELERATOR_ACTIVE.png.mcmeta index 18e5c3223b..18e5c3223b 100644 --- a/src/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ACCELERATOR_ACTIVE.png.mcmeta +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ACCELERATOR_ACTIVE.png.mcmeta diff --git a/src/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ACCELERATOR_TE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ACCELERATOR_TE.png Binary files differindex 8aeb6c7c5f..8aeb6c7c5f 100644 --- a/src/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ACCELERATOR_TE.png +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ACCELERATOR_TE.png diff --git a/src/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ACCELERATOR_TE_ACTIVE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ACCELERATOR_TE_ACTIVE.png Binary files differindex a03b2bdd49..a03b2bdd49 100644 --- a/src/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ACCELERATOR_TE_ACTIVE.png +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ACCELERATOR_TE_ACTIVE.png diff --git a/src/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ACCELERATOR_TE_ACTIVE.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ACCELERATOR_TE_ACTIVE.png.mcmeta index 18e5c3223b..18e5c3223b 100644 --- a/src/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ACCELERATOR_TE_ACTIVE.png.mcmeta +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ACCELERATOR_TE_ACTIVE.png.mcmeta diff --git a/src/resources/assets/gregtech/textures/blocks/iconsets/STEAM_TURBINE_SIDE_ACTIVE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/STEAM_TURBINE_SIDE_ACTIVE.png Binary files differindex e1d4a0f009..e1d4a0f009 100644 --- a/src/resources/assets/gregtech/textures/blocks/iconsets/STEAM_TURBINE_SIDE_ACTIVE.png +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/STEAM_TURBINE_SIDE_ACTIVE.png diff --git a/src/resources/assets/gregtech/textures/blocks/iconsets/STEAM_TURBINE_SIDE_ACTIVE.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/iconsets/STEAM_TURBINE_SIDE_ACTIVE.png.mcmeta index dfae8cae16..dfae8cae16 100644 --- a/src/resources/assets/gregtech/textures/blocks/iconsets/STEAM_TURBINE_SIDE_ACTIVE.png.mcmeta +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/STEAM_TURBINE_SIDE_ACTIVE.png.mcmeta diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/block1.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/block1.png Binary files differindex ad51b6f35f..ad51b6f35f 100644 --- a/src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/block1.png +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/block1.png diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/block2.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/block2.png Binary files differindex 9544681ea6..9544681ea6 100644 --- a/src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/block2.png +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/block2.png diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/block3.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/block3.png Binary files differindex 161d37faf8..161d37faf8 100644 --- a/src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/block3.png +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/block3.png diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/block4.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/block4.png Binary files differindex 7d3a6d1e29..7d3a6d1e29 100644 --- a/src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/block4.png +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/block4.png diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/block5.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/block5.png Binary files differindex a8a4b0e1f2..a8a4b0e1f2 100644 --- a/src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/block5.png +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/block5.png diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/block6.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/block6.png Binary files differindex ad51b6f35f..ad51b6f35f 100644 --- a/src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/block6.png +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/block6.png diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/foil.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/foil.png Binary files differindex 2edad5a448..2edad5a448 100644 --- a/src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/foil.png +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/foil.png diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/frameGt.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/frameGt.png Binary files differindex 2041e4d562..2041e4d562 100644 --- a/src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/frameGt.png +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/frameGt.png diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/ore.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/ore.png Binary files differindex 6e4e79b4fa..6e4e79b4fa 100644 --- a/src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/ore.png +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/ore.png diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/oreSmall.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/oreSmall.png Binary files differindex 0a7e9d6e9e..0a7e9d6e9e 100644 --- a/src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/oreSmall.png +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/oreSmall.png diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/ore_animated.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/ore_animated.png Binary files differindex 0032fdd6e5..0032fdd6e5 100644 --- a/src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/ore_animated.png +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/ore_animated.png diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/ore_animated.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/ore_animated.png.mcmeta index 676faf4fb4..676faf4fb4 100644 --- a/src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/ore_animated.png.mcmeta +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/ore_animated.png.mcmeta diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/pipeHuge.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/pipeHuge.png Binary files differindex 7985626666..7985626666 100644 --- a/src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/pipeHuge.png +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/pipeHuge.png diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/pipeLarge.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/pipeLarge.png Binary files differindex f1daedc2c9..f1daedc2c9 100644 --- a/src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/pipeLarge.png +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/pipeLarge.png diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/pipeMedium.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/pipeMedium.png Binary files differindex 9927fa293e..9927fa293e 100644 --- a/src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/pipeMedium.png +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/pipeMedium.png diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/pipeSide.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/pipeSide.png Binary files differindex aec8883d6a..aec8883d6a 100644 --- a/src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/pipeSide.png +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/pipeSide.png diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/pipeSmall.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/pipeSmall.png Binary files differindex 6c29b067f3..6c29b067f3 100644 --- a/src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/pipeSmall.png +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/pipeSmall.png diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/pipeTiny.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/pipeTiny.png Binary files differindex c1ef295198..c1ef295198 100644 --- a/src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/pipeTiny.png +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/pipeTiny.png diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/void.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/void.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/void.png +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/void.png diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/wire.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/wire.png Binary files differindex 455335e5c2..455335e5c2 100644 --- a/src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/wire.png +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/wire.png diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/block1.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/block1.png Binary files differindex 161d37faf8..161d37faf8 100644 --- a/src/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/block1.png +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/block1.png diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/block2.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/block2.png Binary files differindex 9544681ea6..9544681ea6 100644 --- a/src/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/block2.png +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/block2.png diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/block3.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/block3.png Binary files differindex 161d37faf8..161d37faf8 100644 --- a/src/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/block3.png +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/block3.png diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/block4.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/block4.png Binary files differindex 7d3a6d1e29..7d3a6d1e29 100644 --- a/src/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/block4.png +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/block4.png diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/block5.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/block5.png Binary files differindex a8a4b0e1f2..a8a4b0e1f2 100644 --- a/src/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/block5.png +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/block5.png diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/block6.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/block6.png Binary files differindex ad51b6f35f..ad51b6f35f 100644 --- a/src/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/block6.png +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/block6.png diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/foil.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/foil.png Binary files differindex 2edad5a448..2edad5a448 100644 --- a/src/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/foil.png +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/foil.png diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/frameGt.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/frameGt.png Binary files differindex 2041e4d562..2041e4d562 100644 --- a/src/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/frameGt.png +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/frameGt.png diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/ore.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/ore.png Binary files differindex ed3f2f1581..ed3f2f1581 100644 --- a/src/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/ore.png +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/ore.png diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/oreSmall.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/oreSmall.png Binary files differindex 0a7e9d6e9e..0a7e9d6e9e 100644 --- a/src/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/oreSmall.png +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/oreSmall.png diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/pipeHuge.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/pipeHuge.png Binary files differindex 7985626666..7985626666 100644 --- a/src/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/pipeHuge.png +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/pipeHuge.png diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/pipeLarge.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/pipeLarge.png Binary files differindex f1daedc2c9..f1daedc2c9 100644 --- a/src/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/pipeLarge.png +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/pipeLarge.png diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/pipeMedium.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/pipeMedium.png Binary files differindex 9927fa293e..9927fa293e 100644 --- a/src/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/pipeMedium.png +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/pipeMedium.png diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/pipeSide.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/pipeSide.png Binary files differindex aec8883d6a..aec8883d6a 100644 --- a/src/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/pipeSide.png +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/pipeSide.png diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/pipeSmall.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/pipeSmall.png Binary files differindex 6c29b067f3..6c29b067f3 100644 --- a/src/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/pipeSmall.png +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/pipeSmall.png diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/pipeTiny.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/pipeTiny.png Binary files differindex c1ef295198..c1ef295198 100644 --- a/src/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/pipeTiny.png +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/pipeTiny.png diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/void.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/void.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/void.png +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/void.png diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/wire.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/wire.png Binary files differindex 455335e5c2..455335e5c2 100644 --- a/src/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/wire.png +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_A/wire.png diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/block1.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/block1.png Binary files differindex ad51b6f35f..ad51b6f35f 100644 --- a/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/block1.png +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/block1.png diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/block2.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/block2.png Binary files differindex 9544681ea6..9544681ea6 100644 --- a/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/block2.png +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/block2.png diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/block3.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/block3.png Binary files differindex 161d37faf8..161d37faf8 100644 --- a/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/block3.png +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/block3.png diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/block4.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/block4.png Binary files differindex 7d3a6d1e29..7d3a6d1e29 100644 --- a/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/block4.png +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/block4.png diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/block5.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/block5.png Binary files differindex a8a4b0e1f2..a8a4b0e1f2 100644 --- a/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/block5.png +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/block5.png diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/block6.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/block6.png Binary files differindex ad51b6f35f..ad51b6f35f 100644 --- a/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/block6.png +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/block6.png diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/foil.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/foil.png Binary files differindex 2edad5a448..2edad5a448 100644 --- a/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/foil.png +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/foil.png diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/frameGt.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/frameGt.png Binary files differindex 2041e4d562..2041e4d562 100644 --- a/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/frameGt.png +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/frameGt.png diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/ore.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/ore.png Binary files differindex 919d9bb70a..919d9bb70a 100644 --- a/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/ore.png +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/ore.png diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/ore.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/ore.png.mcmeta index d2c3416c73..d2c3416c73 100644 --- a/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/ore.png.mcmeta +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/ore.png.mcmeta diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/oreSmall.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/oreSmall.png Binary files differindex 0a7e9d6e9e..0a7e9d6e9e 100644 --- a/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/oreSmall.png +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/oreSmall.png diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/pipeHuge.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/pipeHuge.png Binary files differindex 7985626666..7985626666 100644 --- a/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/pipeHuge.png +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/pipeHuge.png diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/pipeLarge.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/pipeLarge.png Binary files differindex f1daedc2c9..f1daedc2c9 100644 --- a/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/pipeLarge.png +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/pipeLarge.png diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/pipeMedium.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/pipeMedium.png Binary files differindex 9927fa293e..9927fa293e 100644 --- a/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/pipeMedium.png +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/pipeMedium.png diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/pipeSide.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/pipeSide.png Binary files differindex aec8883d6a..aec8883d6a 100644 --- a/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/pipeSide.png +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/pipeSide.png diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/pipeSmall.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/pipeSmall.png Binary files differindex 6c29b067f3..6c29b067f3 100644 --- a/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/pipeSmall.png +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/pipeSmall.png diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/pipeTiny.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/pipeTiny.png Binary files differindex c1ef295198..c1ef295198 100644 --- a/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/pipeTiny.png +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/pipeTiny.png diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/void.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/void.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/void.png +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/void.png diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/wire.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/wire.png Binary files differindex 455335e5c2..455335e5c2 100644 --- a/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/wire.png +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/wire.png diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/REFINED/block1.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/REFINED/block1.png Binary files differindex 3e33d0feec..3e33d0feec 100644 --- a/src/resources/assets/gregtech/textures/blocks/materialicons/REFINED/block1.png +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/REFINED/block1.png diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/REFINED/block2.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/REFINED/block2.png Binary files differindex 9544681ea6..9544681ea6 100644 --- a/src/resources/assets/gregtech/textures/blocks/materialicons/REFINED/block2.png +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/REFINED/block2.png diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/REFINED/block3.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/REFINED/block3.png Binary files differindex 161d37faf8..161d37faf8 100644 --- a/src/resources/assets/gregtech/textures/blocks/materialicons/REFINED/block3.png +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/REFINED/block3.png diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/REFINED/block4.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/REFINED/block4.png Binary files differindex 7d3a6d1e29..7d3a6d1e29 100644 --- a/src/resources/assets/gregtech/textures/blocks/materialicons/REFINED/block4.png +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/REFINED/block4.png diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/REFINED/block5.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/REFINED/block5.png Binary files differindex a8a4b0e1f2..a8a4b0e1f2 100644 --- a/src/resources/assets/gregtech/textures/blocks/materialicons/REFINED/block5.png +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/REFINED/block5.png diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/REFINED/block6.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/REFINED/block6.png Binary files differindex ad51b6f35f..ad51b6f35f 100644 --- a/src/resources/assets/gregtech/textures/blocks/materialicons/REFINED/block6.png +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/REFINED/block6.png diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/REFINED/foil.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/REFINED/foil.png Binary files differindex 2edad5a448..2edad5a448 100644 --- a/src/resources/assets/gregtech/textures/blocks/materialicons/REFINED/foil.png +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/REFINED/foil.png diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/REFINED/frameGt.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/REFINED/frameGt.png Binary files differindex 2041e4d562..2041e4d562 100644 --- a/src/resources/assets/gregtech/textures/blocks/materialicons/REFINED/frameGt.png +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/REFINED/frameGt.png diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/REFINED/ore.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/REFINED/ore.png Binary files differindex 9cb38f3f8e..9cb38f3f8e 100644 --- a/src/resources/assets/gregtech/textures/blocks/materialicons/REFINED/ore.png +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/REFINED/ore.png diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/REFINED/oreSmall.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/REFINED/oreSmall.png Binary files differindex 0a7e9d6e9e..0a7e9d6e9e 100644 --- a/src/resources/assets/gregtech/textures/blocks/materialicons/REFINED/oreSmall.png +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/REFINED/oreSmall.png diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/REFINED/pipeHuge.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/REFINED/pipeHuge.png Binary files differindex 4feeed528c..4feeed528c 100644 --- a/src/resources/assets/gregtech/textures/blocks/materialicons/REFINED/pipeHuge.png +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/REFINED/pipeHuge.png diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/REFINED/pipeLarge.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/REFINED/pipeLarge.png Binary files differindex 055c104f1c..055c104f1c 100644 --- a/src/resources/assets/gregtech/textures/blocks/materialicons/REFINED/pipeLarge.png +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/REFINED/pipeLarge.png diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/REFINED/pipeMedium.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/REFINED/pipeMedium.png Binary files differindex 0bb50256c5..0bb50256c5 100644 --- a/src/resources/assets/gregtech/textures/blocks/materialicons/REFINED/pipeMedium.png +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/REFINED/pipeMedium.png diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/REFINED/pipeSide.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/REFINED/pipeSide.png Binary files differindex d229926034..d229926034 100644 --- a/src/resources/assets/gregtech/textures/blocks/materialicons/REFINED/pipeSide.png +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/REFINED/pipeSide.png diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/REFINED/pipeSmall.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/REFINED/pipeSmall.png Binary files differindex 1684ec116b..1684ec116b 100644 --- a/src/resources/assets/gregtech/textures/blocks/materialicons/REFINED/pipeSmall.png +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/REFINED/pipeSmall.png diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/REFINED/pipeTiny.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/REFINED/pipeTiny.png Binary files differindex f9838c8829..f9838c8829 100644 --- a/src/resources/assets/gregtech/textures/blocks/materialicons/REFINED/pipeTiny.png +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/REFINED/pipeTiny.png diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/REFINED/void.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/REFINED/void.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/blocks/materialicons/REFINED/void.png +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/REFINED/void.png diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/REFINED/wire.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/REFINED/wire.png Binary files differindex 455335e5c2..455335e5c2 100644 --- a/src/resources/assets/gregtech/textures/blocks/materialicons/REFINED/wire.png +++ b/src/main/resources/assets/gregtech/textures/blocks/materialicons/REFINED/wire.png diff --git a/src/resources/assets/gregtech/textures/gui/HatchNbtConsumable_2By2.png b/src/main/resources/assets/gregtech/textures/gui/HatchNbtConsumable_2By2.png Binary files differindex a669575ce1..a669575ce1 100644 --- a/src/resources/assets/gregtech/textures/gui/HatchNbtConsumable_2By2.png +++ b/src/main/resources/assets/gregtech/textures/gui/HatchNbtConsumable_2By2.png diff --git a/src/resources/assets/gregtech/textures/gui/HatchNbtConsumable_3By3.png b/src/main/resources/assets/gregtech/textures/gui/HatchNbtConsumable_3By3.png Binary files differindex 7ed8d56b0e..7ed8d56b0e 100644 --- a/src/resources/assets/gregtech/textures/gui/HatchNbtConsumable_3By3.png +++ b/src/main/resources/assets/gregtech/textures/gui/HatchNbtConsumable_3By3.png diff --git a/src/resources/assets/gregtech/textures/gui/HatchNbtConsumable_4By4.png b/src/main/resources/assets/gregtech/textures/gui/HatchNbtConsumable_4By4.png Binary files differindex ccbea96e0c..ccbea96e0c 100644 --- a/src/resources/assets/gregtech/textures/gui/HatchNbtConsumable_4By4.png +++ b/src/main/resources/assets/gregtech/textures/gui/HatchNbtConsumable_4By4.png diff --git a/src/resources/assets/gregtech/textures/gui/PowerSubStation.png b/src/main/resources/assets/gregtech/textures/gui/PowerSubStation.png Binary files differindex 0463dbedca..0463dbedca 100644 --- a/src/resources/assets/gregtech/textures/gui/PowerSubStation.png +++ b/src/main/resources/assets/gregtech/textures/gui/PowerSubStation.png diff --git a/src/resources/assets/gregtech/textures/gui/basicmachines/BlastSmelter.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/BlastSmelter.png Binary files differindex f21ebc1026..f21ebc1026 100644 --- a/src/resources/assets/gregtech/textures/gui/basicmachines/BlastSmelter.png +++ b/src/main/resources/assets/gregtech/textures/gui/basicmachines/BlastSmelter.png diff --git a/src/resources/assets/gregtech/textures/gui/basicmachines/Dehydrator.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Dehydrator.png Binary files differindex 6b086039ba..6b086039ba 100644 --- a/src/resources/assets/gregtech/textures/gui/basicmachines/Dehydrator.png +++ b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Dehydrator.png diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/FissionFuel.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/FissionFuel.png Binary files differnew file mode 100644 index 0000000000..e95be5c31a --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/gui/basicmachines/FissionFuel.png diff --git a/src/resources/assets/gregtech/textures/gui/basicmachines/LFTR.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/LFTR.png Binary files differindex fd3f751671..fd3f751671 100644 --- a/src/resources/assets/gregtech/textures/gui/basicmachines/LFTR.png +++ b/src/main/resources/assets/gregtech/textures/gui/basicmachines/LFTR.png diff --git a/src/resources/assets/gregtech/textures/gui/basicmachines/MixerAdvanced.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/MixerAdvanced.png Binary files differindex 21eedab2f5..21eedab2f5 100644 --- a/src/resources/assets/gregtech/textures/gui/basicmachines/MixerAdvanced.png +++ b/src/main/resources/assets/gregtech/textures/gui/basicmachines/MixerAdvanced.png diff --git a/src/resources/assets/gregtech/textures/gui/multimachines/LFTR.png b/src/main/resources/assets/gregtech/textures/gui/multimachines/LFTR.png Binary files differindex fd3f751671..fd3f751671 100644 --- a/src/resources/assets/gregtech/textures/gui/multimachines/LFTR.png +++ b/src/main/resources/assets/gregtech/textures/gui/multimachines/LFTR.png diff --git a/src/resources/assets/gregtech/textures/items/gt.Volumetric_Flask_32k.png b/src/main/resources/assets/gregtech/textures/items/gt.Volumetric_Flask_32k.png Binary files differindex 13b37c999d..13b37c999d 100644 --- a/src/resources/assets/gregtech/textures/items/gt.Volumetric_Flask_32k.png +++ b/src/main/resources/assets/gregtech/textures/items/gt.Volumetric_Flask_32k.png diff --git a/src/resources/assets/gregtech/textures/items/gt.Volumetric_Flask_32k.window.png b/src/main/resources/assets/gregtech/textures/items/gt.Volumetric_Flask_32k.window.png Binary files differindex 3fd5382926..3fd5382926 100644 --- a/src/resources/assets/gregtech/textures/items/gt.Volumetric_Flask_32k.window.png +++ b/src/main/resources/assets/gregtech/textures/items/gt.Volumetric_Flask_32k.window.png diff --git a/src/resources/assets/gregtech/textures/items/gt.Volumetric_Flask_8k.png b/src/main/resources/assets/gregtech/textures/items/gt.Volumetric_Flask_8k.png Binary files differindex ffd9d4893b..ffd9d4893b 100644 --- a/src/resources/assets/gregtech/textures/items/gt.Volumetric_Flask_8k.png +++ b/src/main/resources/assets/gregtech/textures/items/gt.Volumetric_Flask_8k.png diff --git a/src/resources/assets/gregtech/textures/items/gt.Volumetric_Flask_8k.window.png b/src/main/resources/assets/gregtech/textures/items/gt.Volumetric_Flask_8k.window.png Binary files differindex a08018f561..a08018f561 100644 --- a/src/resources/assets/gregtech/textures/items/gt.Volumetric_Flask_8k.window.png +++ b/src/main/resources/assets/gregtech/textures/items/gt.Volumetric_Flask_8k.window.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/TURBINE_BLADE.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/TURBINE_BLADE.png Binary files differindex 59611725f8..59611725f8 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/TURBINE_BLADE.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/TURBINE_BLADE.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/TURBINE_BLADE_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/TURBINE_BLADE_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/TURBINE_BLADE_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/TURBINE_BLADE_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/arrowGtPlastic.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/arrowGtPlastic.png Binary files differindex 6b17748ece..6b17748ece 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/arrowGtPlastic.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/arrowGtPlastic.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/arrowGtPlastic_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/arrowGtPlastic_OVERLAY.png Binary files differindex 7cb996d669..7cb996d669 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/arrowGtPlastic_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/arrowGtPlastic_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/arrowGtWood.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/arrowGtWood.png Binary files differindex 172506c26c..172506c26c 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/arrowGtWood.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/arrowGtWood.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/arrowGtWood_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/arrowGtWood_OVERLAY.png Binary files differindex f9f1162ce6..f9f1162ce6 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/arrowGtWood_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/arrowGtWood_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/bolt.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/bolt.png Binary files differindex 8675564a9b..8675564a9b 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/bolt.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/bolt.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/bolt_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/bolt_OVERLAY.png Binary files differindex 9c310b5b09..9c310b5b09 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/bolt_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/bolt_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/cell.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/cell.png Binary files differindex 27d4df7081..27d4df7081 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/cell.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/cell.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/cellPlasma.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/cellPlasma.png Binary files differindex ce3c6377c7..ce3c6377c7 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/cellPlasma.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/cellPlasma.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/cellPlasma_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/cellPlasma_OVERLAY.png Binary files differindex 1c93293744..1c93293744 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/cellPlasma_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/cellPlasma_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/cell_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/cell_OVERLAY.png Binary files differindex f02365b9ff..f02365b9ff 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/cell_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/cell_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crateGtDust.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crateGtDust.png Binary files differindex fad582745d..fad582745d 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crateGtDust.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crateGtDust.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crateGtDust_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crateGtDust_OVERLAY.png Binary files differindex 64d56b48ea..64d56b48ea 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crateGtDust_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crateGtDust_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crateGtGem.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crateGtGem.png Binary files differindex a4418db9e1..a4418db9e1 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crateGtGem.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crateGtGem.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crateGtGem_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crateGtGem_OVERLAY.png Binary files differindex 9798a597e0..9798a597e0 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crateGtGem_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crateGtGem_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crateGtIngot.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crateGtIngot.png Binary files differindex 85e42b0cd2..85e42b0cd2 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crateGtIngot.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crateGtIngot.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crateGtIngot_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crateGtIngot_OVERLAY.png Binary files differindex 2f0577d65f..2f0577d65f 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crateGtIngot_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crateGtIngot_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crateGtPlate.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crateGtPlate.png Binary files differindex 8b48da35d2..8b48da35d2 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crateGtPlate.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crateGtPlate.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crateGtPlate_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crateGtPlate_OVERLAY.png Binary files differindex ae6d73b7a6..ae6d73b7a6 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crateGtPlate_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crateGtPlate_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crushed.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crushed.png Binary files differindex 8a240a574d..8a240a574d 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crushed.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crushed.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crushedCentrifuged.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crushedCentrifuged.png Binary files differindex f74931d42a..f74931d42a 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crushedCentrifuged.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crushedCentrifuged.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crushedCentrifuged_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crushedCentrifuged_OVERLAY.png Binary files differindex 3741866149..3741866149 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crushedCentrifuged_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crushedCentrifuged_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crushedPurified.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crushedPurified.png Binary files differindex 17859801da..17859801da 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crushedPurified.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crushedPurified.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crushedPurified_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crushedPurified_OVERLAY.png Binary files differindex 1918a7fa45..1918a7fa45 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crushedPurified_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crushedPurified_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crushed_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crushed_OVERLAY.png Binary files differindex 7cdf09b174..7cdf09b174 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crushed_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/crushed_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/dust.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/dust.png Binary files differindex d1282f4248..d1282f4248 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/dust.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/dust.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/dustImpure.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/dustImpure.png Binary files differindex 8918e54459..8918e54459 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/dustImpure.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/dustImpure.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/dustImpure_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/dustImpure_OVERLAY.png Binary files differindex 0d8c321826..0d8c321826 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/dustImpure_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/dustImpure_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/dustPure.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/dustPure.png Binary files differindex 8918e54459..8918e54459 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/dustPure.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/dustPure.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/dustPure_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/dustPure_OVERLAY.png Binary files differindex 79216e0918..79216e0918 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/dustPure_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/dustPure_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/dustSmall.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/dustSmall.png Binary files differindex f29479bf55..f29479bf55 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/dustSmall.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/dustSmall.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/dustSmall_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/dustSmall_OVERLAY.png Binary files differindex a35dccba2b..a35dccba2b 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/dustSmall_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/dustSmall_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/dustTiny.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/dustTiny.png Binary files differindex 859cd70116..859cd70116 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/dustTiny.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/dustTiny.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/dustTiny_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/dustTiny_OVERLAY.png Binary files differindex 03c07f2760..03c07f2760 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/dustTiny_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/dustTiny_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/dust_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/dust_OVERLAY.png Binary files differindex cbc30cc68e..cbc30cc68e 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/dust_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/dust_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/foil.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/foil.png Binary files differindex cdce151f9a..cdce151f9a 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/foil.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/foil.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/foil_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/foil_OVERLAY.png Binary files differindex f6fa0b94cc..f6fa0b94cc 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/foil_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/foil_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gearGt.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gearGt.png Binary files differindex a7bc0f90f1..a7bc0f90f1 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gearGt.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gearGt.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gearGtSmall.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gearGtSmall.png Binary files differindex 0fe97b84fd..0fe97b84fd 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gearGtSmall.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gearGtSmall.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gearGtSmall_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gearGtSmall_OVERLAY.png Binary files differindex dddb4764ce..dddb4764ce 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gearGtSmall_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gearGtSmall_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gearGt_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gearGt_OVERLAY.png Binary files differindex d8471aed5f..d8471aed5f 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gearGt_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gearGt_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gem.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gem.png Binary files differindex b63f9c3b35..b63f9c3b35 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gem.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gem.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gemChipped.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gemChipped.png Binary files differindex 6b7fc73d7a..6b7fc73d7a 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gemChipped.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gemChipped.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gemChipped_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gemChipped_OVERLAY.png Binary files differindex c5abe856a0..c5abe856a0 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gemChipped_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gemChipped_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gemExquisite.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gemExquisite.png Binary files differindex fbbe56cb1c..fbbe56cb1c 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gemExquisite.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gemExquisite.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gemExquisite_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gemExquisite_OVERLAY.png Binary files differindex 50d407491e..50d407491e 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gemExquisite_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gemExquisite_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gemFlawed.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gemFlawed.png Binary files differindex 499bf464b3..499bf464b3 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gemFlawed.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gemFlawed.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gemFlawed_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gemFlawed_OVERLAY.png Binary files differindex 3561f91a07..3561f91a07 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gemFlawed_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gemFlawed_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gemFlawless.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gemFlawless.png Binary files differindex 925e5f7eea..925e5f7eea 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gemFlawless.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gemFlawless.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gemFlawless_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gemFlawless_OVERLAY.png Binary files differindex 82f557e199..82f557e199 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gemFlawless_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gemFlawless_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gem_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gem_OVERLAY.png Binary files differindex 55468929e9..55468929e9 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gem_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/gem_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/handleMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/handleMallet.png Binary files differindex 85f543676f..85f543676f 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/handleMallet.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/handleMallet.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/handleMallet_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/handleMallet_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/handleMallet_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/handleMallet_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingot.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingot.png Binary files differindex 92bc131a2f..92bc131a2f 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingot.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingot.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotDouble.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotDouble.png Binary files differindex 678c35518b..678c35518b 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotDouble.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotDouble.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotDouble_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotDouble_OVERLAY.png Binary files differindex c844854d37..c844854d37 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotDouble_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotDouble_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotHot.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotHot.png Binary files differindex 6fc93f933b..6fc93f933b 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotHot.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotHot.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotHot_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotHot_OVERLAY.png Binary files differindex ebf9b80323..ebf9b80323 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotHot_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotHot_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotQuadruple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotQuadruple.png Binary files differindex b62d361f19..b62d361f19 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotQuadruple.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotQuadruple.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotQuadruple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotQuadruple_OVERLAY.png Binary files differindex 2a63953e92..2a63953e92 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotQuadruple_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotQuadruple_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotQuintuple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotQuintuple.png Binary files differindex e3ab084563..e3ab084563 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotQuintuple.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotQuintuple.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotQuintuple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotQuintuple_OVERLAY.png Binary files differindex 896be7f08e..896be7f08e 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotQuintuple_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotQuintuple_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotTriple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotTriple.png Binary files differindex b8853a770e..b8853a770e 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotTriple.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotTriple.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotTriple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotTriple_OVERLAY.png Binary files differindex c086bca2bb..c086bca2bb 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotTriple_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingotTriple_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingot_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingot_OVERLAY.png Binary files differindex c59ef7b1bb..c59ef7b1bb 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingot_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ingot_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/lens.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/lens.png Binary files differindex 4b29fca4c1..4b29fca4c1 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/lens.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/lens.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/lens_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/lens_OVERLAY.png Binary files differindex f3bcc922b2..f3bcc922b2 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/lens_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/lens_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/nugget.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/nugget.png Binary files differindex b1636ee569..b1636ee569 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/nugget.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/nugget.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/nugget_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/nugget_OVERLAY.png Binary files differindex 2af89ec304..2af89ec304 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/nugget_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/nugget_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/plate.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/plate.png Binary files differindex d31178c3c6..d31178c3c6 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/plate.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/plate.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/plateDense.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/plateDense.png Binary files differindex 4666dd5902..4666dd5902 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/plateDense.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/plateDense.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/plateDense_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/plateDense_OVERLAY.png Binary files differindex 037d829395..037d829395 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/plateDense_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/plateDense_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/plateDouble.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/plateDouble.png Binary files differindex edb7970730..edb7970730 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/plateDouble.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/plateDouble.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/plateDouble_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/plateDouble_OVERLAY.png Binary files differindex cd358f9d96..cd358f9d96 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/plateDouble_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/plateDouble_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/plateQuadruple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/plateQuadruple.png Binary files differindex 6840fd312a..6840fd312a 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/plateQuadruple.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/plateQuadruple.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/plateQuadruple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/plateQuadruple_OVERLAY.png Binary files differindex de8ae5af6f..de8ae5af6f 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/plateQuadruple_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/plateQuadruple_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/plateQuintuple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/plateQuintuple.png Binary files differindex 8a71537dee..8a71537dee 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/plateQuintuple.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/plateQuintuple.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/plateQuintuple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/plateQuintuple_OVERLAY.png Binary files differindex 2d7a80f45e..2d7a80f45e 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/plateQuintuple_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/plateQuintuple_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/plateTriple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/plateTriple.png Binary files differindex 6e5d95061c..6e5d95061c 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/plateTriple.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/plateTriple.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/plateTriple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/plateTriple_OVERLAY.png Binary files differindex f73c531239..f73c531239 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/plateTriple_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/plateTriple_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/plate_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/plate_OVERLAY.png Binary files differindex f52c654ee5..f52c654ee5 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/plate_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/plate_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ring.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ring.png Binary files differindex eb9dfd5e21..eb9dfd5e21 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ring.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ring.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ring_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ring_OVERLAY.png Binary files differindex 5879963ad2..5879963ad2 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ring_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/ring_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/rotor.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/rotor.png Binary files differindex 4eefbcd6e3..4eefbcd6e3 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/rotor.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/rotor.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/rotor_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/rotor_OVERLAY.png Binary files differindex f0d87d27df..f0d87d27df 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/rotor_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/rotor_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/round.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/round.png Binary files differindex 98480bf685..98480bf685 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/round.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/round.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/round_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/round_OVERLAY.png Binary files differindex 0916369702..0916369702 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/round_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/round_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/screw.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/screw.png Binary files differindex faca2c6e3d..faca2c6e3d 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/screw.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/screw.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/screw_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/screw_OVERLAY.png Binary files differindex c540788917..c540788917 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/screw_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/screw_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/spring.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/spring.png Binary files differindex df442ed454..df442ed454 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/spring.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/spring.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/springSmall.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/springSmall.png Binary files differindex 54b3afb24e..54b3afb24e 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/springSmall.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/springSmall.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/springSmall_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/springSmall_OVERLAY.png Binary files differindex a8170f57d6..a8170f57d6 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/springSmall_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/springSmall_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/spring_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/spring_OVERLAY.png Binary files differindex fdb0756839..fdb0756839 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/spring_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/spring_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/stick.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/stick.png Binary files differindex d999179b3c..d999179b3c 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/stick.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/stick.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/stickLong.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/stickLong.png Binary files differindex 1580b911f0..1580b911f0 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/stickLong.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/stickLong.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/stickLong_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/stickLong_OVERLAY.png Binary files differindex 54b47c2224..54b47c2224 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/stickLong_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/stickLong_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/stick_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/stick_OVERLAY.png Binary files differindex 04634628ac..04634628ac 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/stick_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/stick_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadArrow.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadArrow.png Binary files differindex 8cdc9f196f..8cdc9f196f 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadArrow.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadArrow.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadArrow_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadArrow_OVERLAY.png Binary files differindex 09af435c20..09af435c20 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadArrow_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadArrow_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadAxe.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadAxe.png Binary files differindex b09c2128da..b09c2128da 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadAxe.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadAxe.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadAxe_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadAxe_OVERLAY.png Binary files differindex 7f05e61552..7f05e61552 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadAxe_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadAxe_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadBuzzSaw.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadBuzzSaw.png Binary files differindex 4a19f4c251..4a19f4c251 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadBuzzSaw.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadBuzzSaw.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadBuzzSaw_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadBuzzSaw_OVERLAY.png Binary files differindex 778916b614..778916b614 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadBuzzSaw_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadBuzzSaw_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadChainsaw.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadChainsaw.png Binary files differindex 3ab90f5b05..3ab90f5b05 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadChainsaw.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadChainsaw.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadChainsaw_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadChainsaw_OVERLAY.png Binary files differindex 318ea2af2d..318ea2af2d 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadChainsaw_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadChainsaw_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadDrill.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadDrill.png Binary files differindex 0c5f99482c..0c5f99482c 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadDrill.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadDrill.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadDrill_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadDrill_OVERLAY.png Binary files differindex 3dbeb7da6e..3dbeb7da6e 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadDrill_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadDrill_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadFile.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadFile.png Binary files differindex e52d0a01fa..e52d0a01fa 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadFile.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadFile.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadFile_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadFile_OVERLAY.png Binary files differindex 7890213e56..7890213e56 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadFile_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadFile_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadHammer.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadHammer.png Binary files differindex 747f647e7e..747f647e7e 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadHammer.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadHammer.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadHammer_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadHammer_OVERLAY.png Binary files differindex b36140bea2..b36140bea2 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadHammer_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadHammer_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadHoe.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadHoe.png Binary files differindex d0dcfd1e5d..d0dcfd1e5d 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadHoe.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadHoe.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadHoe_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadHoe_OVERLAY.png Binary files differindex 225d5d1907..225d5d1907 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadHoe_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadHoe_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadMallet.png Binary files differindex 28d51f02af..28d51f02af 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadMallet.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadMallet.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadMallet_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadMallet_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadMallet_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadMallet_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadPickaxe.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadPickaxe.png Binary files differindex d10fab88aa..d10fab88aa 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadPickaxe.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadPickaxe.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadPickaxe_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadPickaxe_OVERLAY.png Binary files differindex 9374970a7f..9374970a7f 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadPickaxe_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadPickaxe_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadPlow.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadPlow.png Binary files differindex c15a8cdbfa..c15a8cdbfa 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadPlow.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadPlow.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadPlow_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadPlow_OVERLAY.png Binary files differindex 520f1bb48c..520f1bb48c 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadPlow_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadPlow_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadSaw.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadSaw.png Binary files differindex eede998107..eede998107 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadSaw.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadSaw.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadSaw_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadSaw_OVERLAY.png Binary files differindex 27b69fc23a..27b69fc23a 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadSaw_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadSaw_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadScrewdriver.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadScrewdriver.png Binary files differindex 6b0517b879..6b0517b879 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadScrewdriver.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadScrewdriver.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadScrewdriver_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadScrewdriver_OVERLAY.png Binary files differindex 2aea2f961d..2aea2f961d 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadScrewdriver_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadScrewdriver_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadSense.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadSense.png Binary files differindex 06a7479e5f..06a7479e5f 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadSense.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadSense.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadSense_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadSense_OVERLAY.png Binary files differindex fe6d646dd8..fe6d646dd8 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadSense_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadSense_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadShovel.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadShovel.png Binary files differindex 89fa86a4ce..89fa86a4ce 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadShovel.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadShovel.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadShovel_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadShovel_OVERLAY.png Binary files differindex fa0da0ce2a..fa0da0ce2a 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadShovel_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadShovel_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadSoldering.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadSoldering.png Binary files differindex 5665e03aee..5665e03aee 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadSoldering.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadSoldering.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadSoldering_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadSoldering_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadSoldering_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadSoldering_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadSword.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadSword.png Binary files differindex 36e515be25..36e515be25 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadSword.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadSword.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadSword_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadSword_OVERLAY.png Binary files differindex b9a16a484a..b9a16a484a 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadSword_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadSword_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadUniversalSpade.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadUniversalSpade.png Binary files differindex 2f162be760..2f162be760 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadUniversalSpade.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadUniversalSpade.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadUniversalSpade_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadUniversalSpade_OVERLAY.png Binary files differindex c95bf030b4..c95bf030b4 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadUniversalSpade_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadUniversalSpade_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadWrench.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadWrench.png Binary files differindex cde1376f59..cde1376f59 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadWrench.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadWrench.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadWrench_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadWrench_OVERLAY.png Binary files differindex 9d0db6f7fb..9d0db6f7fb 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadWrench_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/toolHeadWrench_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/turbineBlade.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/turbineBlade.png Binary files differindex 59611725f8..59611725f8 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/turbineBlade.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/turbineBlade.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/turbineBlade_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/turbineBlade_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/turbineBlade_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/turbineBlade_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/void.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/void.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/void.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/void.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/void_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/void_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/void_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/void_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/wireFine.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/wireFine.png Binary files differindex 06f24ab18b..06f24ab18b 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/wireFine.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/wireFine.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/wireFine_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/wireFine_OVERLAY.png Binary files differindex d5ce76b80f..d5ce76b80f 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/ENRICHED/wireFine_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/ENRICHED/wireFine_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/TURBINE_BLADE.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/TURBINE_BLADE.png Binary files differindex c78a1d5570..c78a1d5570 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/TURBINE_BLADE.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/TURBINE_BLADE.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/TURBINE_BLADE_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/TURBINE_BLADE_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/TURBINE_BLADE_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/TURBINE_BLADE_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/arrowGtPlastic.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/arrowGtPlastic.png Binary files differindex d34a721d96..d34a721d96 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/arrowGtPlastic.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/arrowGtPlastic.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/arrowGtPlastic_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/arrowGtPlastic_OVERLAY.png Binary files differindex 3ffb9e31e0..3ffb9e31e0 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/arrowGtPlastic_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/arrowGtPlastic_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/arrowGtWood.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/arrowGtWood.png Binary files differindex 20de92b986..20de92b986 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/arrowGtWood.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/arrowGtWood.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/arrowGtWood_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/arrowGtWood_OVERLAY.png Binary files differindex 948953f827..948953f827 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/arrowGtWood_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/arrowGtWood_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/bolt.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/bolt.png Binary files differindex 8675564a9b..8675564a9b 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/bolt.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/bolt.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/bolt_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/bolt_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/bolt_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/bolt_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/cell.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/cell.png Binary files differindex 27d4df7081..27d4df7081 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/cell.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/cell.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/cellPlasma.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/cellPlasma.png Binary files differindex ce3c6377c7..ce3c6377c7 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/cellPlasma.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/cellPlasma.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/cellPlasma_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/cellPlasma_OVERLAY.png Binary files differindex 1c93293744..1c93293744 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/cellPlasma_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/cellPlasma_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/cell_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/cell_OVERLAY.png Binary files differindex f02365b9ff..f02365b9ff 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/cell_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/cell_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/crateGtDust.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/crateGtDust.png Binary files differindex fad582745d..fad582745d 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/crateGtDust.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/crateGtDust.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/crateGtDust_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/crateGtDust_OVERLAY.png Binary files differindex 64d56b48ea..64d56b48ea 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/crateGtDust_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/crateGtDust_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/crateGtGem.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/crateGtGem.png Binary files differindex a4418db9e1..a4418db9e1 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/crateGtGem.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/crateGtGem.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/crateGtGem_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/crateGtGem_OVERLAY.png Binary files differindex 9798a597e0..9798a597e0 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/crateGtGem_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/crateGtGem_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/crateGtIngot.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/crateGtIngot.png Binary files differindex 85e42b0cd2..85e42b0cd2 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/crateGtIngot.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/crateGtIngot.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/crateGtIngot_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/crateGtIngot_OVERLAY.png Binary files differindex 2f0577d65f..2f0577d65f 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/crateGtIngot_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/crateGtIngot_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/crateGtPlate.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/crateGtPlate.png Binary files differindex 8b48da35d2..8b48da35d2 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/crateGtPlate.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/crateGtPlate.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/crateGtPlate_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/crateGtPlate_OVERLAY.png Binary files differindex ae6d73b7a6..ae6d73b7a6 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/crateGtPlate_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/crateGtPlate_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/crushed.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/crushed.png Binary files differindex 8a240a574d..8a240a574d 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/crushed.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/crushed.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/crushedCentrifuged.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/crushedCentrifuged.png Binary files differindex f74931d42a..f74931d42a 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/crushedCentrifuged.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/crushedCentrifuged.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/crushedCentrifuged_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/crushedCentrifuged_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/crushedCentrifuged_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/crushedCentrifuged_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/crushedPurified.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/crushedPurified.png Binary files differindex 17859801da..17859801da 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/crushedPurified.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/crushedPurified.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/crushedPurified_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/crushedPurified_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/crushedPurified_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/crushedPurified_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/crushed_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/crushed_OVERLAY.png Binary files differindex b546c4eeec..b546c4eeec 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/crushed_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/crushed_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/dust.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/dust.png Binary files differindex d1282f4248..d1282f4248 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/dust.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/dust.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/dustImpure.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/dustImpure.png Binary files differindex 8918e54459..8918e54459 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/dustImpure.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/dustImpure.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/dustImpure_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/dustImpure_OVERLAY.png Binary files differindex e60e7b6d18..e60e7b6d18 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/dustImpure_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/dustImpure_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/dustPure.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/dustPure.png Binary files differindex 8918e54459..8918e54459 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/dustPure.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/dustPure.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/dustPure_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/dustPure_OVERLAY.png Binary files differindex 496dd33d5b..496dd33d5b 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/dustPure_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/dustPure_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/dustSmall.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/dustSmall.png Binary files differindex f29479bf55..f29479bf55 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/dustSmall.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/dustSmall.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/dustSmall_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/dustSmall_OVERLAY.png Binary files differindex ebaf1512a8..ebaf1512a8 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/dustSmall_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/dustSmall_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/dustTiny.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/dustTiny.png Binary files differindex 859cd70116..859cd70116 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/dustTiny.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/dustTiny.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/dustTiny_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/dustTiny_OVERLAY.png Binary files differindex 3fad40a7e4..3fad40a7e4 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/dustTiny_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/dustTiny_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/dust_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/dust_OVERLAY.png Binary files differindex 8529b87f57..8529b87f57 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/dust_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/dust_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/foil.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/foil.png Binary files differindex cdce151f9a..cdce151f9a 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/foil.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/foil.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/foil_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/foil_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/foil_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/foil_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/gearGt.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/gearGt.png Binary files differindex a7bc0f90f1..a7bc0f90f1 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/gearGt.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/gearGt.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/gearGtSmall.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/gearGtSmall.png Binary files differindex 0fe97b84fd..0fe97b84fd 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/gearGtSmall.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/gearGtSmall.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/gearGtSmall_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/gearGtSmall_OVERLAY.png Binary files differindex 47ab97c308..47ab97c308 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/gearGtSmall_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/gearGtSmall_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/gearGt_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/gearGt_OVERLAY.png Binary files differindex 97d42fe104..97d42fe104 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/gearGt_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/gearGt_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/gem.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/gem.png Binary files differindex 235bdd740b..235bdd740b 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/gem.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/gem.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/gemChipped.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/gemChipped.png Binary files differindex 6b7fc73d7a..6b7fc73d7a 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/gemChipped.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/gemChipped.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/gemChipped_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/gemChipped_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/gemChipped_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/gemChipped_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/gemExquisite.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/gemExquisite.png Binary files differindex fbbe56cb1c..fbbe56cb1c 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/gemExquisite.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/gemExquisite.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/gemExquisite_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/gemExquisite_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/gemExquisite_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/gemExquisite_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/gemFlawed.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/gemFlawed.png Binary files differindex 499bf464b3..499bf464b3 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/gemFlawed.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/gemFlawed.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/gemFlawed_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/gemFlawed_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/gemFlawed_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/gemFlawed_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/gemFlawless.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/gemFlawless.png Binary files differindex 925e5f7eea..925e5f7eea 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/gemFlawless.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/gemFlawless.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/gemFlawless_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/gemFlawless_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/gemFlawless_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/gemFlawless_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/gem_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/gem_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/gem_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/gem_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/handleMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/handleMallet.png Binary files differindex 9021949091..9021949091 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/handleMallet.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/handleMallet.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/handleMallet_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/handleMallet_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/handleMallet_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/handleMallet_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingot.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingot.png Binary files differindex 92bc131a2f..92bc131a2f 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingot.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingot.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingotDouble.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingotDouble.png Binary files differindex 678c35518b..678c35518b 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingotDouble.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingotDouble.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingotDouble_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingotDouble_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingotDouble_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingotDouble_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingotHot.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingotHot.png Binary files differindex 6fc93f933b..6fc93f933b 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingotHot.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingotHot.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingotHot_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingotHot_OVERLAY.png Binary files differindex ebf9b80323..ebf9b80323 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingotHot_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingotHot_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingotQuadruple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingotQuadruple.png Binary files differindex b62d361f19..b62d361f19 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingotQuadruple.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingotQuadruple.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingotQuadruple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingotQuadruple_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingotQuadruple_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingotQuadruple_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingotQuintuple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingotQuintuple.png Binary files differindex e3ab084563..e3ab084563 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingotQuintuple.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingotQuintuple.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingotQuintuple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingotQuintuple_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingotQuintuple_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingotQuintuple_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingotTriple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingotTriple.png Binary files differindex b8853a770e..b8853a770e 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingotTriple.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingotTriple.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingotTriple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingotTriple_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingotTriple_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingotTriple_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingot_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingot_OVERLAY.png Binary files differindex fdd7cd358a..fdd7cd358a 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingot_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/ingot_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/lens.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/lens.png Binary files differindex 4b29fca4c1..4b29fca4c1 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/lens.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/lens.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/lens_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/lens_OVERLAY.png Binary files differindex 20436f976e..20436f976e 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/lens_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/lens_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/nugget.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/nugget.png Binary files differindex b1636ee569..b1636ee569 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/nugget.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/nugget.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/nugget_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/nugget_OVERLAY.png Binary files differindex e8e1fef899..e8e1fef899 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/nugget_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/nugget_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/plate.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/plate.png Binary files differindex d31178c3c6..d31178c3c6 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/plate.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/plate.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/plateDense.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/plateDense.png Binary files differindex 4666dd5902..4666dd5902 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/plateDense.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/plateDense.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/plateDense_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/plateDense_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/plateDense_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/plateDense_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/plateDouble.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/plateDouble.png Binary files differindex edb7970730..edb7970730 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/plateDouble.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/plateDouble.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/plateDouble_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/plateDouble_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/plateDouble_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/plateDouble_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/plateQuadruple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/plateQuadruple.png Binary files differindex 6840fd312a..6840fd312a 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/plateQuadruple.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/plateQuadruple.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/plateQuadruple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/plateQuadruple_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/plateQuadruple_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/plateQuadruple_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/plateQuintuple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/plateQuintuple.png Binary files differindex 8a71537dee..8a71537dee 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/plateQuintuple.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/plateQuintuple.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/plateQuintuple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/plateQuintuple_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/plateQuintuple_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/plateQuintuple_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/plateTriple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/plateTriple.png Binary files differindex 6e5d95061c..6e5d95061c 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/plateTriple.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/plateTriple.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/plateTriple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/plateTriple_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/plateTriple_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/plateTriple_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/plate_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/plate_OVERLAY.png Binary files differindex 4b5c1998f0..4b5c1998f0 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/plate_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/plate_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/ring.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/ring.png Binary files differindex eb9dfd5e21..eb9dfd5e21 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/ring.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/ring.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/ring_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/ring_OVERLAY.png Binary files differindex d5a0c95c2e..d5a0c95c2e 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/ring_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/ring_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/rotor.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/rotor.png Binary files differindex 14b62252ae..14b62252ae 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/rotor.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/rotor.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/rotor_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/rotor_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/rotor_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/rotor_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/round.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/round.png Binary files differindex 98480bf685..98480bf685 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/round.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/round.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/round_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/round_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/round_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/round_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/screw.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/screw.png Binary files differindex faca2c6e3d..faca2c6e3d 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/screw.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/screw.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/screw_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/screw_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/screw_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/screw_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/spring.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/spring.png Binary files differindex df442ed454..df442ed454 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/spring.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/spring.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/springSmall.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/springSmall.png Binary files differindex 54b3afb24e..54b3afb24e 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/springSmall.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/springSmall.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/springSmall_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/springSmall_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/springSmall_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/springSmall_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/spring_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/spring_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/spring_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/spring_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/stick.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/stick.png Binary files differindex d999179b3c..d999179b3c 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/stick.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/stick.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/stickLong.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/stickLong.png Binary files differindex 1580b911f0..1580b911f0 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/stickLong.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/stickLong.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/stickLong_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/stickLong_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/stickLong_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/stickLong_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/stick_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/stick_OVERLAY.png Binary files differindex f18ad52a73..f18ad52a73 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/stick_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/stick_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadArrow.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadArrow.png Binary files differindex 0f220d5406..0f220d5406 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadArrow.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadArrow.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadArrow_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadArrow_OVERLAY.png Binary files differindex 244fde8251..244fde8251 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadArrow_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadArrow_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadAxe.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadAxe.png Binary files differindex b09c2128da..b09c2128da 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadAxe.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadAxe.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadAxe_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadAxe_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadAxe_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadAxe_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadBuzzSaw.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadBuzzSaw.png Binary files differindex 4a19f4c251..4a19f4c251 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadBuzzSaw.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadBuzzSaw.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadBuzzSaw_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadBuzzSaw_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadBuzzSaw_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadBuzzSaw_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadChainsaw.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadChainsaw.png Binary files differindex 3ab90f5b05..3ab90f5b05 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadChainsaw.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadChainsaw.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadChainsaw_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadChainsaw_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadChainsaw_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadChainsaw_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadDrill.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadDrill.png Binary files differindex 0c5f99482c..0c5f99482c 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadDrill.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadDrill.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadDrill_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadDrill_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadDrill_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadDrill_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadFile.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadFile.png Binary files differindex e52d0a01fa..e52d0a01fa 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadFile.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadFile.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadFile_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadFile_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadFile_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadFile_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadHammer.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadHammer.png Binary files differindex 747f647e7e..747f647e7e 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadHammer.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadHammer.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadHammer_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadHammer_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadHammer_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadHammer_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadHoe.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadHoe.png Binary files differindex d0dcfd1e5d..d0dcfd1e5d 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadHoe.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadHoe.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadHoe_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadHoe_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadHoe_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadHoe_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadMallet.png Binary files differindex 5ca5a9b6ed..5ca5a9b6ed 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadMallet.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadMallet.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadMallet_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadMallet_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadMallet_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadMallet_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadPickaxe.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadPickaxe.png Binary files differindex d10fab88aa..d10fab88aa 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadPickaxe.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadPickaxe.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadPickaxe_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadPickaxe_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadPickaxe_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadPickaxe_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadPlow.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadPlow.png Binary files differindex c15a8cdbfa..c15a8cdbfa 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadPlow.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadPlow.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadPlow_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadPlow_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadPlow_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadPlow_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadSaw.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadSaw.png Binary files differindex eede998107..eede998107 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadSaw.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadSaw.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadSaw_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadSaw_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadSaw_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadSaw_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadScrewdriver.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadScrewdriver.png Binary files differindex 6b0517b879..6b0517b879 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadScrewdriver.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadScrewdriver.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadScrewdriver_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadScrewdriver_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadScrewdriver_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadScrewdriver_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadSense.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadSense.png Binary files differindex 06a7479e5f..06a7479e5f 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadSense.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadSense.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadSense_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadSense_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadSense_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadSense_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadShovel.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadShovel.png Binary files differindex 89fa86a4ce..89fa86a4ce 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadShovel.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadShovel.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadShovel_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadShovel_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadShovel_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadShovel_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadSoldering.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadSoldering.png Binary files differindex fa9e379c16..fa9e379c16 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadSoldering.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadSoldering.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadSoldering_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadSoldering_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadSoldering_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadSoldering_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadSword.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadSword.png Binary files differindex 36e515be25..36e515be25 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadSword.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadSword.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadSword_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadSword_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadSword_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadSword_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadUniversalSpade.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadUniversalSpade.png Binary files differindex 2f162be760..2f162be760 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadUniversalSpade.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadUniversalSpade.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadUniversalSpade_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadUniversalSpade_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadUniversalSpade_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadUniversalSpade_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadWrench.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadWrench.png Binary files differindex cde1376f59..cde1376f59 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadWrench.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadWrench.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadWrench_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadWrench_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadWrench_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/toolHeadWrench_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/turbineBlade.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/turbineBlade.png Binary files differindex c78a1d5570..c78a1d5570 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/turbineBlade.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/turbineBlade.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/turbineBlade_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/turbineBlade_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/turbineBlade_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/turbineBlade_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/void.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/void.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/void.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/void.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/void_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/void_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/void_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/void_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/wireFine.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/wireFine.png Binary files differindex 06f24ab18b..06f24ab18b 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/wireFine.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/wireFine.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/wireFine_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/wireFine_OVERLAY.png Binary files differindex 5e9e05d5b0..5e9e05d5b0 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/GEM_A/wireFine_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_A/wireFine_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/cell.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/cell.png Binary files differindex 27d4df7081..27d4df7081 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/cell.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/cell.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/cellPlasma.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/cellPlasma.png Binary files differindex ce3c6377c7..ce3c6377c7 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/cellPlasma.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/cellPlasma.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/cellPlasma_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/cellPlasma_OVERLAY.png Binary files differindex 1c93293744..1c93293744 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/cellPlasma_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/cellPlasma_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/cell_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/cell_OVERLAY.png Binary files differindex f02365b9ff..f02365b9ff 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/cell_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/cell_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crateGtDust.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crateGtDust.png Binary files differindex fad582745d..fad582745d 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crateGtDust.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crateGtDust.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crateGtDust_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crateGtDust_OVERLAY.png Binary files differindex 64d56b48ea..64d56b48ea 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crateGtDust_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crateGtDust_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crateGtGem.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crateGtGem.png Binary files differindex a4418db9e1..a4418db9e1 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crateGtGem.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crateGtGem.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crateGtGem_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crateGtGem_OVERLAY.png Binary files differindex 9798a597e0..9798a597e0 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crateGtGem_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crateGtGem_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crateGtIngot.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crateGtIngot.png Binary files differindex 85e42b0cd2..85e42b0cd2 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crateGtIngot.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crateGtIngot.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crateGtIngot_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crateGtIngot_OVERLAY.png Binary files differindex 2f0577d65f..2f0577d65f 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crateGtIngot_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crateGtIngot_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crateGtPlate.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crateGtPlate.png Binary files differindex 8b48da35d2..8b48da35d2 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crateGtPlate.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crateGtPlate.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crateGtPlate_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crateGtPlate_OVERLAY.png Binary files differindex ae6d73b7a6..ae6d73b7a6 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crateGtPlate_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crateGtPlate_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crushedCentrifuged_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crushedCentrifuged_OVERLAY.png Binary files differindex 3741866149..3741866149 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crushedCentrifuged_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crushedCentrifuged_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crushedPurified_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crushedPurified_OVERLAY.png Binary files differindex 1918a7fa45..1918a7fa45 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crushedPurified_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crushedPurified_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crushed_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crushed_OVERLAY.png Binary files differindex 7cdf09b174..7cdf09b174 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crushed_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crushed_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/dustTiny_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/dustTiny_OVERLAY.png Binary files differindex 03c07f2760..03c07f2760 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/dustTiny_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/dustTiny_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/dust_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/dust_OVERLAY.png Binary files differindex cbc30cc68e..cbc30cc68e 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/dust_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/dust_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/foil_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/foil_OVERLAY.png Binary files differindex f6fa0b94cc..f6fa0b94cc 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/foil_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/foil_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/gearGtSmall_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/gearGtSmall_OVERLAY.png Binary files differindex dddb4764ce..dddb4764ce 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/gearGtSmall_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/gearGtSmall_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/gearGt_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/gearGt_OVERLAY.png Binary files differindex d8471aed5f..d8471aed5f 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/gearGt_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/gearGt_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/gemChipped_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/gemChipped_OVERLAY.png Binary files differindex c5abe856a0..c5abe856a0 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/gemChipped_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/gemChipped_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/gemExquisite_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/gemExquisite_OVERLAY.png Binary files differindex 50d407491e..50d407491e 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/gemExquisite_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/gemExquisite_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/gemFlawed_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/gemFlawed_OVERLAY.png Binary files differindex 3561f91a07..3561f91a07 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/gemFlawed_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/gemFlawed_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/gemFlawless_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/gemFlawless_OVERLAY.png Binary files differindex 82f557e199..82f557e199 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/gemFlawless_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/gemFlawless_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/gem_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/gem_OVERLAY.png Binary files differindex 55468929e9..55468929e9 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/gem_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/gem_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/ingotDouble_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/ingotDouble_OVERLAY.png Binary files differindex c844854d37..c844854d37 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/ingotDouble_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/ingotDouble_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/ingotHot_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/ingotHot_OVERLAY.png Binary files differindex ebf9b80323..ebf9b80323 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/ingotHot_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/ingotHot_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/ingotQuadruple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/ingotQuadruple_OVERLAY.png Binary files differindex 2a63953e92..2a63953e92 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/ingotQuadruple_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/ingotQuadruple_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/ingotQuintuple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/ingotQuintuple_OVERLAY.png Binary files differindex 896be7f08e..896be7f08e 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/ingotQuintuple_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/ingotQuintuple_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/ingotTriple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/ingotTriple_OVERLAY.png Binary files differindex c086bca2bb..c086bca2bb 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/ingotTriple_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/ingotTriple_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/ingot_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/ingot_OVERLAY.png Binary files differindex c59ef7b1bb..c59ef7b1bb 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/ingot_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/ingot_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/lens.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/lens.png Binary files differindex 4b29fca4c1..4b29fca4c1 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/lens.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/lens.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/lens_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/lens_OVERLAY.png Binary files differindex f3bcc922b2..f3bcc922b2 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/lens_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/lens_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/nugget_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/nugget_OVERLAY.png Binary files differindex 2af89ec304..2af89ec304 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/nugget_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/nugget_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/plateDense_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/plateDense_OVERLAY.png Binary files differindex 037d829395..037d829395 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/plateDense_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/plateDense_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/plateDouble_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/plateDouble_OVERLAY.png Binary files differindex cd358f9d96..cd358f9d96 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/plateDouble_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/plateDouble_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/plateQuadruple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/plateQuadruple_OVERLAY.png Binary files differindex de8ae5af6f..de8ae5af6f 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/plateQuadruple_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/plateQuadruple_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/plateQuintuple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/plateQuintuple_OVERLAY.png Binary files differindex 2d7a80f45e..2d7a80f45e 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/plateQuintuple_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/plateQuintuple_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/plateTriple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/plateTriple_OVERLAY.png Binary files differindex f73c531239..f73c531239 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/plateTriple_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/plateTriple_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/plate_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/plate_OVERLAY.png Binary files differindex f52c654ee5..f52c654ee5 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/plate_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/plate_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/ring_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/ring_OVERLAY.png Binary files differindex 5879963ad2..5879963ad2 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/ring_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/ring_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/rotor_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/rotor_OVERLAY.png Binary files differindex f0d87d27df..f0d87d27df 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/rotor_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/rotor_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/round_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/round_OVERLAY.png Binary files differindex 0916369702..0916369702 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/round_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/round_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/screw_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/screw_OVERLAY.png Binary files differindex c540788917..c540788917 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/screw_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/screw_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/springSmall_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/springSmall_OVERLAY.png Binary files differindex a8170f57d6..a8170f57d6 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/springSmall_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/springSmall_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/spring_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/spring_OVERLAY.png Binary files differindex fdb0756839..fdb0756839 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/spring_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/spring_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/stickLong_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/stickLong_OVERLAY.png Binary files differindex 54b47c2224..54b47c2224 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/stickLong_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/stickLong_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/stick_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/stick_OVERLAY.png Binary files differindex 04634628ac..04634628ac 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/stick_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/stick_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/wireFine.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/wireFine.png Binary files differindex 06f24ab18b..06f24ab18b 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/wireFine.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/wireFine.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/wireFine_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/wireFine_OVERLAY.png Binary files differindex d5ce76b80f..d5ce76b80f 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/wireFine_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/wireFine_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/TURBINE_BLADE.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/TURBINE_BLADE.png Binary files differindex 4523be43b9..4523be43b9 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/TURBINE_BLADE.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/TURBINE_BLADE.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/TURBINE_BLADE_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/TURBINE_BLADE_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/TURBINE_BLADE_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/TURBINE_BLADE_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/arrowGtPlastic.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/arrowGtPlastic.png Binary files differindex d34a721d96..d34a721d96 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/arrowGtPlastic.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/arrowGtPlastic.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/arrowGtPlastic_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/arrowGtPlastic_OVERLAY.png Binary files differindex 3ffb9e31e0..3ffb9e31e0 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/arrowGtPlastic_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/arrowGtPlastic_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/arrowGtWood.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/arrowGtWood.png Binary files differindex 20de92b986..20de92b986 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/arrowGtWood.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/arrowGtWood.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/arrowGtWood_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/arrowGtWood_OVERLAY.png Binary files differindex 948953f827..948953f827 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/arrowGtWood_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/arrowGtWood_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/bolt.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/bolt.png Binary files differindex 8675564a9b..8675564a9b 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/bolt.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/bolt.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/bolt_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/bolt_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/bolt_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/bolt_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/cell.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/cell.png Binary files differindex 27d4df7081..27d4df7081 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/cell.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/cell.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/cellPlasma.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/cellPlasma.png Binary files differindex ce3c6377c7..ce3c6377c7 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/cellPlasma.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/cellPlasma.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/cellPlasma_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/cellPlasma_OVERLAY.png Binary files differindex 1c93293744..1c93293744 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/cellPlasma_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/cellPlasma_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/cell_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/cell_OVERLAY.png Binary files differindex f02365b9ff..f02365b9ff 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/cell_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/cell_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crateGtDust.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crateGtDust.png Binary files differindex fad582745d..fad582745d 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crateGtDust.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crateGtDust.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crateGtDust_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crateGtDust_OVERLAY.png Binary files differindex 64d56b48ea..64d56b48ea 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crateGtDust_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crateGtDust_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crateGtGem.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crateGtGem.png Binary files differindex a4418db9e1..a4418db9e1 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crateGtGem.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crateGtGem.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crateGtGem_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crateGtGem_OVERLAY.png Binary files differindex 9798a597e0..9798a597e0 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crateGtGem_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crateGtGem_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crateGtIngot.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crateGtIngot.png Binary files differindex 85e42b0cd2..85e42b0cd2 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crateGtIngot.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crateGtIngot.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crateGtIngot_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crateGtIngot_OVERLAY.png Binary files differindex 2f0577d65f..2f0577d65f 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crateGtIngot_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crateGtIngot_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crateGtPlate.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crateGtPlate.png Binary files differindex 8b48da35d2..8b48da35d2 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crateGtPlate.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crateGtPlate.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crateGtPlate_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crateGtPlate_OVERLAY.png Binary files differindex ae6d73b7a6..ae6d73b7a6 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crateGtPlate_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crateGtPlate_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crushed.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crushed.png Binary files differindex 7f49597676..7f49597676 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crushed.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crushed.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crushedCentrifuged.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crushedCentrifuged.png Binary files differindex f74931d42a..f74931d42a 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crushedCentrifuged.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crushedCentrifuged.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crushedCentrifuged_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crushedCentrifuged_OVERLAY.png Binary files differindex 819f43c6f6..819f43c6f6 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crushedCentrifuged_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crushedCentrifuged_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crushedPurified.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crushedPurified.png Binary files differindex e2edcad772..e2edcad772 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crushedPurified.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crushedPurified.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crushedPurified_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crushedPurified_OVERLAY.png Binary files differindex 75b134d3ef..75b134d3ef 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crushedPurified_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crushedPurified_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crushed_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crushed_OVERLAY.png Binary files differindex 9ee7575a02..9ee7575a02 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crushed_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crushed_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/dust.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/dust.png Binary files differindex d1282f4248..d1282f4248 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/dust.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/dust.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/dustImpure.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/dustImpure.png Binary files differindex 8918e54459..8918e54459 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/dustImpure.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/dustImpure.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/dustImpure_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/dustImpure_OVERLAY.png Binary files differindex e60e7b6d18..e60e7b6d18 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/dustImpure_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/dustImpure_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/dustPure.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/dustPure.png Binary files differindex 8918e54459..8918e54459 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/dustPure.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/dustPure.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/dustPure_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/dustPure_OVERLAY.png Binary files differindex 496dd33d5b..496dd33d5b 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/dustPure_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/dustPure_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/dustSmall.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/dustSmall.png Binary files differindex f29479bf55..f29479bf55 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/dustSmall.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/dustSmall.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/dustSmall_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/dustSmall_OVERLAY.png Binary files differindex 9758a35399..9758a35399 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/dustSmall_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/dustSmall_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/dustTiny.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/dustTiny.png Binary files differindex 859cd70116..859cd70116 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/dustTiny.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/dustTiny.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/dustTiny_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/dustTiny_OVERLAY.png Binary files differindex 9ab216d5d2..9ab216d5d2 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/dustTiny_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/dustTiny_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/dust_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/dust_OVERLAY.png Binary files differindex 4d00229736..4d00229736 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/dust_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/dust_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/foil.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/foil.png Binary files differindex cdce151f9a..cdce151f9a 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/foil.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/foil.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/foil_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/foil_OVERLAY.png Binary files differindex 5c94fdce69..5c94fdce69 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/foil_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/foil_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gearGt.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gearGt.png Binary files differindex a7bc0f90f1..a7bc0f90f1 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gearGt.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gearGt.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gearGtSmall.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gearGtSmall.png Binary files differindex 0fe97b84fd..0fe97b84fd 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gearGtSmall.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gearGtSmall.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gearGtSmall_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gearGtSmall_OVERLAY.png Binary files differindex 47ab97c308..47ab97c308 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gearGtSmall_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gearGtSmall_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gearGt_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gearGt_OVERLAY.png Binary files differindex 97d42fe104..97d42fe104 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gearGt_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gearGt_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gem.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gem.png Binary files differindex 13a798cdc3..13a798cdc3 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gem.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gem.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gemChipped.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gemChipped.png Binary files differindex 6b7fc73d7a..6b7fc73d7a 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gemChipped.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gemChipped.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gemChipped_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gemChipped_OVERLAY.png Binary files differindex 9608d2d182..9608d2d182 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gemChipped_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gemChipped_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gemExquisite.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gemExquisite.png Binary files differindex fbbe56cb1c..fbbe56cb1c 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gemExquisite.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gemExquisite.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gemExquisite_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gemExquisite_OVERLAY.png Binary files differindex 10d9d54e65..10d9d54e65 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gemExquisite_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gemExquisite_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gemFlawed.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gemFlawed.png Binary files differindex 499bf464b3..499bf464b3 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gemFlawed.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gemFlawed.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gemFlawed_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gemFlawed_OVERLAY.png Binary files differindex df8b7b9a75..df8b7b9a75 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gemFlawed_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gemFlawed_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gemFlawless.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gemFlawless.png Binary files differindex 925e5f7eea..925e5f7eea 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gemFlawless.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gemFlawless.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gemFlawless_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gemFlawless_OVERLAY.png Binary files differindex d5845995cc..d5845995cc 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gemFlawless_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gemFlawless_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gem_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gem_OVERLAY.png Binary files differindex e1fe9bed43..e1fe9bed43 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gem_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/gem_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/handleMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/handleMallet.png Binary files differindex 9021949091..9021949091 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/handleMallet.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/handleMallet.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/handleMallet_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/handleMallet_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/handleMallet_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/handleMallet_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingot.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingot.png Binary files differindex 92bc131a2f..92bc131a2f 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingot.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingot.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotDouble.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotDouble.png Binary files differindex 678c35518b..678c35518b 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotDouble.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotDouble.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotDouble_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotDouble_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotDouble_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotDouble_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotHot.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotHot.png Binary files differindex 6fc93f933b..6fc93f933b 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotHot.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotHot.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotHot_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotHot_OVERLAY.png Binary files differindex ebf9b80323..ebf9b80323 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotHot_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotHot_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotQuadruple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotQuadruple.png Binary files differindex b62d361f19..b62d361f19 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotQuadruple.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotQuadruple.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotQuadruple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotQuadruple_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotQuadruple_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotQuadruple_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotQuintuple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotQuintuple.png Binary files differindex e3ab084563..e3ab084563 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotQuintuple.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotQuintuple.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotQuintuple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotQuintuple_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotQuintuple_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotQuintuple_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotTriple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotTriple.png Binary files differindex b8853a770e..b8853a770e 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotTriple.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotTriple.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotTriple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotTriple_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotTriple_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingotTriple_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingot_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingot_OVERLAY.png Binary files differindex e0a49831b5..e0a49831b5 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingot_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ingot_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/lens.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/lens.png Binary files differindex 4b29fca4c1..4b29fca4c1 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/lens.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/lens.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/lens_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/lens_OVERLAY.png Binary files differindex 20436f976e..20436f976e 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/lens_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/lens_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/nugget.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/nugget.png Binary files differindex b1636ee569..b1636ee569 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/nugget.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/nugget.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/nugget_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/nugget_OVERLAY.png Binary files differindex 78caf2a7ee..78caf2a7ee 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/nugget_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/nugget_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/plate.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/plate.png Binary files differindex d31178c3c6..d31178c3c6 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/plate.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/plate.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/plateDense.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/plateDense.png Binary files differindex 4666dd5902..4666dd5902 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/plateDense.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/plateDense.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/plateDense_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/plateDense_OVERLAY.png Binary files differindex b3441fbf19..b3441fbf19 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/plateDense_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/plateDense_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/plateDouble.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/plateDouble.png Binary files differindex edb7970730..edb7970730 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/plateDouble.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/plateDouble.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/plateDouble_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/plateDouble_OVERLAY.png Binary files differindex 4253929300..4253929300 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/plateDouble_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/plateDouble_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/plateQuadruple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/plateQuadruple.png Binary files differindex 6840fd312a..6840fd312a 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/plateQuadruple.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/plateQuadruple.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/plateQuadruple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/plateQuadruple_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/plateQuadruple_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/plateQuadruple_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/plateQuintuple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/plateQuintuple.png Binary files differindex 8a71537dee..8a71537dee 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/plateQuintuple.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/plateQuintuple.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/plateQuintuple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/plateQuintuple_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/plateQuintuple_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/plateQuintuple_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/plateTriple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/plateTriple.png Binary files differindex 6e5d95061c..6e5d95061c 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/plateTriple.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/plateTriple.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/plateTriple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/plateTriple_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/plateTriple_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/plateTriple_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/plate_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/plate_OVERLAY.png Binary files differindex 574c36552c..574c36552c 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/plate_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/plate_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ring.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ring.png Binary files differindex eb9dfd5e21..eb9dfd5e21 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ring.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ring.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ring_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ring_OVERLAY.png Binary files differindex d5a0c95c2e..d5a0c95c2e 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ring_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/ring_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/rotor.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/rotor.png Binary files differindex 14b62252ae..14b62252ae 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/rotor.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/rotor.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/rotor_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/rotor_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/rotor_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/rotor_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/round.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/round.png Binary files differindex 98480bf685..98480bf685 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/round.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/round.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/round_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/round_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/round_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/round_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/screw.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/screw.png Binary files differindex faca2c6e3d..faca2c6e3d 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/screw.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/screw.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/screw_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/screw_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/screw_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/screw_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/spring.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/spring.png Binary files differindex df442ed454..df442ed454 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/spring.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/spring.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/springSmall.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/springSmall.png Binary files differindex 54b3afb24e..54b3afb24e 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/springSmall.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/springSmall.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/springSmall_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/springSmall_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/springSmall_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/springSmall_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/spring_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/spring_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/spring_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/spring_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/stick.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/stick.png Binary files differindex d999179b3c..d999179b3c 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/stick.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/stick.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/stickLong.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/stickLong.png Binary files differindex 1580b911f0..1580b911f0 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/stickLong.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/stickLong.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/stickLong_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/stickLong_OVERLAY.png Binary files differindex 99a3fb2e2b..99a3fb2e2b 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/stickLong_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/stickLong_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/stick_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/stick_OVERLAY.png Binary files differindex 3de14933fa..3de14933fa 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/stick_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/stick_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadArrow.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadArrow.png Binary files differindex 0f220d5406..0f220d5406 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadArrow.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadArrow.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadArrow_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadArrow_OVERLAY.png Binary files differindex 244fde8251..244fde8251 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadArrow_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadArrow_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadAxe.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadAxe.png Binary files differindex b09c2128da..b09c2128da 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadAxe.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadAxe.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadAxe_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadAxe_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadAxe_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadAxe_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadBuzzSaw.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadBuzzSaw.png Binary files differindex 4a19f4c251..4a19f4c251 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadBuzzSaw.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadBuzzSaw.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadBuzzSaw_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadBuzzSaw_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadBuzzSaw_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadBuzzSaw_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadChainsaw.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadChainsaw.png Binary files differindex 3ab90f5b05..3ab90f5b05 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadChainsaw.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadChainsaw.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadChainsaw_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadChainsaw_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadChainsaw_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadChainsaw_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadDrill.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadDrill.png Binary files differindex 0c5f99482c..0c5f99482c 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadDrill.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadDrill.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadDrill_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadDrill_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadDrill_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadDrill_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadFile.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadFile.png Binary files differindex e52d0a01fa..e52d0a01fa 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadFile.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadFile.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadFile_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadFile_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadFile_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadFile_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadHammer.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadHammer.png Binary files differindex 747f647e7e..747f647e7e 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadHammer.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadHammer.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadHammer_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadHammer_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadHammer_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadHammer_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadHoe.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadHoe.png Binary files differindex d0dcfd1e5d..d0dcfd1e5d 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadHoe.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadHoe.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadHoe_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadHoe_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadHoe_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadHoe_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadMallet.png Binary files differindex 5ca5a9b6ed..5ca5a9b6ed 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadMallet.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadMallet.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadMallet_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadMallet_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadMallet_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadMallet_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadPickaxe.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadPickaxe.png Binary files differindex d10fab88aa..d10fab88aa 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadPickaxe.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadPickaxe.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadPickaxe_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadPickaxe_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadPickaxe_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadPickaxe_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadPlow.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadPlow.png Binary files differindex c15a8cdbfa..c15a8cdbfa 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadPlow.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadPlow.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadPlow_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadPlow_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadPlow_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadPlow_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadSaw.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadSaw.png Binary files differindex eede998107..eede998107 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadSaw.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadSaw.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadSaw_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadSaw_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadSaw_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadSaw_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadScrewdriver.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadScrewdriver.png Binary files differindex 6b0517b879..6b0517b879 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadScrewdriver.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadScrewdriver.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadScrewdriver_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadScrewdriver_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadScrewdriver_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadScrewdriver_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadSense.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadSense.png Binary files differindex 06a7479e5f..06a7479e5f 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadSense.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadSense.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadSense_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadSense_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadSense_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadSense_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadShovel.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadShovel.png Binary files differindex 89fa86a4ce..89fa86a4ce 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadShovel.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadShovel.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadShovel_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadShovel_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadShovel_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadShovel_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadSoldering.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadSoldering.png Binary files differindex fa9e379c16..fa9e379c16 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadSoldering.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadSoldering.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadSoldering_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadSoldering_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadSoldering_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadSoldering_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadSword.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadSword.png Binary files differindex 36e515be25..36e515be25 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadSword.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadSword.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadSword_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadSword_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadSword_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadSword_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadUniversalSpade.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadUniversalSpade.png Binary files differindex 2f162be760..2f162be760 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadUniversalSpade.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadUniversalSpade.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadUniversalSpade_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadUniversalSpade_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadUniversalSpade_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadUniversalSpade_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadWrench.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadWrench.png Binary files differindex cde1376f59..cde1376f59 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadWrench.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadWrench.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadWrench_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadWrench_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadWrench_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/toolHeadWrench_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/turbineBlade.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/turbineBlade.png Binary files differindex 4523be43b9..4523be43b9 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/turbineBlade.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/turbineBlade.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/turbineBlade_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/turbineBlade_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/turbineBlade_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/turbineBlade_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/void.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/void.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/void.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/void.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/void_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/void_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/void_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/void_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/wireFine.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/wireFine.png Binary files differindex 06f24ab18b..06f24ab18b 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/wireFine.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/wireFine.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/wireFine_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/wireFine_OVERLAY.png Binary files differindex 5e9e05d5b0..5e9e05d5b0 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/wireFine_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/wireFine_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/TURBINE_BLADE.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/TURBINE_BLADE.png Binary files differindex 4523be43b9..4523be43b9 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/TURBINE_BLADE.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/TURBINE_BLADE.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/TURBINE_BLADE_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/TURBINE_BLADE_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/TURBINE_BLADE_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/TURBINE_BLADE_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/arrowGtPlastic.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/arrowGtPlastic.png Binary files differindex d34a721d96..d34a721d96 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/arrowGtPlastic.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/arrowGtPlastic.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/arrowGtPlastic_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/arrowGtPlastic_OVERLAY.png Binary files differindex 3ffb9e31e0..3ffb9e31e0 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/arrowGtPlastic_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/arrowGtPlastic_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/arrowGtWood.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/arrowGtWood.png Binary files differindex 20de92b986..20de92b986 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/arrowGtWood.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/arrowGtWood.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/arrowGtWood_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/arrowGtWood_OVERLAY.png Binary files differindex 948953f827..948953f827 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/arrowGtWood_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/arrowGtWood_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/bolt.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/bolt.png Binary files differindex 8675564a9b..8675564a9b 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/bolt.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/bolt.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/bolt_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/bolt_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/bolt_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/bolt_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/cell.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/cell.png Binary files differindex 27d4df7081..27d4df7081 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/cell.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/cell.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/cellPlasma.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/cellPlasma.png Binary files differindex ce3c6377c7..ce3c6377c7 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/cellPlasma.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/cellPlasma.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/cellPlasma_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/cellPlasma_OVERLAY.png Binary files differindex 1c93293744..1c93293744 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/cellPlasma_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/cellPlasma_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/cell_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/cell_OVERLAY.png Binary files differindex f02365b9ff..f02365b9ff 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/cell_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/cell_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/crateGtDust.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/crateGtDust.png Binary files differindex fad582745d..fad582745d 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/crateGtDust.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/crateGtDust.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/crateGtDust_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/crateGtDust_OVERLAY.png Binary files differindex 64d56b48ea..64d56b48ea 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/crateGtDust_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/crateGtDust_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/crateGtGem.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/crateGtGem.png Binary files differindex a4418db9e1..a4418db9e1 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/crateGtGem.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/crateGtGem.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/crateGtGem_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/crateGtGem_OVERLAY.png Binary files differindex 9798a597e0..9798a597e0 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/crateGtGem_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/crateGtGem_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/crateGtIngot.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/crateGtIngot.png Binary files differindex 85e42b0cd2..85e42b0cd2 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/crateGtIngot.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/crateGtIngot.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/crateGtIngot_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/crateGtIngot_OVERLAY.png Binary files differindex 2f0577d65f..2f0577d65f 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/crateGtIngot_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/crateGtIngot_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/crateGtPlate.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/crateGtPlate.png Binary files differindex 8b48da35d2..8b48da35d2 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/crateGtPlate.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/crateGtPlate.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/crateGtPlate_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/crateGtPlate_OVERLAY.png Binary files differindex ae6d73b7a6..ae6d73b7a6 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/crateGtPlate_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/crateGtPlate_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/crushed.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/crushed.png Binary files differindex 6f893e05b7..6f893e05b7 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/crushed.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/crushed.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/crushedCentrifuged.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/crushedCentrifuged.png Binary files differindex f74931d42a..f74931d42a 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/crushedCentrifuged.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/crushedCentrifuged.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/crushedCentrifuged_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/crushedCentrifuged_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/crushedCentrifuged_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/crushedCentrifuged_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/crushedPurified.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/crushedPurified.png Binary files differindex 12a99bfde1..12a99bfde1 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/crushedPurified.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/crushedPurified.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/crushedPurified_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/crushedPurified_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/crushedPurified_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/crushedPurified_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/crushed_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/crushed_OVERLAY.png Binary files differindex 2a7b9e6d6c..2a7b9e6d6c 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/crushed_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/crushed_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/dust.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/dust.png Binary files differindex d1282f4248..d1282f4248 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/dust.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/dust.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/dustImpure.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/dustImpure.png Binary files differindex 8918e54459..8918e54459 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/dustImpure.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/dustImpure.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/dustImpure_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/dustImpure_OVERLAY.png Binary files differindex e60e7b6d18..e60e7b6d18 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/dustImpure_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/dustImpure_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/dustPure.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/dustPure.png Binary files differindex 8918e54459..8918e54459 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/dustPure.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/dustPure.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/dustPure_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/dustPure_OVERLAY.png Binary files differindex 496dd33d5b..496dd33d5b 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/dustPure_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/dustPure_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/dustSmall.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/dustSmall.png Binary files differindex f29479bf55..f29479bf55 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/dustSmall.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/dustSmall.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/dustSmall_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/dustSmall_OVERLAY.png Binary files differindex ebaf1512a8..ebaf1512a8 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/dustSmall_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/dustSmall_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/dustTiny.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/dustTiny.png Binary files differindex 859cd70116..859cd70116 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/dustTiny.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/dustTiny.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/dustTiny_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/dustTiny_OVERLAY.png Binary files differindex 3fad40a7e4..3fad40a7e4 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/dustTiny_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/dustTiny_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/dust_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/dust_OVERLAY.png Binary files differindex 8529b87f57..8529b87f57 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/dust_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/dust_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/foil.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/foil.png Binary files differindex cdce151f9a..cdce151f9a 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/foil.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/foil.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/foil_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/foil_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/foil_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/foil_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/gearGt.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/gearGt.png Binary files differindex a7bc0f90f1..a7bc0f90f1 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/gearGt.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/gearGt.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/gearGtSmall.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/gearGtSmall.png Binary files differindex 0fe97b84fd..0fe97b84fd 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/gearGtSmall.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/gearGtSmall.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/gearGtSmall_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/gearGtSmall_OVERLAY.png Binary files differindex 47ab97c308..47ab97c308 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/gearGtSmall_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/gearGtSmall_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/gearGt_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/gearGt_OVERLAY.png Binary files differindex 97d42fe104..97d42fe104 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/gearGt_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/gearGt_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/gem.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/gem.png Binary files differindex 721d19529e..721d19529e 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/gem.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/gem.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/gemChipped.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/gemChipped.png Binary files differindex 6b7fc73d7a..6b7fc73d7a 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/gemChipped.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/gemChipped.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/gemChipped_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/gemChipped_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/gemChipped_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/gemChipped_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/gemExquisite.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/gemExquisite.png Binary files differindex fbbe56cb1c..fbbe56cb1c 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/gemExquisite.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/gemExquisite.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/gemExquisite_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/gemExquisite_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/gemExquisite_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/gemExquisite_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/gemFlawed.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/gemFlawed.png Binary files differindex 499bf464b3..499bf464b3 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/gemFlawed.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/gemFlawed.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/gemFlawed_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/gemFlawed_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/gemFlawed_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/gemFlawed_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/gemFlawless.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/gemFlawless.png Binary files differindex 925e5f7eea..925e5f7eea 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/gemFlawless.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/gemFlawless.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/gemFlawless_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/gemFlawless_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/gemFlawless_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/gemFlawless_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/gem_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/gem_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/gem_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/gem_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/handleMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/handleMallet.png Binary files differindex 38a7fc65c9..38a7fc65c9 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/handleMallet.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/handleMallet.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/handleMallet_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/handleMallet_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/handleMallet_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/handleMallet_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/ingot.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/ingot.png Binary files differindex 92bc131a2f..92bc131a2f 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/ingot.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/ingot.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/ingotDouble.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/ingotDouble.png Binary files differindex 678c35518b..678c35518b 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/ingotDouble.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/ingotDouble.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/ingotDouble_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/ingotDouble_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/ingotDouble_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/ingotDouble_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/ingotHot.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/ingotHot.png Binary files differindex 6fc93f933b..6fc93f933b 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/ingotHot.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/ingotHot.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/ingotHot_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/ingotHot_OVERLAY.png Binary files differindex ebf9b80323..ebf9b80323 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/ingotHot_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/ingotHot_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/ingotQuadruple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/ingotQuadruple.png Binary files differindex b62d361f19..b62d361f19 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/ingotQuadruple.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/ingotQuadruple.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/ingotQuadruple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/ingotQuadruple_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/ingotQuadruple_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/ingotQuadruple_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/ingotQuintuple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/ingotQuintuple.png Binary files differindex e3ab084563..e3ab084563 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/ingotQuintuple.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/ingotQuintuple.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/ingotQuintuple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/ingotQuintuple_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/ingotQuintuple_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/ingotQuintuple_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/ingotTriple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/ingotTriple.png Binary files differindex b8853a770e..b8853a770e 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/ingotTriple.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/ingotTriple.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/ingotTriple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/ingotTriple_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/ingotTriple_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/ingotTriple_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/ingot_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/ingot_OVERLAY.png Binary files differindex fdd7cd358a..fdd7cd358a 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/ingot_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/ingot_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/lens.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/lens.png Binary files differindex 4b29fca4c1..4b29fca4c1 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/lens.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/lens.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/lens_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/lens_OVERLAY.png Binary files differindex 23b3ac8f76..23b3ac8f76 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/lens_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/lens_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/nugget.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/nugget.png Binary files differindex b1636ee569..b1636ee569 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/nugget.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/nugget.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/nugget_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/nugget_OVERLAY.png Binary files differindex e8e1fef899..e8e1fef899 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/nugget_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/nugget_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/plate.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/plate.png Binary files differindex d31178c3c6..d31178c3c6 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/plate.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/plate.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/plateDense.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/plateDense.png Binary files differindex 4666dd5902..4666dd5902 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/plateDense.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/plateDense.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/plateDense_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/plateDense_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/plateDense_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/plateDense_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/plateDouble.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/plateDouble.png Binary files differindex edb7970730..edb7970730 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/plateDouble.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/plateDouble.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/plateDouble_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/plateDouble_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/plateDouble_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/plateDouble_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/plateQuadruple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/plateQuadruple.png Binary files differindex 6840fd312a..6840fd312a 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/plateQuadruple.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/plateQuadruple.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/plateQuadruple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/plateQuadruple_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/plateQuadruple_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/plateQuadruple_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/plateQuintuple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/plateQuintuple.png Binary files differindex 8a71537dee..8a71537dee 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/plateQuintuple.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/plateQuintuple.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/plateQuintuple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/plateQuintuple_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/plateQuintuple_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/plateQuintuple_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/plateTriple.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/plateTriple.png Binary files differindex 6e5d95061c..6e5d95061c 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/plateTriple.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/plateTriple.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/plateTriple_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/plateTriple_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/plateTriple_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/plateTriple_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/plate_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/plate_OVERLAY.png Binary files differindex 4b5c1998f0..4b5c1998f0 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/plate_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/plate_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/ring.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/ring.png Binary files differindex eb9dfd5e21..eb9dfd5e21 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/ring.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/ring.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/ring_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/ring_OVERLAY.png Binary files differindex d5a0c95c2e..d5a0c95c2e 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/ring_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/ring_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/rotor.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/rotor.png Binary files differindex 751111417a..751111417a 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/rotor.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/rotor.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/rotor_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/rotor_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/rotor_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/rotor_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/round.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/round.png Binary files differindex 98480bf685..98480bf685 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/round.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/round.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/round_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/round_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/round_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/round_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/screw.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/screw.png Binary files differindex faca2c6e3d..faca2c6e3d 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/screw.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/screw.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/screw_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/screw_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/screw_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/screw_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/spring.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/spring.png Binary files differindex df442ed454..df442ed454 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/spring.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/spring.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/springSmall.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/springSmall.png Binary files differindex 54b3afb24e..54b3afb24e 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/springSmall.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/springSmall.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/springSmall_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/springSmall_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/springSmall_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/springSmall_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/spring_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/spring_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/spring_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/spring_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/stick.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/stick.png Binary files differindex d999179b3c..d999179b3c 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/stick.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/stick.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/stickLong.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/stickLong.png Binary files differindex 1580b911f0..1580b911f0 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/stickLong.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/stickLong.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/stickLong_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/stickLong_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/stickLong_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/stickLong_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/stick_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/stick_OVERLAY.png Binary files differindex f18ad52a73..f18ad52a73 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/stick_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/stick_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadArrow.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadArrow.png Binary files differindex 0f220d5406..0f220d5406 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadArrow.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadArrow.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadArrow_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadArrow_OVERLAY.png Binary files differindex 244fde8251..244fde8251 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadArrow_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadArrow_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadAxe.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadAxe.png Binary files differindex b09c2128da..b09c2128da 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadAxe.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadAxe.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadAxe_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadAxe_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadAxe_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadAxe_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadBuzzSaw.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadBuzzSaw.png Binary files differindex 4a19f4c251..4a19f4c251 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadBuzzSaw.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadBuzzSaw.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadBuzzSaw_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadBuzzSaw_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadBuzzSaw_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadBuzzSaw_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadChainsaw.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadChainsaw.png Binary files differindex 3ab90f5b05..3ab90f5b05 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadChainsaw.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadChainsaw.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadChainsaw_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadChainsaw_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadChainsaw_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadChainsaw_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadDrill.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadDrill.png Binary files differindex 0c5f99482c..0c5f99482c 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadDrill.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadDrill.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadDrill_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadDrill_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadDrill_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadDrill_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadFile.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadFile.png Binary files differindex e52d0a01fa..e52d0a01fa 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadFile.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadFile.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadFile_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadFile_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadFile_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadFile_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadHammer.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadHammer.png Binary files differindex 747f647e7e..747f647e7e 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadHammer.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadHammer.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadHammer_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadHammer_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadHammer_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadHammer_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadHoe.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadHoe.png Binary files differindex d0dcfd1e5d..d0dcfd1e5d 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadHoe.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadHoe.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadHoe_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadHoe_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadHoe_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadHoe_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadMallet.png Binary files differindex 29bd613285..29bd613285 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadMallet.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadMallet.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadMallet_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadMallet_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadMallet_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadMallet_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadPickaxe.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadPickaxe.png Binary files differindex d10fab88aa..d10fab88aa 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadPickaxe.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadPickaxe.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadPickaxe_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadPickaxe_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadPickaxe_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadPickaxe_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadPlow.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadPlow.png Binary files differindex c15a8cdbfa..c15a8cdbfa 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadPlow.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadPlow.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadPlow_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadPlow_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadPlow_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadPlow_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadSaw.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadSaw.png Binary files differindex eede998107..eede998107 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadSaw.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadSaw.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadSaw_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadSaw_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadSaw_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadSaw_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadScrewdriver.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadScrewdriver.png Binary files differindex 6b0517b879..6b0517b879 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadScrewdriver.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadScrewdriver.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadScrewdriver_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadScrewdriver_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadScrewdriver_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadScrewdriver_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadSense.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadSense.png Binary files differindex 06a7479e5f..06a7479e5f 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadSense.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadSense.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadSense_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadSense_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadSense_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadSense_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadShovel.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadShovel.png Binary files differindex 89fa86a4ce..89fa86a4ce 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadShovel.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadShovel.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadShovel_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadShovel_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadShovel_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadShovel_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadSoldering.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadSoldering.png Binary files differindex 242dbd14fc..242dbd14fc 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadSoldering.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadSoldering.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadSoldering_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadSoldering_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadSoldering_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadSoldering_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadSword.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadSword.png Binary files differindex 36e515be25..36e515be25 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadSword.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadSword.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadSword_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadSword_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadSword_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadSword_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadUniversalSpade.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadUniversalSpade.png Binary files differindex 2f162be760..2f162be760 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadUniversalSpade.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadUniversalSpade.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadUniversalSpade_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadUniversalSpade_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadUniversalSpade_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadUniversalSpade_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadWrench.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadWrench.png Binary files differindex cde1376f59..cde1376f59 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadWrench.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadWrench.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadWrench_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadWrench_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadWrench_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/toolHeadWrench_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/turbineBlade.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/turbineBlade.png Binary files differindex 4523be43b9..4523be43b9 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/turbineBlade.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/turbineBlade.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/turbineBlade_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/turbineBlade_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/turbineBlade_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/turbineBlade_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/void.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/void.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/void.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/void.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/void_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/void_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/void_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/void_OVERLAY.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/wireFine.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/wireFine.png Binary files differindex 06f24ab18b..06f24ab18b 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/wireFine.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/wireFine.png diff --git a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/wireFine_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/wireFine_OVERLAY.png Binary files differindex 5e9e05d5b0..5e9e05d5b0 100644 --- a/src/resources/assets/gregtech/textures/items/materialicons/REFINED/wireFine_OVERLAY.png +++ b/src/main/resources/assets/gregtech/textures/items/materialicons/REFINED/wireFine_OVERLAY.png diff --git a/src/resources/assets/ic2/lang/de_DE.lang b/src/main/resources/assets/ic2/lang/de_DE.lang index 2d562c59e7..2d562c59e7 100644 --- a/src/resources/assets/ic2/lang/de_DE.lang +++ b/src/main/resources/assets/ic2/lang/de_DE.lang diff --git a/src/resources/assets/ic2/lang/en_US.lang b/src/main/resources/assets/ic2/lang/en_US.lang index 9b44f2d14e..9b44f2d14e 100644 --- a/src/resources/assets/ic2/lang/en_US.lang +++ b/src/main/resources/assets/ic2/lang/en_US.lang diff --git a/src/resources/assets/ic2/lang/zh_CN.lang b/src/main/resources/assets/ic2/lang/zh_CN.lang index 0811dbcdb0..0811dbcdb0 100644 --- a/src/resources/assets/ic2/lang/zh_CN.lang +++ b/src/main/resources/assets/ic2/lang/zh_CN.lang diff --git a/src/resources/assets/ic2/textures/armor/hazmatEx_1.png b/src/main/resources/assets/ic2/textures/armor/hazmatEx_1.png Binary files differindex 2275007fbe..2275007fbe 100644 --- a/src/resources/assets/ic2/textures/armor/hazmatEx_1.png +++ b/src/main/resources/assets/ic2/textures/armor/hazmatEx_1.png diff --git a/src/resources/assets/ic2/textures/armor/hazmatEx_2.png b/src/main/resources/assets/ic2/textures/armor/hazmatEx_2.png Binary files differindex 758adafdf2..758adafdf2 100644 --- a/src/resources/assets/ic2/textures/armor/hazmatEx_2.png +++ b/src/main/resources/assets/ic2/textures/armor/hazmatEx_2.png diff --git a/src/resources/assets/ic2/textures/items/cell/HydrofluoricAcid.png b/src/main/resources/assets/ic2/textures/items/cell/HydrofluoricAcid.png Binary files differindex ed907728d4..ed907728d4 100644 --- a/src/resources/assets/ic2/textures/items/cell/HydrofluoricAcid.png +++ b/src/main/resources/assets/ic2/textures/items/cell/HydrofluoricAcid.png diff --git a/src/resources/assets/ic2/textures/items/cell/HydrogenChloride.png b/src/main/resources/assets/ic2/textures/items/cell/HydrogenChloride.png Binary files differindex 135d293637..135d293637 100644 --- a/src/resources/assets/ic2/textures/items/cell/HydrogenChloride.png +++ b/src/main/resources/assets/ic2/textures/items/cell/HydrogenChloride.png diff --git a/src/resources/assets/ic2/textures/items/cell/LithiumHydroxide.png b/src/main/resources/assets/ic2/textures/items/cell/LithiumHydroxide.png Binary files differindex 7fefe04c5e..7fefe04c5e 100644 --- a/src/resources/assets/ic2/textures/items/cell/LithiumHydroxide.png +++ b/src/main/resources/assets/ic2/textures/items/cell/LithiumHydroxide.png diff --git a/src/resources/assets/ic2/textures/items/cell/SulfurDioxide.png b/src/main/resources/assets/ic2/textures/items/cell/SulfurDioxide.png Binary files differindex f8bf8329b5..f8bf8329b5 100644 --- a/src/resources/assets/ic2/textures/items/cell/SulfurDioxide.png +++ b/src/main/resources/assets/ic2/textures/items/cell/SulfurDioxide.png diff --git a/src/resources/assets/ic2/textures/items/cell/SulfuricApatite.png b/src/main/resources/assets/ic2/textures/items/cell/SulfuricApatite.png Binary files differindex 5c62c379ab..5c62c379ab 100644 --- a/src/resources/assets/ic2/textures/items/cell/SulfuricApatite.png +++ b/src/main/resources/assets/ic2/textures/items/cell/SulfuricApatite.png diff --git a/src/resources/assets/ic2/textures/items/cell/SulfuricLithium.png b/src/main/resources/assets/ic2/textures/items/cell/SulfuricLithium.png Binary files differindex b8d02729ba..b8d02729ba 100644 --- a/src/resources/assets/ic2/textures/items/cell/SulfuricLithium.png +++ b/src/main/resources/assets/ic2/textures/items/cell/SulfuricLithium.png diff --git a/src/resources/assets/ic2/textures/items/cell/SulfurousAcid.png b/src/main/resources/assets/ic2/textures/items/cell/SulfurousAcid.png Binary files differindex 53f8604e13..53f8604e13 100644 --- a/src/resources/assets/ic2/textures/items/cell/SulfurousAcid.png +++ b/src/main/resources/assets/ic2/textures/items/cell/SulfurousAcid.png diff --git a/src/resources/assets/ic2/textures/items/cell/ThoriumTetraFluoride.png b/src/main/resources/assets/ic2/textures/items/cell/ThoriumTetraFluoride.png Binary files differindex 413179e396..413179e396 100644 --- a/src/resources/assets/ic2/textures/items/cell/ThoriumTetraFluoride.png +++ b/src/main/resources/assets/ic2/textures/items/cell/ThoriumTetraFluoride.png diff --git a/src/resources/assets/ic2/textures/items/cell/UraniumHexaFluoride.png b/src/main/resources/assets/ic2/textures/items/cell/UraniumHexaFluoride.png Binary files differindex 2fe0c893fe..2fe0c893fe 100644 --- a/src/resources/assets/ic2/textures/items/cell/UraniumHexaFluoride.png +++ b/src/main/resources/assets/ic2/textures/items/cell/UraniumHexaFluoride.png diff --git a/src/resources/assets/ic2/textures/items/cell/UraniumTetraFluoride.png b/src/main/resources/assets/ic2/textures/items/cell/UraniumTetraFluoride.png Binary files differindex ba2d239308..ba2d239308 100644 --- a/src/resources/assets/ic2/textures/items/cell/UraniumTetraFluoride.png +++ b/src/main/resources/assets/ic2/textures/items/cell/UraniumTetraFluoride.png diff --git a/src/resources/assets/ic2/textures/items/itemArmorHazmatChestplateEx.png b/src/main/resources/assets/ic2/textures/items/itemArmorHazmatChestplateEx.png Binary files differindex 742d1d7035..742d1d7035 100644 --- a/src/resources/assets/ic2/textures/items/itemArmorHazmatChestplateEx.png +++ b/src/main/resources/assets/ic2/textures/items/itemArmorHazmatChestplateEx.png diff --git a/src/resources/assets/ic2/textures/items/itemArmorHazmatHelmetEx.png b/src/main/resources/assets/ic2/textures/items/itemArmorHazmatHelmetEx.png Binary files differindex 5340375595..5340375595 100644 --- a/src/resources/assets/ic2/textures/items/itemArmorHazmatHelmetEx.png +++ b/src/main/resources/assets/ic2/textures/items/itemArmorHazmatHelmetEx.png diff --git a/src/resources/assets/ic2/textures/items/itemArmorHazmatLeggingsEx.png b/src/main/resources/assets/ic2/textures/items/itemArmorHazmatLeggingsEx.png Binary files differindex 80cdca9b23..80cdca9b23 100644 --- a/src/resources/assets/ic2/textures/items/itemArmorHazmatLeggingsEx.png +++ b/src/main/resources/assets/ic2/textures/items/itemArmorHazmatLeggingsEx.png diff --git a/src/resources/assets/ic2/textures/items/itemArmorRubBootsEx.png b/src/main/resources/assets/ic2/textures/items/itemArmorRubBootsEx.png Binary files differindex 901a8fbc35..901a8fbc35 100644 --- a/src/resources/assets/ic2/textures/items/itemArmorRubBootsEx.png +++ b/src/main/resources/assets/ic2/textures/items/itemArmorRubBootsEx.png diff --git a/src/resources/assets/ic2/textures/items/rotors/itemEnergeticRotor.png b/src/main/resources/assets/ic2/textures/items/rotors/itemEnergeticRotor.png Binary files differindex 9fef2ec178..9fef2ec178 100644 --- a/src/resources/assets/ic2/textures/items/rotors/itemEnergeticRotor.png +++ b/src/main/resources/assets/ic2/textures/items/rotors/itemEnergeticRotor.png diff --git a/src/resources/assets/ic2/textures/items/rotors/itemIridiumRotor.png b/src/main/resources/assets/ic2/textures/items/rotors/itemIridiumRotor.png Binary files differindex 1f1770ff1c..1f1770ff1c 100644 --- a/src/resources/assets/ic2/textures/items/rotors/itemIridiumRotor.png +++ b/src/main/resources/assets/ic2/textures/items/rotors/itemIridiumRotor.png diff --git a/src/resources/assets/ic2/textures/items/rotors/itemMagnaliumRotor.png b/src/main/resources/assets/ic2/textures/items/rotors/itemMagnaliumRotor.png Binary files differindex d1e2970117..d1e2970117 100644 --- a/src/resources/assets/ic2/textures/items/rotors/itemMagnaliumRotor.png +++ b/src/main/resources/assets/ic2/textures/items/rotors/itemMagnaliumRotor.png diff --git a/src/resources/assets/ic2/textures/items/rotors/itemTungstenSteelRotor.png b/src/main/resources/assets/ic2/textures/items/rotors/itemTungstenSteelRotor.png Binary files differindex aec47b7c6b..aec47b7c6b 100644 --- a/src/resources/assets/ic2/textures/items/rotors/itemTungstenSteelRotor.png +++ b/src/main/resources/assets/ic2/textures/items/rotors/itemTungstenSteelRotor.png diff --git a/src/resources/assets/ic2/textures/items/rotors/itemUltimetRotor.png b/src/main/resources/assets/ic2/textures/items/rotors/itemUltimetRotor.png Binary files differindex 03704d5d12..03704d5d12 100644 --- a/src/resources/assets/ic2/textures/items/rotors/itemUltimetRotor.png +++ b/src/main/resources/assets/ic2/textures/items/rotors/itemUltimetRotor.png diff --git a/src/resources/assets/ic2/textures/items/rotors/itemVibrantRotor.png b/src/main/resources/assets/ic2/textures/items/rotors/itemVibrantRotor.png Binary files differindex 34949af9a6..34949af9a6 100644 --- a/src/resources/assets/ic2/textures/items/rotors/itemVibrantRotor.png +++ b/src/main/resources/assets/ic2/textures/items/rotors/itemVibrantRotor.png diff --git a/src/resources/assets/ic2/textures/items/rotors/rotorEnergeticModel.png b/src/main/resources/assets/ic2/textures/items/rotors/rotorEnergeticModel.png Binary files differindex 045470a2b1..045470a2b1 100644 --- a/src/resources/assets/ic2/textures/items/rotors/rotorEnergeticModel.png +++ b/src/main/resources/assets/ic2/textures/items/rotors/rotorEnergeticModel.png diff --git a/src/resources/assets/ic2/textures/items/rotors/rotorIridiumModel.png b/src/main/resources/assets/ic2/textures/items/rotors/rotorIridiumModel.png Binary files differindex b967b4f1dd..b967b4f1dd 100644 --- a/src/resources/assets/ic2/textures/items/rotors/rotorIridiumModel.png +++ b/src/main/resources/assets/ic2/textures/items/rotors/rotorIridiumModel.png diff --git a/src/resources/assets/ic2/textures/items/rotors/rotorMagnaliumModel.png b/src/main/resources/assets/ic2/textures/items/rotors/rotorMagnaliumModel.png Binary files differindex a638c0389f..a638c0389f 100644 --- a/src/resources/assets/ic2/textures/items/rotors/rotorMagnaliumModel.png +++ b/src/main/resources/assets/ic2/textures/items/rotors/rotorMagnaliumModel.png diff --git a/src/resources/assets/ic2/textures/items/rotors/rotorTungstenSteelModel.png b/src/main/resources/assets/ic2/textures/items/rotors/rotorTungstenSteelModel.png Binary files differindex 7dd2e69f7e..7dd2e69f7e 100644 --- a/src/resources/assets/ic2/textures/items/rotors/rotorTungstenSteelModel.png +++ b/src/main/resources/assets/ic2/textures/items/rotors/rotorTungstenSteelModel.png diff --git a/src/resources/assets/ic2/textures/items/rotors/rotorUltimetModel.png b/src/main/resources/assets/ic2/textures/items/rotors/rotorUltimetModel.png Binary files differindex b6c3f36716..b6c3f36716 100644 --- a/src/resources/assets/ic2/textures/items/rotors/rotorUltimetModel.png +++ b/src/main/resources/assets/ic2/textures/items/rotors/rotorUltimetModel.png diff --git a/src/resources/assets/ic2/textures/items/rotors/rotorVibrantModel.png b/src/main/resources/assets/ic2/textures/items/rotors/rotorVibrantModel.png Binary files differindex 321de66ff9..321de66ff9 100644 --- a/src/resources/assets/ic2/textures/items/rotors/rotorVibrantModel.png +++ b/src/main/resources/assets/ic2/textures/items/rotors/rotorVibrantModel.png diff --git a/src/resources/assets/minecraft/sounds/mob/witch/death.ogg b/src/main/resources/assets/minecraft/sounds/mob/witch/death.ogg Binary files differindex 412fe5c591..412fe5c591 100644 --- a/src/resources/assets/minecraft/sounds/mob/witch/death.ogg +++ b/src/main/resources/assets/minecraft/sounds/mob/witch/death.ogg diff --git a/src/resources/assets/minecraft/sounds/mob/witch/hit1.ogg b/src/main/resources/assets/minecraft/sounds/mob/witch/hit1.ogg Binary files differindex 91ec4976b9..91ec4976b9 100644 --- a/src/resources/assets/minecraft/sounds/mob/witch/hit1.ogg +++ b/src/main/resources/assets/minecraft/sounds/mob/witch/hit1.ogg diff --git a/src/resources/assets/minecraft/sounds/mob/witch/hit2.ogg b/src/main/resources/assets/minecraft/sounds/mob/witch/hit2.ogg Binary files differindex 0bdc21aa52..0bdc21aa52 100644 --- a/src/resources/assets/minecraft/sounds/mob/witch/hit2.ogg +++ b/src/main/resources/assets/minecraft/sounds/mob/witch/hit2.ogg diff --git a/src/resources/assets/minecraft/sounds/mob/witch/hit3.ogg b/src/main/resources/assets/minecraft/sounds/mob/witch/hit3.ogg Binary files differindex b7d4429989..b7d4429989 100644 --- a/src/resources/assets/minecraft/sounds/mob/witch/hit3.ogg +++ b/src/main/resources/assets/minecraft/sounds/mob/witch/hit3.ogg diff --git a/src/resources/assets/minecraft/sounds/mob/witch/hit4.ogg b/src/main/resources/assets/minecraft/sounds/mob/witch/hit4.ogg Binary files differindex c810364be4..c810364be4 100644 --- a/src/resources/assets/minecraft/sounds/mob/witch/hit4.ogg +++ b/src/main/resources/assets/minecraft/sounds/mob/witch/hit4.ogg diff --git a/src/resources/assets/minecraft/sounds/mob/witch/idle1.ogg b/src/main/resources/assets/minecraft/sounds/mob/witch/idle1.ogg Binary files differindex 4596d850c1..4596d850c1 100644 --- a/src/resources/assets/minecraft/sounds/mob/witch/idle1.ogg +++ b/src/main/resources/assets/minecraft/sounds/mob/witch/idle1.ogg diff --git a/src/resources/assets/minecraft/sounds/mob/witch/idle2.ogg b/src/main/resources/assets/minecraft/sounds/mob/witch/idle2.ogg Binary files differindex 9d60d58843..9d60d58843 100644 --- a/src/resources/assets/minecraft/sounds/mob/witch/idle2.ogg +++ b/src/main/resources/assets/minecraft/sounds/mob/witch/idle2.ogg diff --git a/src/resources/assets/minecraft/sounds/mob/witch/idle3.ogg b/src/main/resources/assets/minecraft/sounds/mob/witch/idle3.ogg Binary files differindex b5134e84d9..b5134e84d9 100644 --- a/src/resources/assets/minecraft/sounds/mob/witch/idle3.ogg +++ b/src/main/resources/assets/minecraft/sounds/mob/witch/idle3.ogg diff --git a/src/resources/assets/miscutils/lang/de_DE.lang b/src/main/resources/assets/miscutils/lang/de_DE.lang index 6dd49228a2..6dd49228a2 100644 --- a/src/resources/assets/miscutils/lang/de_DE.lang +++ b/src/main/resources/assets/miscutils/lang/de_DE.lang diff --git a/src/resources/assets/miscutils/lang/en_US.lang b/src/main/resources/assets/miscutils/lang/en_US.lang index d581791031..a3639062f8 100644 --- a/src/resources/assets/miscutils/lang/en_US.lang +++ b/src/main/resources/assets/miscutils/lang/en_US.lang @@ -1170,14 +1170,14 @@ item.itemRingQuantum.name=Quantum Ring item.itemScrewQuantum.name=Quantum Screw item.itemRotorQuantum.name=Quantum Rotor item.itemGearQuantum.name=Quantum Gear -item.itemDustFluorite.name=Fluorite Dust -item.itemDustTinyFluorite.name=Tiny Pile of Fluorite Dust -item.itemDustSmallFluorite.name=Small Pile of Fluorite Dust -item.crushedFluorite.name=Crushed Fluorite Ore -item.crushedCentrifugedFluorite.name=Centrifuged Crushed Fluorite Ore -item.crushedPurifiedFluorite.name=Purified Crushed Fluorite Ore -item.dustImpureFluorite.name=Impure Fluorite Dust -item.dustPureFluorite.name=Purified Fluorite Dust +item.itemDustFluoriteF.name=Fluorite (F) Dust +item.itemDustTinyFluoriteF.name=Tiny Pile of Fluorite (F) Dust +item.itemDustSmallFluoriteF.name=Small Pile of Fluorite (F) Dust +item.crushedFluoriteF.name=Crushed Fluorite (F) Ore +item.crushedCentrifugedFluoriteF.name=Centrifuged Crushed Fluorite (F) Ore +item.crushedPurifiedFluoriteF.name=Purified Crushed Fluorite (F) Ore +item.dustImpureFluoriteF.name=Impure Fluorite (F) Dust +item.dustPureFluoriteF.name=Purified Fluorite (F) Dust item.itemDustCrocoite.name=Crocoite Dust item.itemDustTinyCrocoite.name=Tiny Pile of Crocoite Dust item.itemDustSmallCrocoite.name=Small Pile of Crocoite Dust @@ -1418,14 +1418,14 @@ item.crushedCentrifugedFlorencite.name=Centrifuged Crushed Florencite Ore item.crushedPurifiedFlorencite.name=Purified Crushed Florencite Ore item.dustImpureFlorencite.name=Impure Florencite Dust item.dustPureFlorencite.name=Purified Florencite Dust -item.itemDustCryolite.name=Cryolite Dust -item.itemDustTinyCryolite.name=Tiny Pile of Cryolite Dust -item.itemDustSmallCryolite.name=Small Pile of Cryolite Dust -item.crushedCryolite.name=Crushed Cryolite Ore -item.crushedCentrifugedCryolite.name=Centrifuged Crushed Cryolite Ore -item.crushedPurifiedCryolite.name=Purified Crushed Cryolite Ore -item.dustImpureCryolite.name=Impure Cryolite Dust -item.dustPureCryolite.name=Purified Cryolite Dust +item.itemDustCryoliteF.name=Cryolite (F) Dust +item.itemDustTinyCryoliteF.name=Tiny Pile of Cryolite (F) Dust +item.itemDustSmallCryoliteF.name=Small Pile of Cryolite (F) Dust +item.crushedCryoliteF.name=Crushed Cryolite (F) Ore +item.crushedCentrifugedCryoliteF.name=Centrifuged Crushed Cryolite (F) Ore +item.crushedPurifiedCryoliteF.name=Purified Crushed Cryolite (F) Ore +item.dustImpureCryoliteF.name=Impure Cryolite (F) Dust +item.dustPureCryoliteF.name=Purified Cryolite (F) Dust item.itemDustTinyYellorium.name=Tiny Pile of Yellorium Dust item.itemDustSmallYellorium.name=Small Pile of Yellorium Dust item.crushedYellorium.name=Crushed Yellorium Ore @@ -1890,7 +1890,7 @@ tile.Block of Quantum.name=Block of Quantum tile.Quantum Frame Box.name=Quantum Frame Box //Ores -tile.OreFluorite.name=Fluorite Ore +tile.OreFluoriteF.name=Fluorite (F) Ore tile.OreCrocoite.name=Crocoite Ore tile.OreGeikielite.name=Geikielite Ore tile.OreNichromite.name=Nichromite Ore @@ -1921,7 +1921,7 @@ tile.OreHibonite.name=Hibonite Ore tile.OreCerite.name=Cerite Ore tile.OreFluorcaphite.name=Fluorcaphite Ore tile.OreFlorencite.name=Florencite Ore -tile.OreCryolite.name=Cryolite Ore +tile.OreCryoliteF.name=Cryolite (F) Ore //Misc tile.blockMFEffect.name=Special @@ -3235,9 +3235,137 @@ tile.Botmium Frame Box.name=Botmium Frame Box item.itemBasicTurbine.name=Basic Turbine item.itemBasicTurbine_0.name=Basic Iron Turbine item.itemBasicTurbine_1.name=Basic Bronze Turbine +item.itemBasicTurbine_2.name=Basic Steel Turbine interaction.voidexcess.enabled=Void Excess Enabled interaction.voidexcess.disabled=Void Excess Disabled interaction.separateBusses.enabled=Input busses are separated -interaction.separateBusses.disabled=Input busses are not separated
\ No newline at end of file +interaction.separateBusses.disabled=Input busses are not separated + +//Added 29/11/21 + +item.BasicNuclearChemItem.0.name=Uranium Residue Mix +item.BasicNuclearChemItem.1.name=Plutonium Residue Mix +item.BasicNuclearChemItem.2.name=Fluoride Residue Mix +item.BasicNuclearChemItem.3.name=Noble Residue Mix +item.BasicNuclearChemItem.4.name=Red Algae Biomass +item.BasicNuclearChemItem.5.name=Cellulose Fiber +item.BasicNuclearChemItem.6.name=Golden-Brown Cellulose Fiber +item.BasicNuclearChemItem.7.name=Red Cellulose Fiber + +item.itemCellLiFBeF2ZrF4U235.name=LFTR Fuel I Cell +item.itemCellLiFBeF2ZrF4UF4.name=LFTR Fuel II Cell +item.itemCellLiFBeF2ThF4UF4.name=LFTR Fuel III Cell +item.Li2BeF2UF4.name=Burnt Li2BeF2UF4 Cell + +//Added 6/12/21 +item.itemCellLiFBeF2UF4FP.name=LiFBeF2UF4FP Cell +item.itemCellUF6F2.name=UF6F2 Cell +item.itemCellLiFBeF2ThF4.name=LiFBeF2ThF4 Cell +item.itemCellUF6F2FP.name=UF6F2FP Cell +item.dustProtactinium233.name=Protactinium-233 Dust +item.itemCellLiFThF4.name=LiFThF4 Cell +item.NuclearWaste.name=Nuclear Waste Cell +item.itemCellLiFBeF2UF4.name=LiFBeF2UF4 Cell +item.itemCellSodiumFluoride.name=Sodium Fluoride Cell +item.itemCellLiFBeF2.name=LiFBeF2 Cell + +//Added 7/12/21 +item.itemCellDysprosium.name=Dysprosium Cell +item.itemCellThorium.name=Thorium Cell +item.itemCellTellurium.name=Tellurium Cell +item.itemCellThorium232.name=Thorium-232 Cell +item.itemCellLithiumTetrafluoroberyllate.name=Lithium Tetrafluoroberyllate Cell +item.itemCellBurntReactorFuelI.name=Spent LFTR Fuel I Cell +item.itemCellBurntReactorFuelII.name=Spent LFTR Fuel II Cell +item.itemDustTinyIndium.name=Tiny Indium Dust +item.itemDustSmallIndium.name=Small Indium Dust +item.itemDustIndium.name=Indium Dust +item.itemDustTinyBerylliumHydroxide.name=Tiny Beryllium Hydroxide Dust +item.itemDustSmallBerylliumHydroxide.name=Small Beryllium Hydroxide Dust +item.itemDustBerylliumHydroxide.name=Beryllium Hydroxide Dust +item.itemDustTinyAmmoniumBifluoride.name=Tiny Ammonium Bifluoride Dust +item.itemDustSmallAmmoniumBifluoride.name=Small Ammonium Bifluoride Dust +item.itemDustAmmoniumBifluoride.name=Ammonium Bifluoride Dust +item.itemDustTinyAmmoniumTetrafluoroberyllate.name=Tiny Ammonium Tetrafluoroberyllate Dust +item.itemDustSmallAmmoniumTetrafluoroberyllate.name=Small Ammonium Tetrafluoroberyllate Dust +item.itemDustAmmoniumTetrafluoroberyllate.name=Ammonium Tetrafluoroberyllate Dust + +//Added 10/12/21 +item.ImpureLiFBeF2.name=Impure LiFBeF2 Cell +item.itemCellHeliumSpargedLiFBeF2UF4FP.name=Helium Sparged LiFBeF2UF4FP Cell +item.itemCellFluorineSpargedLiFThF4.name=Fluorine Sparged LiFThF4 Cell +item.itemCellFluorineSpargedLiFBeF2ThF4.name=Fluorine Sparged LiFBeF2ThF4 Cell +item.itemIngotHS188A.name=HS-188A Ingot +item.itemHotIngotHS188A.name=Hot HS-188A Ingot +item.itemDustHS188A.name=HS-188A Dust +item.itemDustTinyHS188A.name=Tiny Pile of HS-188A Dust +item.itemDustSmallHS188A.name=Small Pile of HS-188A Dust +item.itemNuggetHS188A.name=HS-188A Nugget +item.itemPlateHS188A.name=HS-188A Plate +item.itemPlateDoubleHS188A.name=Double HS-188A Plate +item.itemBoltHS188A.name=HS-188A Bolt +item.itemRodHS188A.name=HS-188A Rod +item.itemRodLongHS188A.name=Long HS-188A Rod +item.itemRingHS188A.name=HS-188A Ring +item.itemScrewHS188A.name=HS-188A Screw +item.itemRotorHS188A.name=HS-188A Rotor +item.itemGearHS188A.name=HS-188A Gear +item.itemCellHS188A.name=HS-188A Cell + +//Added 12/12/21 +item.itemIngotErbium.name=Erbium Ingot +item.itemHotIngotErbium.name=Hot Erbium Ingot +item.itemDustErbium.name=Erbium Dust +item.itemDustTinyErbium.name=Tiny Pile of Erbium Dust +item.itemDustSmallErbium.name=Small Pile of Erbium Dust +item.itemNuggetErbium.name=Erbium Nugget +item.itemPlateErbium.name=Erbium Plate +item.itemPlateDoubleErbium.name=Double Erbium Plate +item.itemBoltErbium.name=Erbium Bolt +item.itemRodErbium.name=Erbium Rod +item.itemRodLongErbium.name=Long Erbium Rod +item.itemRingErbium.name=Erbium Ring +item.itemScrewErbium.name=Erbium Screw +item.itemRotorErbium.name=Erbium Rotor +item.itemGearErbium.name=Erbium Gear +item.itemCellErbium.name=Erbium Cell +item.itemIngotHeLiCoPtEr.name=HeLiCoPtEr Ingot +item.itemHotIngotHeLiCoPtEr.name=Hot HeLiCoPtEr Ingot +item.itemDustHeLiCoPtEr.name=HeLiCoPtEr Dust +item.itemDustTinyHeLiCoPtEr.name=Tiny Pile of HeLiCoPtEr Dust +item.itemDustSmallHeLiCoPtEr.name=Small Pile of HeLiCoPtEr Dust +item.itemNuggetHeLiCoPtEr.name=HeLiCoPtEr Nugget +item.itemPlateHeLiCoPtEr.name=HeLiCoPtEr Plate +item.itemPlateDoubleHeLiCoPtEr.name=Double HeLiCoPtEr Plate +item.itemBoltHeLiCoPtEr.name=HeLiCoPtEr Bolt +item.itemRodHeLiCoPtEr.name=HeLiCoPtEr Rod +item.itemRodLongHeLiCoPtEr.name=Long HeLiCoPtEr Rod +item.itemRingHeLiCoPtEr.name=HeLiCoPtEr Ring +item.itemScrewHeLiCoPtEr.name=HeLiCoPtEr Screw +item.itemRotorHeLiCoPtEr.name=HeLiCoPtEr Rotor +item.itemGearHeLiCoPtEr.name=HeLiCoPtEr Gear +item.itemCellHeLiCoPtEr.name=HeLiCoPtEr Cell +item.itemIngotPraseodymium.name=Praseodymium Ingot +item.itemHotIngotPraseodymium.name=Hot Praseodymium Ingot +item.itemDustPraseodymium.name=Praseodymium Dust +item.itemDustTinyPraseodymium.name=Tiny Pile of Praseodymium Dust +item.itemDustSmallPraseodymium.name=Small Pile of Praseodymium Dust +item.itemNuggetPraseodymium.name=Praseodymium Nugget +item.itemPlatePraseodymium.name=Praseodymium Plate +item.itemPlateDoublePraseodymium.name=Double Praseodymium Plate +item.itemBoltPraseodymium.name=Praseodymium Bolt +item.itemRodPraseodymium.name=Praseodymium Rod +item.itemRodLongPraseodymium.name=Long Praseodymium Rod +item.itemRingPraseodymium.name=Praseodymium Ring +item.itemScrewPraseodymium.name=Praseodymium Screw +item.itemRotorPraseodymium.name=Praseodymium Rotor +item.itemGearPraseodymium.name=Praseodymium Gear +item.itemCellPraseodymium.name=Praseodymium Cell +item.milledMonazite.name=Milled Monazite +item.FrothMonaziteflotation.name=Monazite Flotation Froth Cell + +//Added 18/12/21 +item.BasicGenericChemItem.13.name=Formaldehyde Catalyst +item.hydrogenchloridemix.name=Hydrogen Chlorine Mix
\ No newline at end of file diff --git a/src/resources/assets/miscutils/lang/ru_RU.lang b/src/main/resources/assets/miscutils/lang/ru_RU.lang index 37de35c563..37de35c563 100644 --- a/src/resources/assets/miscutils/lang/ru_RU.lang +++ b/src/main/resources/assets/miscutils/lang/ru_RU.lang diff --git a/src/resources/assets/miscutils/lang/zh_CN.lang b/src/main/resources/assets/miscutils/lang/zh_CN.lang index e01d85a522..1e77d28562 100644 --- a/src/resources/assets/miscutils/lang/zh_CN.lang +++ b/src/main/resources/assets/miscutils/lang/zh_CN.lang @@ -1,3243 +1,3243 @@ -//Creative Tabs
-itemGroup.MiscUtilBlockTab=[GT++] æ–¹å—
-itemGroup.MiscUtilMiscTab=[GT++] 物å“
-itemGroup.MiscUtilCombatTab=[GT++] 战斗
-itemGroup.MiscUtilToolsTab=[GT++] 工具
-itemGroup.MiscUtilMachineTab=[GT++] 机器
-itemGroup.MiscUtilOtherTab=[GT++] ç‰©å“ II
-itemGroup.MiscUtilBOP=[GT++]超多生物群系附属
-
-//Debug
-item.AAA_Broken.name=[ä¸å˜åœ¨çš„物å“]请在Github上å馈这个åˆæˆ
-item.itemBedLocator_Base.name=床定ä½å™¨[NBT测试]
-item.itemBaseItemWithCharge.name=基础å¯å……电物å“
-item.miscutils_itemDebugShapeSpawner.name=[调试用]塑形
-
-//Fluids
-tile.fluidSludge.name=ä¸æµåŠ¨çš„废水
-tile.fluidSludge.0.name=ä¸æµåŠ¨çš„废水
-
-//Death Messages
-death.attack.plasmabolt=%s æ»äºŽæ»šçƒ«çš„ç‰ç¦»å体.
-death.attack.plasmabolt.player=%1$s 被 %2$s 使用ç‰ç¦»å体击æ€.
-death.attack.gtpp.grinder=%s 被艾è¨ç ”磨机磨æˆäº†æ¸£æ¸£.
-
-//Alternative Materials
-item.itemPlateBatteryAlloy.name=ç”µæ± åˆé‡‘æ¿
-item.itemIngotBatteryAlloy.name=ç”µæ± åˆé‡‘é”
-item.itemStickyRubber.name=粘性橡胶团
-
-//Unused Fuel rods
-item.itemFuelRod_Empty.name=空燃料棒
-item.itemFuelRod_Thorium.name=é’燃料棒
-item.itemFuelRod_Uranium.name=铀燃料棒
-item.itemFuelRod_Plutonium.name=钚燃料棒
-
-//Entities
-entity.constructStaballoy.name=è´«é“€åˆé‡‘结构
-entity.sickBlaze.name=被感染的狂çƒè€…
-
-//Tile Entities
-tile.blockToolBuilder.name=æ ¼é›·å·¥å…·ç»„è£…å°
-
-//Tools
-item.itemBufferCore.name=能é‡æ ¸å¿ƒ
-item.itemStaballoyPickaxe.name=隧é“挖掘者
-item.itemStaballoyAxe.name=æ ‘æž—ç ä¼è€…
-item.itemSandstoneHammer.name=圆石粉碎者
-
-//Thermal Foundation Stuff
-item.MiscUtils.bucket.bucketPyrotheum.name=烈焰之炽焱桶
-item.MiscUtils.bucket.bucketCryotheum.name=æžå¯’之凛冰桶
-item.MiscUtils.bucket.bucketEnder.name=è°æŒ¯ç†”èžæœ«å½±çç 桶
-item.MiscUtils.material.dustPyrotheum.name=炽焱之尘
-item.MiscUtils.material.dustCryotheum.name=凛冰之尘
-item.MiscUtils.material.rodBlizz.name=暴雪棒
-item.MiscUtils.material.dustBlizz.name=暴雪粉
-
-//==============
-tile.miscutils.fluid.pyrotheum.name=烈焰之炽焱
-tile.miscutils.fluid.cryotheum.name=æžå¯’之凛冰
-tile.miscutils.fluid.ender.name=è°æŒ¯ç†”èžæœ«å½±çç
-//==============
-
-//Forestry Stuff
-item.frameAccelerated.name=åŠ é€Ÿæ¡†æž¶
-item.frameVoid.name=虚空框架
-item.frameMutagenic.name=诱å˜æ¡†æž¶
-item.frameBusy.name=工作框架
-item.frameChocolate.name=巧克力框架
-item.frameRestraint.name=约æŸæ¡†æž¶
-item.frameSoul.name=çµé‚框架
-item.frameHealing.name=治愈框架
-item.frameNova.name=新星框架
-item.frameArborists.name=æ ‘è‰ºæ¡†æž¶
-item.frameDecaying.name=è…烂框架
-item.frameSlowing.name=å‡é€Ÿæ¡†æž¶
-item.frameStabilizing.name=稳定框架
-item.frameUseless.name=æ— ç”¨æ¡†æž¶
-
-//IC2 stuff
-item.itemEnergeticRotorBlade.name=充能åˆé‡‘扇å¶
-item.itemTungstenSteelRotorBlade.name=钨钢扇å¶
-item.itemVibrantRotorBlade.name=脉冲åˆé‡‘扇å¶
-item.itemIridiumRotorBlade.name=铱扇å¶
-item.itemEnergeticShaft.name=充能åˆé‡‘è½´
-item.itemTungstenSteelShaft.name=钨钢轴
-item.itemVibrantShaft.name=脉冲åˆé‡‘è½´
-item.itemIridiumShaft.name=铱轴
-item.itemMagnaliumRotorBlade.name=é•é“åˆé‡‘扇å¶
-item.itemUltimetRotorBlade.name=哈æ°åˆé‡‘扇å¶
-item.itemMagnaliumShaft.name=é•é“åˆé‡‘è½´
-item.itemUltimetShaft.name=哈æ°åˆé‡‘è½´
-
-
-//Misc Items
-item.itemPLACEHOLDER_Circuit.name=夸克æ“纵者 (UV)
-item.itemPlateEnrichedSoularium.name=富集阳光åˆé‡‘æ¿
-item.itemHeliumBlob.name=神秘氢气物质
-item.itemAlkalusDisk.name=Alkalus圆盘
-item.itemHotIngotRaisinBread.name=一份çƒè‘¡è„å¹²é¢åŒ…
-item.itemIngotRaisinBread.name=一份葡è„å¹²é¢åŒ…
-
-//Misc Blocks
-tile.blockCompressedObsidian.0.name=压缩黑曜石(9)
-tile.blockCompressedObsidian.1.name=二é‡åŽ‹ç¼©é»‘曜石(81)
-tile.blockCompressedObsidian.2.name=三é‡åŽ‹ç¼©é»‘曜石(729)
-tile.blockCompressedObsidian.3.name=å››é‡åŽ‹ç¼©é»‘曜石(6561)
-tile.blockCompressedObsidian.4.name=五é‡åŽ‹ç¼©é»‘曜石(59049)
-tile.blockCompressedObsidian.5.name=å转黑曜石
-tile.blockNet.name=网
-
-
-//GT++ Items
-
-//Meta Tool
-MU-metaitem.01.0.name=MU-metaitem.01.0.name
-
-//Cells
-item.SulfurDioxide.name=优质二氧化硫å•å…ƒ
-item.mobessence.name=怪物精åŽæ¶²å•å…ƒ
-item.Fertiliser.name=æµä½“肥料å•å…ƒ
-item.UN32Fertiliser.name=UN-32肥料å•å…ƒ
-item.UN18Fertiliser.name=UN-18肥料å•å…ƒ
-item.RaisinJuice.name=è‘¡è„æ±å•å…ƒ
-item.BerylliumHydroxide.name=氢氧化é“å•å…ƒ
-item.AmmoniumBifluoride.name=氟化氢铵å•å…ƒ
-item.Hydroxide.name=氢氧化物å•å…ƒ
-item.Ammonium.name=铵å•å…ƒ
-item.AmmoniumTetrafluoroberyllate.name=四氟硼酸铵å•å…ƒ
-
-//Resources
-item.itemStickyRubber.name=粘性橡胶团
-item.itemCoalCoke.name=焦煤
-item.itemHydrogenBlob.name=神秘氢气团
-item.itemHeliumBlob.name=神秘氢气物质
-
-//Normal Items
-item.itemAlkalusDisk.name=Alkalus圆盘
-item.itemSimpleFiremaker.name=基础起ç«å™¨
-item.itemFiber.name=æ¤ç‰©çº¤ç»´
-item.itemRope.name=绳索
-item.backpackRed.name=红色背包
-item.backpackGreen.name=绿色背包
-item.backpackBlue.name=è“色背包
-item.backpackYellow.name=黄色背包
-item.backpackPurple.name=紫色背包
-item.backpackCyan.name=é’色背包
-item.backpackMaroon.name=棕色背包
-item.backpackOlive.name=橄榄绿色背包
-item.backpackDarkGreen.name=深绿色背包
-item.backpackDarkPurple.name=深紫色背包
-item.backpackTeal.name=è“绿色背包
-item.backpackNavy.name=æ·±è“色背包
-item.backpackSilver.name=银色背包
-item.backpackGray.name=ç°è‰²èƒŒåŒ…
-item.backpackBlack.name=黑色背包
-item.backpackWhite.name=白色背包
-item.itemBlueprint.name=è“图[æ— ç”¨]
-item.itemGemShards.name=钻石碎片
-item.itemHalfCompleteCasings.name=åŠæˆå“机械方å—
-item.itemSulfuricPotion.name=喷溅型 硫酸
-item.itemHydrofluoricPotion.name=喷溅型 氢氟酸
-item.itemIngotRaisinBread.name=一份葡è„å¹²é¢åŒ…
-item.itemHotIngotRaisinBread.name=一份çƒè‘¡è„å¹²é¢åŒ…
-item.itemFoodRaisinToast.name=一份葡è„干烤é¢åŒ…
-item.itemHotFoodRaisinToast.name=一份çƒè‘¡è„干烤é¢åŒ…
-item.itemFoodCurriedSausages.name=一份咖喱香è‚
-item.itemHotFoodCurriedSausages.name=一份çƒå’–喱香è‚
-
-
-//Conversion Dusts
-item.dustNeptunium238.name=镎 238粉
-item.dustRadium226.name=é• 226粉
-item.itemDustDecayedRadium226.name=è¡°å˜é• 226粉
-item.itemDustSmallDecayedRadium226.name=å°å †è¡°å˜é• 226粉
-item.itemDustTinyDecayedRadium226.name=å°æ’®è¡°å˜é• 226粉
-
-//Material Items
-item.itemDustGadolinium.name=钆粉
-item.itemDustSmallGadolinium.name=å°å †é’†ç²‰
-item.itemDustTinyGadolinium.name=å°æ’®é’†ç²‰
-item.itemDustYtterbium.name=镱粉
-item.itemDustSmallYtterbium.name=å°å †é•±ç²‰
-item.itemDustTinyYtterbium.name=å°æ’®é•±ç²‰
-item.itemDustSamarium.name=é’粉
-item.itemDustSmallSamarium.name=å°å †é’粉
-item.itemDustTinySamarium.name=å°æ’®é’粉
-item.itemDustLanthanum.name=镧粉
-item.itemDustSmallLanthanum.name=å°å †é•§ç²‰
-item.itemDustTinyLanthanum.name=å°æ’®é•§ç²‰
-item.itemCellNeon.name=æ°–å•å…ƒ
-item.itemCellGermanium.name=é”—å•å…ƒ
-item.itemCellSelenium.name=ç¡’å•å…ƒ
-item.itemCellBromine.name=溴å•å…ƒ
-item.itemCellKrypton.name=æ°ªå•å…ƒ
-item.itemCellZirconium.name=锆å•å…ƒ
-item.itemCellTechnetium.name=é”å•å…ƒ
-item.itemCellRuthenium.name=é’Œå•å…ƒ
-item.itemCellRhodium.name=é“‘å•å…ƒ
-item.itemCellIodine.name=碘å•å…ƒ
-item.itemCellXenon.name=æ°™å•å…ƒ
-item.itemCellHafnium.name=铪å•å…ƒ
-item.itemCellRhenium.name=铼å•å…ƒ
-item.itemCellThallium.name=é“Šå•å…ƒ
-item.itemCellPolonium.name=é’‹å•å…ƒ
-item.itemCellAstatine.name=ç ¹å•å…ƒ
-item.itemCellFrancium.name=é’«å•å…ƒ
-item.itemCellRadium.name=é•å•å…ƒ
-item.itemCellActinium.name=锕å•å…ƒ
-item.itemCellProtactinium.name=镤å•å…ƒ
-item.itemCellNeptunium.name=é•Žå•å…ƒ
-item.itemCellCurium.name=é””å•å…ƒ
-item.itemCellBerkelium.name=锫å•å…ƒ
-item.itemCellCalifornium.name=锎å•å…ƒ
-item.itemCellEinsteinium.name=锿å•å…ƒ
-item.itemCellFermium.name=é•„å•å…ƒ
-item.itemCellRefinedTrinium.name=精制三元金属å•å…ƒ
-item.itemIngotSelenium.name=ç¡’é”
-item.itemDustSelenium.name=硒粉
-item.itemDustTinySelenium.name=å°æ’®ç¡’粉
-item.itemDustSmallSelenium.name=å°å †ç¡’粉
-item.itemNuggetSelenium.name=ç¡’ç²’
-item.itemPlateSelenium.name=ç¡’æ¿
-item.itemPlateDoubleSelenium.name=åŒé‡ç¡’æ¿
-item.itemBoltSelenium.name=ç¡’èžºæ “
-item.itemRodSelenium.name=ç¡’æ†
-item.itemRodLongSelenium.name=é•¿ç¡’æ†
-item.itemRingSelenium.name=硒环
-item.itemScrewSelenium.name=硒螺ä¸
-item.itemRotorSelenium.name=硒转å
-item.itemGearSelenium.name=硒齿轮
-item.itemCellUranium232.name=é“€-232å•å…ƒ
-item.itemCellUranium233.name=é“€-233å•å…ƒ
-item.itemCellThoriumTetrafluoride.name=四氟化é’å•å…ƒ
-item.itemCellThoriumHexafluoride.name=å…氟化é’å•å…ƒ
-item.itemCellUraniumTetrafluoride.name=四氟化铀å•å…ƒ
-item.itemCellUraniumHexafluoride.name=å…氟化铀å•å…ƒ
-item.itemCellZirconiumTetrafluoride.name=四氟化锆å•å…ƒ
-item.itemCellBerylliumFluoride.name=氟化é“å•å…ƒ
-item.itemCellLithiumFluoride.name=氟化锂å•å…ƒ
-item.itemCellHydroxide.name=氢氧化物å•å…ƒ
-item.itemCellAmmonium.name=铵å•å…ƒ
-item.itemCellAmmoniumBifluoride.name=氟化氢铵å•å…ƒ
-item.itemCellBerylliumHydroxide.name=氢氧化é“å•å…ƒ
-item.itemCellAmmoniumTetrafluoroberyllate.name=æ°Ÿé“酸铵å•å…ƒ
-item.itemCellNeptuniumHexafluoride.name=å…氟化铀å•å…ƒ
-item.itemCellTechnetiumHexafluoride.name=å…氟化é”å•å…ƒ
-item.itemCellSeleniumHexafluoride.name=å…氟化硒å•å…ƒ
-item.itemCellEnergyCrystal.name=能é‡æ°´æ™¶å•å…ƒ
-item.itemCellBloodSteel.name=血钢å•å…ƒ
-item.itemCellStaballoy.name=è´«é“€åˆé‡‘å•å…ƒ
-item.itemCellTantalloy60.name=钽钨åˆé‡‘-60å•å…ƒ
-item.itemCellTantalloy61.name=钽钨åˆé‡‘-61å•å…ƒ
-item.itemCellTumbaga.name=铜金åˆé‡‘å•å…ƒ
-item.itemCellPotin.name=ç²—é’é“œåˆé‡‘å•å…ƒ
-item.itemCellInconel625.name=é•é“¬åŸºåˆé‡‘-625å•å…ƒ
-item.itemCellInconel690.name=é•é“¬åŸºåˆé‡‘-690å•å…ƒ
-item.itemCellInconel792.name=é•é“¬åŸºåˆé‡‘-792å•å…ƒ
-item.itemCellZeron100.name=å¡žé¾™-100å•å…ƒ
-item.itemCellMaragingSteel250.name=马æ°ä½“时效钢250å•å…ƒ
-item.itemCellMaragingSteel300.name=马æ°ä½“时效钢300å•å…ƒ
-item.itemCellMaragingSteel350.name=马æ°ä½“时效钢350å•å…ƒ
-item.itemCellStellite.name=铬钴锰钛åˆé‡‘å•å…ƒ
-item.itemCellTalonite.name=铬钴磷酸ç›åˆé‡‘å•å…ƒ
-item.itemCellHastelloyW.name=哈斯特洛ä¾åˆé‡‘-Wå•å…ƒ
-item.itemCellHastelloyX.name=哈斯特洛ä¾åˆé‡‘-Xå•å…ƒ
-item.itemCellHastelloyN.name=哈斯特洛ä¾åˆé‡‘-Nå•å…ƒ
-item.itemCellHastelloyC276.name=哈斯特洛ä¾åˆé‡‘-C276å•å…ƒ
-item.itemCellIncoloy020.name=è€çƒè€çƒé“¬é“åˆé‡‘-020å•å…ƒ
-item.itemCellIncoloyDS.name=è€çƒé“¬é“åˆé‡‘-DSå•å…ƒ
-item.itemCellIncoloyMA956.name=è€çƒè€çƒé“¬é“åˆé‡‘-MA956å•å…ƒ
-item.itemCellTungstenCarbide.name=碳化钨å•å…ƒ
-item.itemCellSiliconCarbide.name=碳化硅å•å…ƒ
-item.itemCellTantalumCarbide.name=碳化钽å•å…ƒ
-item.itemCellZirconiumCarbide.name=碳化锆å•å…ƒ
-item.itemCellNiobiumCarbide.name=碳化铌å•å…ƒ
-item.itemCellGrisium.name=ç°é’›åˆé‡‘å•å…ƒ
-item.itemCellEglinSteelBaseCompound.name=åŸƒæ ¼æž—é’¢å•å…ƒ
-item.itemCellEglinSteel.name=åŸƒæ ¼æž—é’¢å•å…ƒ
-item.itemCellHG1223.name=HG-1223å•å…ƒ
-item.itemCellTriniumTitaniumAlloy.name=三元钛åˆé‡‘å•å…ƒ
-item.itemCellTriniumNaquadahAlloy.name=三元硅岩åˆé‡‘å•å…ƒ
-item.itemCellTriniumNaquadahCarbonite.name=碳化三元硅岩åˆé‡‘å•å…ƒ
-item.itemCellQuantum.name=é‡ååˆé‡‘å•å…ƒ
-item.itemIngotBromine.name=溴é”
-item.itemDustBromine.name=溴粉
-item.itemDustTinyBromine.name=å°æ’®æº´ç²‰
-item.itemDustSmallBromine.name=å°å †æº´ç²‰
-item.itemNuggetBromine.name=溴粒
-item.itemPlateBromine.name=溴æ¿
-item.itemPlateDoubleBromine.name=åŒé‡æº´æ¿
-item.itemIngotStrontium.name=锶é”
-item.itemDustStrontium.name=锶粉
-item.itemDustTinyStrontium.name=å°æ’®é”¶ç²‰
-item.itemDustSmallStrontium.name=å°å †é”¶ç²‰
-item.itemNuggetStrontium.name=锶粒
-item.itemPlateStrontium.name=锶æ¿
-item.itemPlateDoubleStrontium.name=åŒé‡é”¶æ¿
-item.itemBoltStrontium.name=é”¶èžºæ “
-item.itemRodStrontium.name=锶æ†
-item.itemRodLongStrontium.name=长锶æ†
-item.itemRingStrontium.name=锶环
-item.itemScrewStrontium.name=锶螺ä¸
-item.itemRotorStrontium.name=锶转å
-item.itemGearStrontium.name=锶齿轮
-item.itemIngotZirconium.name=锆é”
-item.itemDustZirconium.name=锆粉
-item.itemDustTinyZirconium.name=å°æ’®é”†ç²‰
-item.itemDustSmallZirconium.name=å°å †é”†ç²‰
-item.itemNuggetZirconium.name=锆粒
-item.itemPlateZirconium.name=锆æ¿
-item.itemPlateDoubleZirconium.name=åŒé‡é”†æ¿
-item.itemBoltZirconium.name=é”†èžºæ “
-item.itemRodZirconium.name=锆æ†
-item.itemRodLongZirconium.name=长锆æ†
-item.itemRingZirconium.name=锆环
-item.itemScrewZirconium.name=锆螺ä¸
-item.itemRotorZirconium.name=锆转å
-item.itemGearZirconium.name=锆齿轮
-item.itemIngotRuthenium.name=é’Œé”
-item.itemDustRuthenium.name=钌粉
-item.itemDustTinyRuthenium.name=å°æ’®é’Œç²‰
-item.itemDustSmallRuthenium.name=å°å †é’Œç²‰
-item.itemNuggetRuthenium.name=钌粒
-item.itemPlateRuthenium.name=é’Œæ¿
-item.itemPlateDoubleRuthenium.name=åŒé‡é’Œæ¿
-item.itemBoltRuthenium.name=é’Œèžºæ “
-item.itemRodRuthenium.name=é’Œæ†
-item.itemRodLongRuthenium.name=é•¿é’Œæ†
-item.itemRingRuthenium.name=钌环
-item.itemScrewRuthenium.name=钌螺ä¸
-item.itemRotorRuthenium.name=钌转å
-item.itemGearRuthenium.name=钌齿轮
-item.itemIngotIodine.name=碘é”
-item.itemDustIodine.name=碘粉
-item.itemDustTinyIodine.name=å°æ’®ç¢˜ç²‰
-item.itemDustSmallIodine.name=å°å †ç¢˜ç²‰
-item.itemNuggetIodine.name=碘粒
-item.itemPlateIodine.name=碘æ¿
-item.itemPlateDoubleIodine.name=åŒé‡ç¢˜æ¿
-item.itemBoltIodine.name=ç¢˜èžºæ “
-item.itemRodIodine.name=碘æ†
-item.itemRodLongIodine.name=长碘æ†
-item.itemRingIodine.name=碘环
-item.itemScrewIodine.name=碘螺ä¸
-item.itemRotorIodine.name=碘转å
-item.itemGearIodine.name=碘齿轮
-item.itemIngotHafnium.name=铪é”
-item.itemDustHafnium.name=铪粉
-item.itemDustTinyHafnium.name=å°æ’®é“ªç²‰
-item.itemDustSmallHafnium.name=å°å †é“ªç²‰
-item.itemNuggetHafnium.name=铪粒
-item.itemPlateHafnium.name=铪æ¿
-item.itemPlateDoubleHafnium.name=åŒé‡é“ªæ¿
-item.itemBoltHafnium.name=é“ªèžºæ “
-item.itemRodHafnium.name=铪æ†
-item.itemRodLongHafnium.name=长铪æ†
-item.itemRingHafnium.name=铪环
-item.itemScrewHafnium.name=铪螺ä¸
-item.itemRotorHafnium.name=铪转å
-item.itemGearHafnium.name=铪齿轮
-item.itemIngotDysprosium.name=é•é”
-item.itemDustDysprosium.name=é•ç²‰
-item.itemDustTinyDysprosium.name=å°æ’®é•ç²‰
-item.itemDustSmallDysprosium.name=å°å †é•ç²‰
-item.itemNuggetDysprosium.name=é•ç²’
-item.itemPlateDysprosium.name=é•æ¿
-item.itemPlateDoubleDysprosium.name=åŒé‡é•æ¿
-item.itemBoltDysprosium.name=é•èžºæ “
-item.itemRodDysprosium.name=é•æ†
-item.itemRodLongDysprosium.name=é•¿é•æ†
-item.itemRingDysprosium.name=é•çŽ¯
-item.itemScrewDysprosium.name=é•èžºä¸
-item.itemRotorDysprosium.name=é•è½¬å
-item.itemGearDysprosium.name=é•é½¿è½®
-item.itemIngotTellurium.name=碲é”
-item.itemDustTellurium.name=碲粉
-item.itemDustTinyTellurium.name=å°æ’®ç¢²ç²‰
-item.itemDustSmallTellurium.name=å°å †ç¢²ç²‰
-item.itemNuggetTellurium.name=碲粒
-item.itemPlateTellurium.name=碲æ¿
-item.itemPlateDoubleTellurium.name=åŒé‡ç¢²æ¿
-item.itemBoltTellurium.name=ç¢²èžºæ “
-item.itemRodTellurium.name=碲æ†
-item.itemRodLongTellurium.name=长碲æ†
-item.itemRingTellurium.name=碲环
-item.itemScrewTellurium.name=碲螺ä¸
-item.itemRotorTellurium.name=碲转å
-item.itemGearTellurium.name=碲齿轮
-item.itemIngotRhodium.name=é“‘é”
-item.itemDustRhodium.name=铑粉
-item.itemDustTinyRhodium.name=å°æ’®é“‘粉
-item.itemDustSmallRhodium.name=å°å †é“‘粉
-item.itemNuggetRhodium.name=é“‘ç²’
-item.itemPlateRhodium.name=é“‘æ¿
-item.itemPlateDoubleRhodium.name=åŒé‡é“‘æ¿
-item.itemBoltRhodium.name=é“‘èžºæ “
-item.itemRodRhodium.name=é“‘æ†
-item.itemRodLongRhodium.name=é•¿é“‘æ†
-item.itemRingRhodium.name=铑环
-item.itemScrewRhodium.name=铑螺ä¸
-item.itemRotorRhodium.name=铑转å
-item.itemGearRhodium.name=铑齿轮
-item.itemIngotRhenium.name=铼é”
-item.itemDustRhenium.name=铼粉
-item.itemDustTinyRhenium.name=å°æ’®é“¼ç²‰
-item.itemDustSmallRhenium.name=å°å †é“¼ç²‰
-item.itemNuggetRhenium.name=铼粒
-item.itemPlateRhenium.name=铼æ¿
-item.itemPlateDoubleRhenium.name=åŒé‡é“¼æ¿
-item.itemBoltRhenium.name=é“¼èžºæ “
-item.itemRodRhenium.name=铼æ†
-item.itemRodLongRhenium.name=长铼æ†
-item.itemRingRhenium.name=铼环
-item.itemScrewRhenium.name=铼螺ä¸
-item.itemRotorRhenium.name=铼转å
-item.itemGearRhenium.name=铼齿轮
-item.itemIngotThallium.name=é“Šé”
-item.itemDustThallium.name=铊粉
-item.itemDustTinyThallium.name=å°æ’®é“Šç²‰
-item.itemDustSmallThallium.name=å°å †é“Šç²‰
-item.itemNuggetThallium.name=é“Šç²’
-item.itemPlateThallium.name=é“Šæ¿
-item.itemPlateDoubleThallium.name=åŒé‡é“Šæ¿
-item.itemBoltThallium.name=é“Šèžºæ “
-item.itemRodThallium.name=é“Šæ†
-item.itemRodLongThallium.name=é•¿é“Šæ†
-item.itemRingThallium.name=铊环
-item.itemScrewThallium.name=铊螺ä¸
-item.itemRotorThallium.name=铊转å
-item.itemGearThallium.name=铊齿轮
-item.itemIngotTechnetium.name=é”é”
-item.itemDustTechnetium.name=é”粉
-item.itemDustTinyTechnetium.name=å°æ’®é”粉
-item.itemDustSmallTechnetium.name=å°å †é”粉
-item.itemNuggetTechnetium.name=é”ç²’
-item.itemPlateTechnetium.name=é”æ¿
-item.itemPlateDoubleTechnetium.name=åŒé‡é”æ¿
-item.itemIngotPolonium.name=é’‹é”
-item.itemDustPolonium.name=钋粉
-item.itemDustTinyPolonium.name=å°æ’®é’‹ç²‰
-item.itemDustSmallPolonium.name=å°å †é’‹ç²‰
-item.itemNuggetPolonium.name=é’‹ç²’
-item.itemPlatePolonium.name=é’‹æ¿
-item.itemPlateDoublePolonium.name=åŒé‡é’‹æ¿
-item.itemIngotAstatine.name=ç ¹é”
-item.itemDustAstatine.name=ç ¹ç²‰
-item.itemDustTinyAstatine.name=å°æ’®ç ¹ç²‰
-item.itemDustSmallAstatine.name=å°å †ç ¹ç²‰
-item.itemNuggetAstatine.name=ç ¹ç²’
-item.itemPlateAstatine.name=ç ¹æ¿
-item.itemPlateDoubleAstatine.name=åŒé‡ç ¹æ¿
-item.itemIngotFrancium.name=é’«é”
-item.itemDustFrancium.name=钫粉
-item.itemDustTinyFrancium.name=å°æ’®é’«ç²‰
-item.itemDustSmallFrancium.name=å°å †é’«ç²‰
-item.itemNuggetFrancium.name=é’«ç²’
-item.itemPlateFrancium.name=é’«æ¿
-item.itemPlateDoubleFrancium.name=åŒé‡é’«æ¿
-item.itemIngotRadium.name=é•é”
-item.itemDustRadium.name=é•ç²‰
-item.itemDustTinyRadium.name=å°æ’®é•ç²‰
-item.itemDustSmallRadium.name=å°å †é•ç²‰
-item.itemNuggetRadium.name=é•ç²’
-item.itemPlateRadium.name=é•æ¿
-item.itemPlateDoubleRadium.name=åŒé‡é•æ¿
-item.itemIngotActinium.name=锕é”
-item.itemDustActinium.name=锕粉
-item.itemDustTinyActinium.name=å°æ’®é”•ç²‰
-item.itemDustSmallActinium.name=å°å †é”•ç²‰
-item.itemNuggetActinium.name=锕粒
-item.itemPlateActinium.name=锕æ¿
-item.itemPlateDoubleActinium.name=åŒé‡é”•æ¿
-item.itemIngotProtactinium.name=镤é”
-item.itemDustProtactinium.name=镤粉
-item.itemDustTinyProtactinium.name=å°æ’®é•¤ç²‰
-item.itemDustSmallProtactinium.name=å°å †é•¤ç²‰
-item.itemNuggetProtactinium.name=镤粒
-item.itemPlateProtactinium.name=镤æ¿
-item.itemPlateDoubleProtactinium.name=åŒé‡é•¤æ¿
-item.itemIngotNeptunium.name=é•Žé”
-item.itemDustNeptunium.name=镎粉
-item.itemDustTinyNeptunium.name=å°æ’®é•Žç²‰
-item.itemDustSmallNeptunium.name=å°å †é•Žç²‰
-item.itemNuggetNeptunium.name=é•Žç²’
-item.itemPlateNeptunium.name=é•Žæ¿
-item.itemPlateDoubleNeptunium.name=åŒé‡é•Žæ¿
-item.itemIngotCurium.name=é””é”
-item.itemDustCurium.name=锔粉
-item.itemDustTinyCurium.name=å°æ’®é””粉
-item.itemDustSmallCurium.name=å°å †é””粉
-item.itemNuggetCurium.name=锔粒
-item.itemPlateCurium.name=é””æ¿
-item.itemPlateDoubleCurium.name=åŒé‡é””æ¿
-item.itemIngotBerkelium.name=锫é”
-item.itemDustBerkelium.name=锫粉
-item.itemDustTinyBerkelium.name=å°æ’®é”«ç²‰
-item.itemDustSmallBerkelium.name=å°å †é”«ç²‰
-item.itemNuggetBerkelium.name=锫粒
-item.itemPlateBerkelium.name=锫æ¿
-item.itemPlateDoubleBerkelium.name=åŒé‡é”«æ¿
-item.itemIngotCalifornium.name=锎é”
-item.itemDustCalifornium.name=锎粉
-item.itemDustTinyCalifornium.name=å°æ’®é”Žç²‰
-item.itemDustSmallCalifornium.name=å°å †é”Žç²‰
-item.itemNuggetCalifornium.name=锎粒
-item.itemPlateCalifornium.name=锎æ¿
-item.itemPlateDoubleCalifornium.name=åŒé‡é”Žæ¿
-item.itemIngotEinsteinium.name=锿é”
-item.itemDustEinsteinium.name=锿粉
-item.itemDustTinyEinsteinium.name=å°æ’®é”¿ç²‰
-item.itemDustSmallEinsteinium.name=å°å †é”¿ç²‰
-item.itemNuggetEinsteinium.name=锿粒
-item.itemPlateEinsteinium.name=锿æ¿
-item.itemPlateDoubleEinsteinium.name=åŒé‡é”¿æ¿
-item.itemIngotFermium.name=é•„é”
-item.itemDustFermium.name=镄粉
-item.itemDustTinyFermium.name=å°æ’®é•„粉
-item.itemDustSmallFermium.name=å°å †é•„粉
-item.itemNuggetFermium.name=é•„ç²’
-item.itemPlateFermium.name=é•„æ¿
-item.itemPlateDoubleFermium.name=åŒé‡é•„æ¿
-item.itemIngotLithium7.name=锂 7é”
-item.itemDustLithium7.name=锂 7粉
-item.itemDustTinyLithium7.name=å°æ’®é”‚ 7粉
-item.itemDustSmallLithium7.name=å°å †é”‚ 7粉
-item.itemNuggetLithium7.name=锂 7粒
-item.itemPlateLithium7.name=锂 7æ¿
-item.itemPlateDoubleLithium7.name=åŒé‡é”‚ 7æ¿
-item.itemIngotThorium232.name=é’-232é”
-item.itemDustThorium232.name=é’-232粉
-item.itemDustTinyThorium232.name=å°æ’®é’-232粉
-item.itemDustSmallThorium232.name=å°å †é’-232粉
-item.itemNuggetThorium232.name=é’-232ç²’
-item.itemPlateThorium232.name=é’-232æ¿
-item.itemPlateDoubleThorium232.name=åŒé‡é’-232æ¿
-item.itemIngotUranium232.name=é“€-232é”
-item.itemDustUranium232.name=铀-232粉
-item.itemDustTinyUranium232.name=å°æ’®é“€-232粉
-item.itemDustSmallUranium232.name=å°å †é“€-232粉
-item.itemNuggetUranium232.name=é“€-232ç²’
-item.itemPlateUranium232.name=é“€-232æ¿
-item.itemRodUranium232.name=é“€-232æ†
-item.itemRodLongUranium232.name=é•¿é“€-232æ†
-item.itemIngotUranium233.name=é“€-233é”
-item.itemDustUranium233.name=铀-233粉
-item.itemDustTinyUranium233.name=å°æ’®é“€-233粉
-item.itemDustSmallUranium233.name=å°å †é“€-233粉
-item.itemNuggetUranium233.name=é“€-233ç²’
-item.itemPlateUranium233.name=é“€-233æ¿
-item.itemRodUranium233.name=é“€-233æ†
-item.itemRodLongUranium233.name=é•¿é“€-233æ†
-item.itemIngotPlutonium238.name=é’š-238é”
-item.itemDustPlutonium238.name=钚-238粉
-item.itemDustTinyPlutonium238.name=å°æ’®é’š-238粉
-item.itemDustSmallPlutonium238.name=å°å †é’š-238粉
-item.itemNuggetPlutonium238.name=é’š-238ç²’
-item.itemPlatePlutonium238.name=é’š-238æ¿
-item.itemPlateDoublePlutonium238.name=åŒé‡é’š-238æ¿
-item.itemIngotStrontium90.name=锶-90é”
-item.itemDustStrontium90.name=锶-90粉
-item.itemDustTinyStrontium90.name=å°æ’®é”¶-90粉
-item.itemDustSmallStrontium90.name=å°å †é”¶-90粉
-item.itemNuggetStrontium90.name=锶-90粒
-item.itemPlateStrontium90.name=锶-90æ¿
-item.itemPlateDoubleStrontium90.name=åŒé‡é”¶-90æ¿
-item.itemIngotPolonium210.name=é’‹-210é”
-item.itemDustPolonium210.name=钋-210粉
-item.itemDustTinyPolonium210.name=å°æ’®é’‹-210粉
-item.itemDustSmallPolonium210.name=å°å †é’‹-210粉
-item.itemNuggetPolonium210.name=é’‹-210ç²’
-item.itemPlatePolonium210.name=é’‹-210æ¿
-item.itemPlateDoublePolonium210.name=åŒé‡é’‹-210æ¿
-item.itemIngotAmericium241.name=é•…-241é”
-item.itemDustAmericium241.name=镅-241粉
-item.itemDustTinyAmericium241.name=å°æ’®é•…-241粉
-item.itemDustSmallAmericium241.name=å°å †é•…-241粉
-item.itemNuggetAmericium241.name=é•…-241ç²’
-item.itemPlateAmericium241.name=é•…-241æ¿
-item.itemPlateDoubleAmericium241.name=åŒé‡é•…-241æ¿
-item.itemIngotSiliconCarbide.name=碳化硅é”
-item.itemDustSiliconCarbide.name=碳化硅粉
-item.itemDustTinySiliconCarbide.name=å°æ’®ç¢³åŒ–硅粉
-item.itemDustSmallSiliconCarbide.name=å°å †ç¢³åŒ–硅粉
-item.itemNuggetSiliconCarbide.name=碳化硅粒
-item.itemPlateSiliconCarbide.name=碳化硅æ¿
-item.itemPlateDoubleSiliconCarbide.name=åŒé‡ç¢³åŒ–ç¡…æ¿
-item.itemBoltSiliconCarbide.name=ç¢³åŒ–ç¡…èžºæ “
-item.itemRodSiliconCarbide.name=碳化硅æ†
-item.itemRodLongSiliconCarbide.name=长碳化硅æ†
-item.itemRingSiliconCarbide.name=碳化硅环
-item.itemScrewSiliconCarbide.name=碳化硅螺ä¸
-item.itemRotorSiliconCarbide.name=碳化硅转å
-item.itemGearSiliconCarbide.name=碳化硅齿轮
-item.itemIngotZirconiumCarbide.name=碳化锆é”
-item.itemHotIngotZirconiumCarbide.name=çƒç¢³åŒ–锆é”
-item.itemDustZirconiumCarbide.name=碳化锆粉
-item.itemDustTinyZirconiumCarbide.name=å°æ’®ç¢³åŒ–锆粉
-item.itemDustSmallZirconiumCarbide.name=å°å †ç¢³åŒ–锆粉
-item.itemNuggetZirconiumCarbide.name=碳化锆粒
-item.itemPlateZirconiumCarbide.name=碳化锆æ¿
-item.itemPlateDoubleZirconiumCarbide.name=åŒé‡ç¢³åŒ–锆æ¿
-item.itemBoltZirconiumCarbide.name=ç¢³åŒ–é”†èžºæ “
-item.itemRodZirconiumCarbide.name=碳化锆æ†
-item.itemRodLongZirconiumCarbide.name=长碳化锆æ†
-item.itemRingZirconiumCarbide.name=碳化锆环
-item.itemScrewZirconiumCarbide.name=碳化锆螺ä¸
-item.itemRotorZirconiumCarbide.name=碳化锆转å
-item.itemGearZirconiumCarbide.name=碳化锆齿轮
-item.itemIngotTantalumCarbide.name=碳化钽é”
-item.itemHotIngotTantalumCarbide.name=çƒç¢³åŒ–é’½é”
-item.itemDustTantalumCarbide.name=碳化钽粉
-item.itemDustTinyTantalumCarbide.name=å°æ’®ç¢³åŒ–钽粉
-item.itemDustSmallTantalumCarbide.name=å°å †ç¢³åŒ–钽粉
-item.itemNuggetTantalumCarbide.name=碳化钽粒
-item.itemPlateTantalumCarbide.name=碳化钽æ¿
-item.itemPlateDoubleTantalumCarbide.name=åŒé‡ç¢³åŒ–é’½æ¿
-item.itemBoltTantalumCarbide.name=ç¢³åŒ–é’½èžºæ “
-item.itemRodTantalumCarbide.name=碳化钽æ†
-item.itemRodLongTantalumCarbide.name=长碳化钽æ†
-item.itemRingTantalumCarbide.name=碳化钽环
-item.itemScrewTantalumCarbide.name=碳化钽螺ä¸
-item.itemRotorTantalumCarbide.name=碳化钽转å
-item.itemGearTantalumCarbide.name=碳化钽齿轮
-item.itemIngotNiobiumCarbide.name=碳化铌é”
-item.itemHotIngotNiobiumCarbide.name=çƒç¢³åŒ–é“Œé”
-item.itemDustNiobiumCarbide.name=碳化铌粉
-item.itemDustTinyNiobiumCarbide.name=å°æ’®ç¢³åŒ–铌粉
-item.itemDustSmallNiobiumCarbide.name=å°å †ç¢³åŒ–铌粉
-item.itemNuggetNiobiumCarbide.name=碳化铌粒
-item.itemPlateNiobiumCarbide.name=碳化铌æ¿
-item.itemPlateDoubleNiobiumCarbide.name=åŒé‡ç¢³åŒ–é“Œæ¿
-item.itemBoltNiobiumCarbide.name=ç¢³åŒ–é“Œèžºæ “
-item.itemRodNiobiumCarbide.name=碳化铌æ†
-item.itemRodLongNiobiumCarbide.name=长碳化铌æ†
-item.itemRingNiobiumCarbide.name=碳化铌环
-item.itemScrewNiobiumCarbide.name=碳化铌螺ä¸
-item.itemRotorNiobiumCarbide.name=碳化铌转å
-item.itemGearNiobiumCarbide.name=碳化铌齿轮
-item.itemIngotBerylliumFluoride.name=氟化é“é”
-item.itemDustBerylliumFluoride.name=氟化é“粉
-item.itemDustTinyBerylliumFluoride.name=å°æ’®æ°ŸåŒ–é“粉
-item.itemDustSmallBerylliumFluoride.name=å°å †æ°ŸåŒ–é“粉
-item.itemNuggetBerylliumFluoride.name=氟化é“ç²’
-item.itemPlateBerylliumFluoride.name=氟化é“æ¿
-item.itemPlateDoubleBerylliumFluoride.name=åŒé‡æ°ŸåŒ–é“æ¿
-item.itemIngotLithiumFluoride.name=氟化锂é”
-item.itemDustLithiumFluoride.name=氟化锂粉
-item.itemDustTinyLithiumFluoride.name=å°æ’®æ°ŸåŒ–锂粉
-item.itemDustSmallLithiumFluoride.name=å°å †æ°ŸåŒ–锂粉
-item.itemNuggetLithiumFluoride.name=氟化锂粒
-item.itemPlateLithiumFluoride.name=氟化锂æ¿
-item.itemPlateDoubleLithiumFluoride.name=åŒé‡æ°ŸåŒ–锂æ¿
-item.itemIngotThoriumTetrafluoride.name=四氟化é’é”
-item.itemDustThoriumTetrafluoride.name=四氟化é’粉
-item.itemDustTinyThoriumTetrafluoride.name=å°æ’®å››æ°ŸåŒ–é’粉
-item.itemDustSmallThoriumTetrafluoride.name=å°å †å››æ°ŸåŒ–é’粉
-item.itemNuggetThoriumTetrafluoride.name=四氟化é’ç²’
-item.itemPlateThoriumTetrafluoride.name=四氟化é’æ¿
-item.itemPlateDoubleThoriumTetrafluoride.name=åŒé‡å››æ°ŸåŒ–é’æ¿
-item.itemIngotThoriumHexafluoride.name=å…氟化é’é”
-item.itemDustThoriumHexafluoride.name=å…氟化é’粉
-item.itemDustTinyThoriumHexafluoride.name=å°æ’®å…氟化é’粉
-item.itemDustSmallThoriumHexafluoride.name=å°å †å…氟化é’粉
-item.itemNuggetThoriumHexafluoride.name=å…氟化é’ç²’
-item.itemPlateThoriumHexafluoride.name=å…氟化é’æ¿
-item.itemPlateDoubleThoriumHexafluoride.name=åŒé‡å…氟化é’æ¿
-item.itemIngotUraniumTetrafluoride.name=四氟化铀é”
-item.itemDustUraniumTetrafluoride.name=四氟化铀粉
-item.itemDustTinyUraniumTetrafluoride.name=å°æ’®å››æ°ŸåŒ–铀粉
-item.itemDustSmallUraniumTetrafluoride.name=å°å †å››æ°ŸåŒ–铀粉
-item.itemNuggetUraniumTetrafluoride.name=四氟化铀粒
-item.itemPlateUraniumTetrafluoride.name=四氟化铀æ¿
-item.itemPlateDoubleUraniumTetrafluoride.name=åŒé‡å››æ°ŸåŒ–é“€æ¿
-item.itemIngotUraniumHexafluoride.name=å…氟化铀é”
-item.itemDustUraniumHexafluoride.name=å…氟化铀粉
-item.itemDustTinyUraniumHexafluoride.name=å°æ’®å…氟化铀粉
-item.itemDustSmallUraniumHexafluoride.name=å°å †å…氟化铀粉
-item.itemNuggetUraniumHexafluoride.name=å…氟化铀粒
-item.itemPlateUraniumHexafluoride.name=å…氟化铀æ¿
-item.itemPlateDoubleUraniumHexafluoride.name=åŒé‡å…氟化铀æ¿
-item.itemIngotZirconiumTetrafluoride.name=四氟化锆é”
-item.itemDustZirconiumTetrafluoride.name=四氟化锆粉
-item.itemDustTinyZirconiumTetrafluoride.name=å°æ’®å››æ°ŸåŒ–锆粉
-item.itemDustSmallZirconiumTetrafluoride.name=å°å †å››æ°ŸåŒ–锆粉
-item.itemNuggetZirconiumTetrafluoride.name=四氟化锆粒
-item.itemPlateZirconiumTetrafluoride.name=四氟化锆æ¿
-item.itemPlateDoubleZirconiumTetrafluoride.name=åŒé‡å››æ°ŸåŒ–锆æ¿
-item.itemIngotNeptuniumHexafluoride.name=å…氟化镎é”
-item.itemDustNeptuniumHexafluoride.name=å…氟化镎粉
-item.itemDustTinyNeptuniumHexafluoride.name=å°æ’®å…氟化镎粉
-item.itemDustSmallNeptuniumHexafluoride.name=å°å †å…氟化镎粉
-item.itemNuggetNeptuniumHexafluoride.name=å…氟化镎粒
-item.itemPlateNeptuniumHexafluoride.name=å…氟化镎æ¿
-item.itemPlateDoubleNeptuniumHexafluoride.name=åŒé‡å…氟化镎æ¿
-item.itemIngotTechnetiumHexafluoride.name=å…氟化é”é”
-item.itemDustTechnetiumHexafluoride.name=å…氟化é”粉
-item.itemDustTinyTechnetiumHexafluoride.name=å°æ’®å…氟化é”粉
-item.itemDustSmallTechnetiumHexafluoride.name=å°å †å…氟化é”粉
-item.itemNuggetTechnetiumHexafluoride.name=å…氟化é”ç²’
-item.itemPlateTechnetiumHexafluoride.name=å…氟化é”æ¿
-item.itemPlateDoubleTechnetiumHexafluoride.name=åŒé‡å…氟化é”æ¿
-item.itemIngotSeleniumHexafluoride.name=å…氟化硒é”
-item.itemDustSeleniumHexafluoride.name=å…氟化硒粉
-item.itemDustTinySeleniumHexafluoride.name=å°æ’®å…氟化硒粉
-item.itemDustSmallSeleniumHexafluoride.name=å°å †å…氟化硒粉
-item.itemNuggetSeleniumHexafluoride.name=å…氟化硒粒
-item.itemPlateSeleniumHexafluoride.name=å…氟化硒æ¿
-item.itemPlateDoubleSeleniumHexafluoride.name=åŒé‡å…氟化硒æ¿
-item.itemIngotLiFBeF2ZrF4U235.name=é“€235å¤åˆæ°ŸåŒ–物é”
-item.itemDustLiFBeF2ZrF4U235.name=é“€235å¤åˆæ°ŸåŒ–物粉
-item.itemDustTinyLiFBeF2ZrF4U235.name=å°æ’®é“€235å¤åˆæ°ŸåŒ–物粉
-item.itemDustSmallLiFBeF2ZrF4U235.name=å°å †é“€235å¤åˆæ°ŸåŒ–物粉
-item.itemNuggetLiFBeF2ZrF4U235.name=é“€235å¤åˆæ°ŸåŒ–物粒
-item.itemPlateLiFBeF2ZrF4U235.name=é“€235å¤åˆæ°ŸåŒ–物æ¿
-item.itemPlateDoubleLiFBeF2ZrF4U235.name=åŒé‡é“€235å¤åˆæ°ŸåŒ–物æ¿
-item.itemIngotLiFBeF2ZrF4UF4.name=铀锆å¤åˆæ°ŸåŒ–物é”
-item.itemDustLiFBeF2ZrF4UF4.name=铀锆å¤åˆæ°ŸåŒ–物粉
-item.itemDustTinyLiFBeF2ZrF4UF4.name=å°æ’®é“€é”†å¤åˆæ°ŸåŒ–物粉
-item.itemDustSmallLiFBeF2ZrF4UF4.name=å°å †é“€é”†å¤åˆæ°ŸåŒ–物粉
-item.itemNuggetLiFBeF2ZrF4UF4.name=铀锆å¤åˆæ°ŸåŒ–物粒
-item.itemPlateLiFBeF2ZrF4UF4.name=铀锆å¤åˆæ°ŸåŒ–物æ¿
-item.itemPlateDoubleLiFBeF2ZrF4UF4.name=åŒé‡é“€é”†å¤åˆæ°ŸåŒ–物æ¿
-item.itemIngotLiFBeF2ThF4UF4.name=é“€é’å¤åˆæ°ŸåŒ–物é”
-item.itemDustLiFBeF2ThF4UF4.name=é“€é’å¤åˆæ°ŸåŒ–物粉
-item.itemDustTinyLiFBeF2ThF4UF4.name=å°æ’®é“€é’å¤åˆæ°ŸåŒ–物粉
-item.itemDustSmallLiFBeF2ThF4UF4.name=å°å †é“€é’å¤åˆæ°ŸåŒ–物粉
-item.itemNuggetLiFBeF2ThF4UF4.name=é“€é’å¤åˆæ°ŸåŒ–物粒
-item.itemPlateLiFBeF2ThF4UF4.name=é“€é’å¤åˆæ°ŸåŒ–物æ¿
-item.itemPlateDoubleLiFBeF2ThF4UF4.name=åŒé‡é“€é’å¤åˆæ°ŸåŒ–物æ¿
-item.itemIngotEnergyCrystal.name=能é‡æ°´æ™¶é”
-item.itemHotIngotEnergyCrystal.name=çƒèƒ½é‡æ°´æ™¶é”
-item.itemDustEnergyCrystal.name=能é‡æ°´æ™¶ç²‰
-item.itemDustTinyEnergyCrystal.name=å°æ’®èƒ½é‡æ°´æ™¶ç²‰
-item.itemDustSmallEnergyCrystal.name=å°å †èƒ½é‡æ°´æ™¶ç²‰
-item.itemNuggetEnergyCrystal.name=能é‡æ°´æ™¶ç²’
-item.itemPlateEnergyCrystal.name=能é‡æ°´æ™¶æ¿
-item.itemPlateDoubleEnergyCrystal.name=åŒé‡èƒ½é‡æ°´æ™¶æ¿
-item.itemBoltEnergyCrystal.name=能é‡æ°´æ™¶èžºæ “
-item.itemRodEnergyCrystal.name=能é‡æ°´æ™¶æ†
-item.itemRodLongEnergyCrystal.name=长能é‡æ°´æ™¶æ†
-item.itemRingEnergyCrystal.name=能é‡æ°´æ™¶çŽ¯
-item.itemScrewEnergyCrystal.name=能é‡æ°´æ™¶èžºä¸
-item.itemRotorEnergyCrystal.name=能é‡æ°´æ™¶è½¬å
-item.itemGearEnergyCrystal.name=能é‡æ°´æ™¶é½¿è½®
-item.itemIngotBloodSteel.name=血钢é”
-item.itemDustBloodSteel.name=血钢粉
-item.itemDustTinyBloodSteel.name=å°æ’®è¡€é’¢ç²‰
-item.itemDustSmallBloodSteel.name=å°å †è¡€é’¢ç²‰
-item.itemNuggetBloodSteel.name=血钢粒
-item.itemPlateBloodSteel.name=血钢æ¿
-item.itemPlateDoubleBloodSteel.name=åŒé‡è¡€é’¢æ¿
-item.itemBoltBloodSteel.name=è¡€é’¢èžºæ “
-item.itemRodBloodSteel.name=血钢æ†
-item.itemRodLongBloodSteel.name=长血钢æ†
-item.itemRingBloodSteel.name=血钢环
-item.itemScrewBloodSteel.name=血钢螺ä¸
-item.itemRotorBloodSteel.name=血钢转å
-item.itemGearBloodSteel.name=血钢齿轮
-item.itemIngotZeron100.name=å¡žé¾™-100é”
-item.itemHotIngotZeron100.name=çƒå¡žé¾™-100é”
-item.itemDustZeron100.name=塞龙-100粉
-item.itemDustTinyZeron100.name=å°æ’®å¡žé¾™-100粉
-item.itemDustSmallZeron100.name=å°å †å¡žé¾™-100粉
-item.itemNuggetZeron100.name=å¡žé¾™-100ç²’
-item.itemPlateZeron100.name=å¡žé¾™-100æ¿
-item.itemPlateDoubleZeron100.name=åŒé‡å¡žé¾™-100æ¿
-item.itemBoltZeron100.name=å¡žé¾™-100èžºæ “
-item.itemRodZeron100.name=å¡žé¾™-100æ†
-item.itemRodLongZeron100.name=é•¿å¡žé¾™100æ†
-item.itemRingZeron100.name=塞龙-100环
-item.itemScrewZeron100.name=å¡žé¾™-100螺ä¸
-item.itemRotorZeron100.name=å¡žé¾™-100转å
-item.itemGearZeron100.name=塞龙-100齿轮
-item.itemIngotTumbaga.name=铜金åˆé‡‘é”
-item.itemDustTumbaga.name=铜金åˆé‡‘粉
-item.itemDustTinyTumbaga.name=å°æ’®é“œé‡‘åˆé‡‘粉
-item.itemDustSmallTumbaga.name=å°å †é“œé‡‘åˆé‡‘粉
-item.itemNuggetTumbaga.name=铜金åˆé‡‘ç²’
-item.itemPlateTumbaga.name=铜金åˆé‡‘æ¿
-item.itemPlateDoubleTumbaga.name=åŒé‡é“œé‡‘åˆé‡‘æ¿
-item.itemBoltTumbaga.name=铜金åˆé‡‘èžºæ “
-item.itemRodTumbaga.name=铜金åˆé‡‘æ†
-item.itemRodLongTumbaga.name=长铜金åˆé‡‘æ†
-item.itemRingTumbaga.name=铜金åˆé‡‘环
-item.itemScrewTumbaga.name=铜金åˆé‡‘螺ä¸
-item.itemRotorTumbaga.name=铜金åˆé‡‘转å
-item.itemGearTumbaga.name=铜金åˆé‡‘齿轮
-item.itemIngotPotin.name=ç²—é’é“œåˆé‡‘é”
-item.itemDustPotin.name=ç²—é’é“œåˆé‡‘粉
-item.itemDustTinyPotin.name=å°æ’®ç²—é’é“œåˆé‡‘粉
-item.itemDustSmallPotin.name=å°å †ç²—é’é“œåˆé‡‘粉
-item.itemNuggetPotin.name=ç²—é’é“œåˆé‡‘ç²’
-item.itemPlatePotin.name=ç²—é’é“œåˆé‡‘æ¿
-item.itemPlateDoublePotin.name=åŒé‡ç²—é’é“œåˆé‡‘æ¿
-item.itemBoltPotin.name=ç²—é’é“œåˆé‡‘èžºæ “
-item.itemRodPotin.name=ç²—é’é“œåˆé‡‘æ†
-item.itemRodLongPotin.name=é•¿ç²—é’é“œåˆé‡‘æ†
-item.itemRingPotin.name=ç²—é’é“œåˆé‡‘环
-item.itemScrewPotin.name=ç²—é’é“œåˆé‡‘螺ä¸
-item.itemRotorPotin.name=ç²—é’é“œåˆé‡‘转å
-item.itemGearPotin.name=ç²—é’é“œåˆé‡‘齿轮
-item.itemIngotStaballoy.name=è´«é“€åˆé‡‘é”
-item.itemHotIngotStaballoy.name=çƒè´«é“€åˆé‡‘é”
-item.itemDustStaballoy.name=è´«é“€åˆé‡‘粉
-item.itemDustTinyStaballoy.name=å°æ’®è´«é“€åˆé‡‘粉
-item.itemDustSmallStaballoy.name=å°å †è´«é“€åˆé‡‘粉
-item.itemNuggetStaballoy.name=è´«é“€åˆé‡‘ç²’
-item.itemPlateStaballoy.name=è´«é“€åˆé‡‘æ¿
-item.itemPlateDoubleStaballoy.name=åŒé‡è´«é“€åˆé‡‘æ¿
-item.itemBoltStaballoy.name=è´«é“€åˆé‡‘èžºæ “
-item.itemRodStaballoy.name=è´«é“€åˆé‡‘æ†
-item.itemRodLongStaballoy.name=é•¿è´«é“€åˆé‡‘æ†
-item.itemRingStaballoy.name=è´«é“€åˆé‡‘环
-item.itemScrewStaballoy.name=è´«é“€åˆé‡‘螺ä¸
-item.itemRotorStaballoy.name=è´«é“€åˆé‡‘转å
-item.itemGearStaballoy.name=è´«é“€åˆé‡‘齿轮
-item.itemIngotTantalloy60.name=钽钨åˆé‡‘-60é”
-item.itemHotIngotTantalloy60.name=çƒé’½é’¨åˆé‡‘-60é”
-item.itemDustTantalloy60.name=钽钨åˆé‡‘-60粉
-item.itemDustTinyTantalloy60.name=å°æ’®é’½é’¨åˆé‡‘-60粉
-item.itemDustSmallTantalloy60.name=å°å †é’½é’¨åˆé‡‘-60粉
-item.itemNuggetTantalloy60.name=钽钨åˆé‡‘-60ç²’
-item.itemPlateTantalloy60.name=钽钨åˆé‡‘-60æ¿
-item.itemPlateDoubleTantalloy60.name=åŒé‡é’½é’¨åˆé‡‘-60æ¿
-item.itemBoltTantalloy60.name=钽钨åˆé‡‘-60èžºæ “
-item.itemRodTantalloy60.name=钽钨åˆé‡‘-60æ†
-item.itemRodLongTantalloy60.name=长钽钨åˆé‡‘-60æ†
-item.itemRingTantalloy60.name=钽钨åˆé‡‘-60环
-item.itemScrewTantalloy60.name=钽钨åˆé‡‘-60螺ä¸
-item.itemRotorTantalloy60.name=钽钨åˆé‡‘-60转å
-item.itemGearTantalloy60.name=钽钨åˆé‡‘-60齿轮
-item.itemIngotTantalloy61.name=钽钨åˆé‡‘-61é”
-item.itemHotIngotTantalloy61.name=çƒé’½é’¨åˆé‡‘-61é”
-item.itemDustTantalloy61.name=钽钨åˆé‡‘-61粉
-item.itemDustTinyTantalloy61.name=å°æ’®é’½é’¨åˆé‡‘-61粉
-item.itemDustSmallTantalloy61.name=å°å †é’½é’¨åˆé‡‘-61粉
-item.itemNuggetTantalloy61.name=钽钨åˆé‡‘-61ç²’
-item.itemPlateTantalloy61.name=钽钨åˆé‡‘-61æ¿
-item.itemPlateDoubleTantalloy61.name=åŒé‡é’½é’¨åˆé‡‘-61æ¿
-item.itemBoltTantalloy61.name=钽钨åˆé‡‘-61èžºæ “
-item.itemRodTantalloy61.name=钽钨åˆé‡‘-61æ†
-item.itemRodLongTantalloy61.name=长钽钨åˆé‡‘-61æ†
-item.itemRingTantalloy61.name=钽钨åˆé‡‘-61环
-item.itemScrewTantalloy61.name=钽钨åˆé‡‘-61螺ä¸
-item.itemRotorTantalloy61.name=钽钨åˆé‡‘-61转å
-item.itemGearTantalloy61.name=钽钨åˆé‡‘-61齿轮
-item.itemIngotInconel625.name=é•é“¬åŸºåˆé‡‘-625é”
-item.itemHotIngotInconel625.name=çƒé•é“¬åŸºåˆé‡‘-625é”
-item.itemDustInconel625.name=é•é“¬åŸºåˆé‡‘-625粉
-item.itemDustTinyInconel625.name=å°æ’®é•é“¬åŸºåˆé‡‘-625粉
-item.itemDustSmallInconel625.name=å°å †é•é“¬åŸºåˆé‡‘-625粉
-item.itemNuggetInconel625.name=é•é“¬åŸºåˆé‡‘-625ç²’
-item.itemPlateInconel625.name=é•é“¬åŸºåˆé‡‘-625æ¿
-item.itemPlateDoubleInconel625.name=åŒé‡é•é“¬åŸºåˆé‡‘-625æ¿
-item.itemBoltInconel625.name=é•é“¬åŸºåˆé‡‘-625èžºæ “
-item.itemRodInconel625.name=é•é“¬åŸºåˆé‡‘-625æ†
-item.itemRodLongInconel625.name=é•¿é•é“¬åŸºåˆé‡‘-625æ†
-item.itemRingInconel625.name=é•é“¬åŸºåˆé‡‘-625环
-item.itemScrewInconel625.name=é•é“¬åŸºåˆé‡‘-625螺ä¸
-item.itemRotorInconel625.name=é•é“¬åŸºåˆé‡‘-625转å
-item.itemGearInconel625.name=é•é“¬åŸºåˆé‡‘-625齿轮
-item.itemIngotInconel690.name=é•é“¬åŸºåˆé‡‘-690é”
-item.itemHotIngotInconel690.name=çƒé•é“¬åŸºåˆé‡‘-690é”
-item.itemDustInconel690.name=é•é“¬åŸºåˆé‡‘-690粉
-item.itemDustTinyInconel690.name=å°æ’®é•é“¬åŸºåˆé‡‘-690粉
-item.itemDustSmallInconel690.name=å°å †é•é“¬åŸºåˆé‡‘-690粉
-item.itemNuggetInconel690.name=é•é“¬åŸºåˆé‡‘-690ç²’
-item.itemPlateInconel690.name=é•é“¬åŸºåˆé‡‘-690æ¿
-item.itemPlateDoubleInconel690.name=åŒé‡é•é“¬åŸºåˆé‡‘-690æ¿
-item.itemBoltInconel690.name=é•é“¬åŸºåˆé‡‘-690èžºæ “
-item.itemRodInconel690.name=é•é“¬åŸºåˆé‡‘-690æ†
-item.itemRodLongInconel690.name=é•¿é•é“¬åŸºåˆé‡‘-690æ†
-item.itemRingInconel690.name=é•é“¬åŸºåˆé‡‘-690环
-item.itemScrewInconel690.name=é•é“¬åŸºåˆé‡‘-690螺ä¸
-item.itemRotorInconel690.name=é•é“¬åŸºåˆé‡‘-690转å
-item.itemGearInconel690.name=é•é“¬åŸºåˆé‡‘-690齿轮
-item.itemIngotInconel792.name=é•é“¬åŸºåˆé‡‘-792é”
-item.itemHotIngotInconel792.name=çƒé•é“¬åŸºåˆé‡‘-792é”
-item.itemDustInconel792.name=é•é“¬åŸºåˆé‡‘-792粉
-item.itemDustTinyInconel792.name=å°æ’®é•é“¬åŸºåˆé‡‘-792粉
-item.itemDustSmallInconel792.name=å°å †é•é“¬åŸºåˆé‡‘-792粉
-item.itemNuggetInconel792.name=é•é“¬åŸºåˆé‡‘-792ç²’
-item.itemPlateInconel792.name=é•é“¬åŸºåˆé‡‘-792æ¿
-item.itemPlateDoubleInconel792.name=åŒé‡é•é“¬åŸºåˆé‡‘-792æ¿
-item.itemBoltInconel792.name=é•é“¬åŸºåˆé‡‘-792èžºæ “
-item.itemRodInconel792.name=é•é“¬åŸºåˆé‡‘-792æ†
-item.itemRodLongInconel792.name=é•¿é•é“¬åŸºåˆé‡‘-792æ†
-item.itemRingInconel792.name=é•é“¬åŸºåˆé‡‘-792环
-item.itemScrewInconel792.name=é•é“¬åŸºåˆé‡‘-792螺ä¸
-item.itemRotorInconel792.name=é•é“¬åŸºåˆé‡‘-792转å
-item.itemGearInconel792.name=é•é“¬åŸºåˆé‡‘-792齿轮
-item.itemDustEglinSteelBaseCompound.name=åŸƒæ ¼æž—é’¢åŸºç¡€åŒ–åˆç‰©ç²‰
-item.itemDustTinyEglinSteelBaseCompound.name=å°æ’®åŸƒæ ¼æž—钢基础化åˆç‰©ç²‰
-item.itemDustSmallEglinSteelBaseCompound.name=å°å †åŸƒæ ¼æž—钢基础化åˆç‰©ç²‰
-item.itemIngotEglinSteel.name=åŸƒæ ¼æž—é’¢é”
-item.itemDustEglinSteel.name=åŸƒæ ¼æž—é’¢ç²‰
-item.itemDustTinyEglinSteel.name=å°æ’®åŸƒæ ¼æž—钢粉
-item.itemDustSmallEglinSteel.name=å°å †åŸƒæ ¼æž—钢粉
-item.itemNuggetEglinSteel.name=åŸƒæ ¼æž—é’¢ç²’
-item.itemPlateEglinSteel.name=åŸƒæ ¼æž—é’¢æ¿
-item.itemPlateDoubleEglinSteel.name=åŒé‡åŸƒæ ¼æž—é’¢æ¿
-item.itemBoltEglinSteel.name=åŸƒæ ¼æž—é’¢èžºæ “
-item.itemRodEglinSteel.name=åŸƒæ ¼æž—é’¢æ†
-item.itemRodLongEglinSteel.name=é•¿åŸƒæ ¼æž—é’¢æ†
-item.itemRingEglinSteel.name=åŸƒæ ¼æž—é’¢çŽ¯
-item.itemScrewEglinSteel.name=åŸƒæ ¼æž—é’¢èžºä¸
-item.itemRotorEglinSteel.name=åŸƒæ ¼æž—é’¢è½¬å
-item.itemGearEglinSteel.name=åŸƒæ ¼æž—é’¢é½¿è½®
-item.itemIngotMaragingSteel250.name=马æ°ä½“时效钢250é”
-item.itemHotIngotMaragingSteel250.name=çƒé©¬æ°ä½“时效钢250é”
-item.itemDustMaragingSteel250.name=马æ°ä½“时效钢250粉
-item.itemDustTinyMaragingSteel250.name=å°æ’®é©¬æ°ä½“时效钢250粉
-item.itemDustSmallMaragingSteel250.name=å°å †é©¬æ°ä½“时效钢250粉
-item.itemNuggetMaragingSteel250.name=马æ°ä½“时效钢250ç²’
-item.itemPlateMaragingSteel250.name=马æ°ä½“时效钢250æ¿
-item.itemPlateDoubleMaragingSteel250.name=åŒé‡é©¬æ°ä½“时效钢250æ¿
-item.itemBoltMaragingSteel250.name=马æ°ä½“时效钢250èžºæ “
-item.itemRodMaragingSteel250.name=马æ°ä½“时效钢250æ†
-item.itemRodLongMaragingSteel250.name=长马æ°ä½“时效钢250æ†
-item.itemRingMaragingSteel250.name=马æ°ä½“时效钢250环
-item.itemScrewMaragingSteel250.name=马æ°ä½“时效钢250螺ä¸
-item.itemRotorMaragingSteel250.name=马æ°ä½“时效钢250转å
-item.itemGearMaragingSteel250.name=马æ°ä½“时效钢250齿轮
-item.itemIngotMaragingSteel300.name=马æ°ä½“时效钢300é”
-item.itemHotIngotMaragingSteel300.name=çƒé©¬æ°ä½“时效钢300é”
-item.itemDustMaragingSteel300.name=马æ°ä½“时效钢300粉
-item.itemDustTinyMaragingSteel300.name=å°æ’®é©¬æ°ä½“时效钢300粉
-item.itemDustSmallMaragingSteel300.name=å°å †é©¬æ°ä½“时效钢300粉
-item.itemNuggetMaragingSteel300.name=马æ°ä½“时效钢300ç²’
-item.itemPlateMaragingSteel300.name=马æ°ä½“时效钢300æ¿
-item.itemPlateDoubleMaragingSteel300.name=åŒé‡é©¬æ°ä½“时效钢300æ¿
-item.itemBoltMaragingSteel300.name=马æ°ä½“时效钢300èžºæ “
-item.itemRodMaragingSteel300.name=马æ°ä½“时效钢300æ†
-item.itemRodLongMaragingSteel300.name=长马æ°ä½“时效钢300æ†
-item.itemRingMaragingSteel300.name=马æ°ä½“时效钢300环
-item.itemScrewMaragingSteel300.name=马æ°ä½“时效钢300螺ä¸
-item.itemRotorMaragingSteel300.name=马æ°ä½“时效钢300转å
-item.itemGearMaragingSteel300.name=马æ°ä½“时效钢300齿轮
-item.itemIngotMaragingSteel350.name=马æ°ä½“时效钢350é”
-item.itemHotIngotMaragingSteel350.name=çƒé©¬æ°ä½“时效钢350é”
-item.itemDustMaragingSteel350.name=马æ°ä½“时效钢350粉
-item.itemDustTinyMaragingSteel350.name=å°æ’®é©¬æ°ä½“时效钢350粉
-item.itemDustSmallMaragingSteel350.name=å°å †é©¬æ°ä½“时效钢350粉
-item.itemNuggetMaragingSteel350.name=马æ°ä½“时效钢350ç²’
-item.itemPlateMaragingSteel350.name=马æ°ä½“时效钢350æ¿
-item.itemPlateDoubleMaragingSteel350.name=åŒé‡é©¬æ°ä½“时效钢350æ¿
-item.itemBoltMaragingSteel350.name=马æ°ä½“时效钢350èžºæ “
-item.itemRodMaragingSteel350.name=马æ°ä½“时效钢350æ†
-item.itemRodLongMaragingSteel350.name=长马æ°ä½“时效钢350æ†
-item.itemRingMaragingSteel350.name=马æ°ä½“时效钢350环
-item.itemScrewMaragingSteel350.name=马æ°ä½“时效钢350螺ä¸
-item.itemRotorMaragingSteel350.name=马æ°ä½“时效钢350转å
-item.itemGearMaragingSteel350.name=马æ°ä½“时效钢350齿轮
-item.itemIngotStellite.name=铬钴锰钛åˆé‡‘é”
-item.itemHotIngotStellite.name=çƒé“¬é’´é”°é’›åˆé‡‘é”
-item.itemDustStellite.name=铬钴锰钛åˆé‡‘粉
-item.itemDustTinyStellite.name=å°æ’®é“¬é’´é”°é’›åˆé‡‘粉
-item.itemDustSmallStellite.name=å°å †é“¬é’´é”°é’›åˆé‡‘粉
-item.itemNuggetStellite.name=铬钴锰钛åˆé‡‘ç²’
-item.itemPlateStellite.name=铬钴锰钛åˆé‡‘æ¿
-item.itemPlateDoubleStellite.name=åŒé‡é“¬é’´é”°é’›åˆé‡‘æ¿
-item.itemBoltStellite.name=铬钴锰钛åˆé‡‘èžºæ “
-item.itemRodStellite.name=铬钴锰钛åˆé‡‘æ†
-item.itemRodLongStellite.name=长铬钴锰钛åˆé‡‘æ†
-item.itemRingStellite.name=铬钴锰钛åˆé‡‘环
-item.itemScrewStellite.name=铬钴锰钛åˆé‡‘螺ä¸
-item.itemRotorStellite.name=铬钴锰钛åˆé‡‘转å
-item.itemGearStellite.name=铬钴锰钛åˆé‡‘齿轮
-item.itemIngotTalonite.name=铬钴磷酸ç›åˆé‡‘é”
-item.itemDustTalonite.name=铬钴磷酸ç›åˆé‡‘粉
-item.itemDustTinyTalonite.name=å°æ’®é“¬é’´ç£·é…¸ç›åˆé‡‘粉
-item.itemDustSmallTalonite.name=å°å †é“¬é’´ç£·é…¸ç›åˆé‡‘粉
-item.itemNuggetTalonite.name=铬钴磷酸ç›åˆé‡‘ç²’
-item.itemPlateTalonite.name=铬钴磷酸ç›åˆé‡‘æ¿
-item.itemPlateDoubleTalonite.name=åŒé‡é“¬é’´ç£·é…¸ç›åˆé‡‘æ¿
-item.itemBoltTalonite.name=铬钴磷酸ç›åˆé‡‘èžºæ “
-item.itemRodTalonite.name=铬钴磷酸ç›åˆé‡‘æ†
-item.itemRodLongTalonite.name=长铬钴磷酸ç›åˆé‡‘æ†
-item.itemRingTalonite.name=铬钴磷酸ç›åˆé‡‘环
-item.itemScrewTalonite.name=铬钴磷酸ç›åˆé‡‘螺ä¸
-item.itemRotorTalonite.name=铬钴磷酸ç›åˆé‡‘转å
-item.itemGearTalonite.name=铬钴磷酸ç›åˆé‡‘齿轮
-item.itemIngotHastelloyW.name=哈斯特洛ä¾åˆé‡‘-Wé”
-item.itemDustHastelloyW.name=哈斯特洛ä¾åˆé‡‘-W粉
-item.itemDustTinyHastelloyW.name=å°æ’®å“ˆæ–¯ç‰¹æ´›ä¾åˆé‡‘-W粉
-item.itemDustSmallHastelloyW.name=å°å †å“ˆæ–¯ç‰¹æ´›ä¾åˆé‡‘-W粉
-item.itemNuggetHastelloyW.name=哈斯特洛ä¾åˆé‡‘-Wç²’
-item.itemPlateHastelloyW.name=哈斯特洛ä¾åˆé‡‘-Wæ¿
-item.itemPlateDoubleHastelloyW.name=åŒé‡å“ˆæ–¯ç‰¹æ´›ä¾åˆé‡‘-Wæ¿
-item.itemBoltHastelloyW.name=哈斯特洛ä¾åˆé‡‘-Wèžºæ “
-item.itemRodHastelloyW.name=哈斯特洛ä¾åˆé‡‘-Wæ†
-item.itemRodLongHastelloyW.name=长哈斯特洛ä¾åˆé‡‘-Wæ†
-item.itemRingHastelloyW.name=哈斯特洛ä¾åˆé‡‘-W环
-item.itemScrewHastelloyW.name=哈斯特洛ä¾åˆé‡‘-W螺ä¸
-item.itemRotorHastelloyW.name=哈斯特洛ä¾åˆé‡‘-W转å
-item.itemGearHastelloyW.name=哈斯特洛ä¾åˆé‡‘-W齿轮
-item.itemIngotHastelloyX.name=哈斯特洛ä¾åˆé‡‘-Xé”
-item.itemDustHastelloyX.name=哈斯特洛ä¾åˆé‡‘-X粉
-item.itemDustTinyHastelloyX.name=å°æ’®å“ˆæ–¯ç‰¹æ´›ä¾åˆé‡‘-X粉
-item.itemDustSmallHastelloyX.name=å°å †å“ˆæ–¯ç‰¹æ´›ä¾åˆé‡‘-X粉
-item.itemNuggetHastelloyX.name=哈斯特洛ä¾åˆé‡‘-Xç²’
-item.itemPlateHastelloyX.name=哈斯特洛ä¾åˆé‡‘-Xæ¿
-item.itemPlateDoubleHastelloyX.name=åŒé‡å“ˆæ–¯ç‰¹æ´›ä¾åˆé‡‘-Xæ¿
-item.itemBoltHastelloyX.name=哈斯特洛ä¾åˆé‡‘-Xèžºæ “
-item.itemRodHastelloyX.name=哈斯特洛ä¾åˆé‡‘-Xæ†
-item.itemRodLongHastelloyX.name=长哈斯特洛ä¾åˆé‡‘-Xæ†
-item.itemRingHastelloyX.name=哈斯特洛ä¾åˆé‡‘-X环
-item.itemScrewHastelloyX.name=哈斯特洛ä¾åˆé‡‘-X螺ä¸
-item.itemRotorHastelloyX.name=哈斯特洛ä¾åˆé‡‘-X转å
-item.itemGearHastelloyX.name=哈斯特洛ä¾åˆé‡‘-X齿轮
-item.itemIngotHastelloyC276.name=哈斯特洛ä¾åˆé‡‘-C276é”
-item.itemHotIngotHastelloyC276.name=çƒå“ˆæ–¯ç‰¹æ´›ä¾åˆé‡‘-C276é”
-item.itemDustHastelloyC276.name=哈斯特洛ä¾åˆé‡‘-C276粉
-item.itemDustTinyHastelloyC276.name=å°æ’®å“ˆæ–¯ç‰¹æ´›ä¾åˆé‡‘-C276粉
-item.itemDustSmallHastelloyC276.name=å°å †å“ˆæ–¯ç‰¹æ´›ä¾åˆé‡‘-C276粉
-item.itemNuggetHastelloyC276.name=哈斯特洛ä¾åˆé‡‘-C276ç²’
-item.itemPlateHastelloyC276.name=哈斯特洛ä¾åˆé‡‘-C276æ¿
-item.itemPlateDoubleHastelloyC276.name=åŒé‡å“ˆæ–¯ç‰¹æ´›ä¾åˆé‡‘-C276æ¿
-item.itemBoltHastelloyC276.name=哈斯特洛ä¾åˆé‡‘-C276èžºæ “
-item.itemRodHastelloyC276.name=哈斯特洛ä¾åˆé‡‘-C276æ†
-item.itemRodLongHastelloyC276.name=长哈斯特洛ä¾åˆé‡‘-C276æ†
-item.itemRingHastelloyC276.name=哈斯特洛ä¾åˆé‡‘-C276环
-item.itemScrewHastelloyC276.name=哈斯特洛ä¾åˆé‡‘-C276螺ä¸
-item.itemRotorHastelloyC276.name=哈斯特洛ä¾åˆé‡‘-C276转å
-item.itemGearHastelloyC276.name=哈斯特洛ä¾åˆé‡‘-C276齿轮
-item.itemIngotHastelloyN.name=哈斯特洛ä¾åˆé‡‘-Né”
-item.itemHotIngotHastelloyN.name=çƒå“ˆæ–¯ç‰¹æ´›ä¾åˆé‡‘-Né”
-item.itemDustHastelloyN.name=哈斯特洛ä¾åˆé‡‘-N粉
-item.itemDustTinyHastelloyN.name=å°æ’®å“ˆæ–¯ç‰¹æ´›ä¾åˆé‡‘-N粉
-item.itemDustSmallHastelloyN.name=å°å †å“ˆæ–¯ç‰¹æ´›ä¾åˆé‡‘-N粉
-item.itemNuggetHastelloyN.name=哈斯特洛ä¾åˆé‡‘-Nç²’
-item.itemPlateHastelloyN.name=哈斯特洛ä¾åˆé‡‘-Næ¿
-item.itemPlateDoubleHastelloyN.name=åŒé‡å“ˆæ–¯ç‰¹æ´›ä¾åˆé‡‘-Næ¿
-item.itemBoltHastelloyN.name=哈斯特洛ä¾åˆé‡‘-Nèžºæ “
-item.itemRodHastelloyN.name=哈斯特洛ä¾åˆé‡‘-Næ†
-item.itemRodLongHastelloyN.name=长哈斯特洛ä¾åˆé‡‘-Næ†
-item.itemRingHastelloyN.name=哈斯特洛ä¾åˆé‡‘-N环
-item.itemScrewHastelloyN.name=哈斯特洛ä¾åˆé‡‘-N螺ä¸
-item.itemRotorHastelloyN.name=哈斯特洛ä¾åˆé‡‘-N转å
-item.itemGearHastelloyN.name=哈斯特洛ä¾åˆé‡‘-N齿轮
-item.itemIngotIncoloy020.name=è€çƒè€çƒé“¬é“åˆé‡‘-020é”
-item.itemDustIncoloy020.name=è€çƒè€çƒé“¬é“åˆé‡‘-020粉
-item.itemDustTinyIncoloy020.name=å°æ’®è€çƒè€çƒé“¬é“åˆé‡‘-020粉
-item.itemDustSmallIncoloy020.name=å°å †è€çƒè€çƒé“¬é“åˆé‡‘-020粉
-item.itemNuggetIncoloy020.name=è€çƒè€çƒé“¬é“åˆé‡‘-020ç²’
-item.itemPlateIncoloy020.name=è€çƒè€çƒé“¬é“åˆé‡‘-020æ¿
-item.itemPlateDoubleIncoloy020.name=åŒé‡è€çƒè€çƒé“¬é“åˆé‡‘-020æ¿
-item.itemBoltIncoloy020.name=è€çƒè€çƒé“¬é“åˆé‡‘-020èžºæ “
-item.itemRodIncoloy020.name=è€çƒè€çƒé“¬é“åˆé‡‘-020æ†
-item.itemRodLongIncoloy020.name=é•¿è€çƒè€çƒé“¬é“åˆé‡‘-020æ†
-item.itemRingIncoloy020.name=è€çƒè€çƒé“¬é“åˆé‡‘-020环
-item.itemScrewIncoloy020.name=è€çƒè€çƒé“¬é“åˆé‡‘-020螺ä¸
-item.itemRotorIncoloy020.name=è€çƒè€çƒé“¬é“åˆé‡‘-020转å
-item.itemGearIncoloy020.name=è€çƒè€çƒé“¬é“åˆé‡‘-020齿轮
-item.itemIngotIncoloyDS.name=è€çƒé“¬é“åˆé‡‘-DSé”
-item.itemDustIncoloyDS.name=è€çƒé“¬é“åˆé‡‘-DS粉
-item.itemDustTinyIncoloyDS.name=å°æ’®è€çƒé“¬é“åˆé‡‘-DS粉
-item.itemDustSmallIncoloyDS.name=å°å †è€çƒé“¬é“åˆé‡‘-DS粉
-item.itemNuggetIncoloyDS.name=è€çƒé“¬é“åˆé‡‘-DSç²’
-item.itemPlateIncoloyDS.name=è€çƒé“¬é“åˆé‡‘-DSæ¿
-item.itemPlateDoubleIncoloyDS.name=åŒé‡è€çƒé“¬é“åˆé‡‘-DSæ¿
-item.itemBoltIncoloyDS.name=è€çƒé“¬é“åˆé‡‘-DSèžºæ “
-item.itemRodIncoloyDS.name=è€çƒé“¬é“åˆé‡‘-DSæ†
-item.itemRodLongIncoloyDS.name=é•¿è€çƒé“¬é“åˆé‡‘-DSæ†
-item.itemRingIncoloyDS.name=è€çƒé“¬é“åˆé‡‘-DS环
-item.itemScrewIncoloyDS.name=è€çƒé“¬é“åˆé‡‘-DS螺ä¸
-item.itemRotorIncoloyDS.name=è€çƒé“¬é“åˆé‡‘-DS转å
-item.itemGearIncoloyDS.name=è€çƒé“¬é“åˆé‡‘-DS齿轮
-item.itemIngotIncoloyMA956.name=è€çƒé“¬é“åˆé‡‘-MA956é”
-item.itemHotIngotIncoloyMA956.name=çƒè€çƒé“¬é“åˆé‡‘-MA956é”
-item.itemDustIncoloyMA956.name=è€çƒé“¬é“åˆé‡‘-MA956粉
-item.itemDustTinyIncoloyMA956.name=å°æ’®è€çƒé“¬é“åˆé‡‘-MA956粉
-item.itemDustSmallIncoloyMA956.name=å°å †è€çƒé“¬é“åˆé‡‘-MA956粉
-item.itemNuggetIncoloyMA956.name=è€çƒé“¬é“åˆé‡‘-MA956ç²’
-item.itemPlateIncoloyMA956.name=è€çƒé“¬é“åˆé‡‘-MA956æ¿
-item.itemPlateDoubleIncoloyMA956.name=åŒé‡è€çƒé“¬é“åˆé‡‘-MA956æ¿
-item.itemBoltIncoloyMA956.name=è€çƒé“¬é“åˆé‡‘-MA956èžºæ “
-item.itemRodIncoloyMA956.name=è€çƒé“¬é“åˆé‡‘-MA956æ†
-item.itemRodLongIncoloyMA956.name=é•¿è€çƒé“¬é“åˆé‡‘-MA956æ†
-item.itemRingIncoloyMA956.name=è€çƒé“¬é“åˆé‡‘-MA956环
-item.itemScrewIncoloyMA956.name=è€çƒé“¬é“åˆé‡‘-MA956螺ä¸
-item.itemRotorIncoloyMA956.name=è€çƒé“¬é“åˆé‡‘-MA956转å
-item.itemGearIncoloyMA956.name=è€çƒé“¬é“åˆé‡‘-MA956齿轮
-item.itemIngotGrisium.name=ç°é’›åˆé‡‘é”
-item.itemHotIngotGrisium.name=çƒç°é’›åˆé‡‘é”
-item.itemDustGrisium.name=ç°é’›åˆé‡‘粉
-item.itemDustTinyGrisium.name=å°æ’®ç°é’›åˆé‡‘粉
-item.itemDustSmallGrisium.name=å°å †ç°é’›åˆé‡‘粉
-item.itemNuggetGrisium.name=ç°é’›åˆé‡‘ç²’
-item.itemPlateGrisium.name=ç°é’›åˆé‡‘æ¿
-item.itemPlateDoubleGrisium.name=åŒé‡ç°é’›åˆé‡‘æ¿
-item.itemBoltGrisium.name=ç°é’›åˆé‡‘èžºæ “
-item.itemRodGrisium.name=ç°é’›åˆé‡‘æ†
-item.itemRodLongGrisium.name=é•¿ç°é’›åˆé‡‘æ†
-item.itemRingGrisium.name=ç°é’›åˆé‡‘环
-item.itemScrewGrisium.name=ç°é’›åˆé‡‘螺ä¸
-item.itemRotorGrisium.name=ç°é’›åˆé‡‘转å
-item.itemGearGrisium.name=ç°é’›åˆé‡‘齿轮
-item.itemIngotHG1223.name=HG-1223é”
-item.itemDustHG1223.name=HG-1223粉
-item.itemDustTinyHG1223.name=å°æ’®HG-1223粉
-item.itemDustSmallHG1223.name=å°å †HG-1223粉
-item.itemNuggetHG1223.name=HG-1223ç²’
-item.itemPlateHG1223.name=HG-1223æ¿
-item.itemPlateDoubleHG1223.name=åŒé‡HG-1223æ¿
-item.itemIngotTrinium.name=三元金属é”
-item.itemDustTrinium.name=三元金属粉
-item.itemDustTinyTrinium.name=å°æ’®ä¸‰å…ƒé‡‘属粉
-item.itemDustSmallTrinium.name=å°å †ä¸‰å…ƒé‡‘属粉
-item.itemNuggetTrinium.name=三元金属粒
-item.itemPlateTrinium.name=三元金属æ¿
-item.itemPlateDoubleTrinium.name=åŒé‡ä¸‰å…ƒé‡‘属æ¿
-item.itemIngotRefinedTrinium.name=精制三元金属é”
-item.itemDustRefinedTrinium.name=精制三元金属粉
-item.itemDustTinyRefinedTrinium.name=å°æ’®ç²¾åˆ¶ä¸‰å…ƒé‡‘属粉
-item.itemDustSmallRefinedTrinium.name=å°å †ç²¾åˆ¶ä¸‰å…ƒé‡‘属粉
-item.itemNuggetRefinedTrinium.name=精制三元金属粒
-item.itemPlateRefinedTrinium.name=精制三元金属æ¿
-item.itemPlateDoubleRefinedTrinium.name=åŒé‡ç²¾åˆ¶ä¸‰å…ƒé‡‘属æ¿
-item.itemIngotTriniumTitaniumAlloy.name=三元钛åˆé‡‘é”
-item.itemHotIngotTriniumTitaniumAlloy.name=çƒä¸‰å…ƒé’›åˆé‡‘é”
-item.itemDustTriniumTitaniumAlloy.name=三元钛åˆé‡‘粉
-item.itemDustTinyTriniumTitaniumAlloy.name=å°æ’®ä¸‰å…ƒé’›åˆé‡‘粉
-item.itemDustSmallTriniumTitaniumAlloy.name=å°å †ä¸‰å…ƒé’›åˆé‡‘粉
-item.itemNuggetTriniumTitaniumAlloy.name=三元钛åˆé‡‘ç²’
-item.itemPlateTriniumTitaniumAlloy.name=三元钛åˆé‡‘æ¿
-item.itemPlateDoubleTriniumTitaniumAlloy.name=åŒé‡ä¸‰å…ƒé’›åˆé‡‘æ¿
-item.itemBoltTriniumTitaniumAlloy.name=三元钛åˆé‡‘èžºæ “
-item.itemRodTriniumTitaniumAlloy.name=三元钛åˆé‡‘æ†
-item.itemRodLongTriniumTitaniumAlloy.name=长三元钛åˆé‡‘æ†
-item.itemRingTriniumTitaniumAlloy.name=三元钛åˆé‡‘环
-item.itemScrewTriniumTitaniumAlloy.name=三元钛åˆé‡‘螺ä¸
-item.itemRotorTriniumTitaniumAlloy.name=三元钛åˆé‡‘转å
-item.itemGearTriniumTitaniumAlloy.name=三元钛åˆé‡‘齿轮
-item.itemIngotTriniumNaquadahAlloy.name=三元硅岩åˆé‡‘é”
-item.itemDustTriniumNaquadahAlloy.name=三元硅岩åˆé‡‘粉
-item.itemDustTinyTriniumNaquadahAlloy.name=å°æ’®ä¸‰å…ƒç¡…岩åˆé‡‘粉
-item.itemDustSmallTriniumNaquadahAlloy.name=å°å †ä¸‰å…ƒç¡…岩åˆé‡‘粉
-item.itemNuggetTriniumNaquadahAlloy.name=三元硅岩åˆé‡‘ç²’
-item.itemPlateTriniumNaquadahAlloy.name=三元硅岩åˆé‡‘æ¿
-item.itemPlateDoubleTriniumNaquadahAlloy.name=åŒé‡ä¸‰å…ƒç¡…岩åˆé‡‘æ¿
-item.itemIngotTriniumNaquadahCarbonite.name=碳化三元硅岩åˆé‡‘é”
-item.itemHotIngotTriniumNaquadahCarbonite.name=çƒç¢³åŒ–三元硅岩åˆé‡‘é”
-item.itemDustTriniumNaquadahCarbonite.name=碳化三元硅岩åˆé‡‘粉
-item.itemDustTinyTriniumNaquadahCarbonite.name=å°æ’®ç¢³åŒ–三元硅岩åˆé‡‘粉
-item.itemDustSmallTriniumNaquadahCarbonite.name=å°å †ç¢³åŒ–三元硅岩åˆé‡‘粉
-item.itemNuggetTriniumNaquadahCarbonite.name=碳化三元硅岩åˆé‡‘ç²’
-item.itemPlateTriniumNaquadahCarbonite.name=碳化三元硅岩åˆé‡‘æ¿
-item.itemPlateDoubleTriniumNaquadahCarbonite.name=åŒé‡ç¢³åŒ–三元硅岩åˆé‡‘æ¿
-item.itemBoltTriniumNaquadahCarbonite.name=碳化三元硅岩åˆé‡‘èžºæ “
-item.itemRodTriniumNaquadahCarbonite.name=碳化三元硅岩åˆé‡‘æ†
-item.itemRodLongTriniumNaquadahCarbonite.name=长碳化三元硅岩åˆé‡‘æ†
-item.itemRingTriniumNaquadahCarbonite.name=碳化三元硅岩åˆé‡‘环
-item.itemScrewTriniumNaquadahCarbonite.name=碳化三元硅岩åˆé‡‘螺ä¸
-item.itemRotorTriniumNaquadahCarbonite.name=碳化三元硅岩åˆé‡‘转å
-item.itemGearTriniumNaquadahCarbonite.name=碳化三元硅岩åˆé‡‘齿轮
-item.itemIngotQuantum.name=é‡ååˆé‡‘é”
-item.itemHotIngotQuantum.name=çƒé‡ååˆé‡‘é”
-item.itemDustQuantum.name=é‡ååˆé‡‘粉
-item.itemDustTinyQuantum.name=å°æ’®é‡ååˆé‡‘粉
-item.itemDustSmallQuantum.name=å°å †é‡ååˆé‡‘粉
-item.itemNuggetQuantum.name=é‡ååˆé‡‘ç²’
-item.itemPlateQuantum.name=é‡ååˆé‡‘æ¿
-item.itemPlateDoubleQuantum.name=åŒé‡é‡ååˆé‡‘æ¿
-item.itemBoltQuantum.name=é‡ååˆé‡‘èžºæ “
-item.itemRodQuantum.name=é‡ååˆé‡‘æ†
-item.itemRodLongQuantum.name=é•¿é‡ååˆé‡‘æ†
-item.itemRingQuantum.name=é‡ååˆé‡‘环
-item.itemScrewQuantum.name=é‡ååˆé‡‘螺ä¸
-item.itemRotorQuantum.name=é‡ååˆé‡‘转å
-item.itemGearQuantum.name=é‡ååˆé‡‘齿轮
-item.itemDustFluorite.name=氟石粉
-item.itemDustTinyFluorite.name=å°æ’®æ°ŸçŸ³ç²‰
-item.itemDustSmallFluorite.name=å°å †æ°ŸçŸ³ç²‰
-item.crushedFluorite.name=粉碎的氟石矿石
-item.crushedCentrifugedFluorite.name=离心氟石矿石
-item.crushedPurifiedFluorite.name=洗净的氟石矿石
-item.dustImpureFluorite.name=å«æ‚氟石粉
-item.dustPureFluorite.name=æ´å‡€æ°ŸçŸ³ç²‰
-item.itemDustCrocoite.name=赤铅矿粉
-item.itemDustTinyCrocoite.name=å°æ’®èµ¤é“…矿粉
-item.itemDustSmallCrocoite.name=å°å †èµ¤é“…矿粉
-item.crushedCrocoite.name=粉碎的赤铅矿矿石
-item.crushedCentrifugedCrocoite.name=离心赤铅矿矿石
-item.crushedPurifiedCrocoite.name=洗净的赤铅矿矿石
-item.dustImpureCrocoite.name=å«æ‚赤铅矿粉
-item.dustPureCrocoite.name=æ´å‡€èµ¤é“…矿粉
-item.itemDustGeikielite.name=é•é’›çŸ¿ç²‰
-item.itemDustTinyGeikielite.name=å°æ’®é•é’›çŸ¿ç²‰
-item.itemDustSmallGeikielite.name=å°å †é•é’›çŸ¿ç²‰
-item.crushedGeikielite.name=粉碎的é•é’›çŸ¿çŸ¿çŸ³
-item.crushedCentrifugedGeikielite.name=离心é•é’›çŸ¿çŸ¿çŸ³
-item.crushedPurifiedGeikielite.name=洗净的é•é’›çŸ¿çŸ¿çŸ³
-item.dustImpureGeikielite.name=å«æ‚é•é’›çŸ¿ç²‰
-item.dustPureGeikielite.name=æ´å‡€é•é’›çŸ¿ç²‰
-item.itemDustNichromite.name=é•é“¬çŸ¿ç²‰
-item.itemDustTinyNichromite.name=å°æ’®é•é“¬çŸ¿ç²‰
-item.itemDustSmallNichromite.name=å°å †é•é“¬çŸ¿ç²‰
-item.crushedNichromite.name=粉碎的é•é“¬çŸ¿çŸ¿çŸ³
-item.crushedCentrifugedNichromite.name=离心é•é“¬çŸ¿çŸ¿çŸ³
-item.crushedPurifiedNichromite.name=洗净的é•é“¬çŸ¿çŸ¿çŸ³
-item.dustImpureNichromite.name=å«æ‚é•é“¬çŸ¿ç²‰
-item.dustPureNichromite.name=æ´å‡€é•é“¬çŸ¿ç²‰
-item.itemDustTitanite.name=æ¦çŸ³ç²‰
-item.itemDustTinyTitanite.name=å°æ’®æ¦çŸ³ç²‰
-item.itemDustSmallTitanite.name=å°å †æ¦çŸ³ç²‰
-item.crushedTitanite.name=粉碎的æ¦çŸ³çŸ¿çŸ³
-item.crushedCentrifugedTitanite.name=离心æ¦çŸ³çŸ¿çŸ³
-item.crushedPurifiedTitanite.name=洗净的æ¦çŸ³çŸ¿çŸ³
-item.dustImpureTitanite.name=å«æ‚æ¦çŸ³ç²‰
-item.dustPureTitanite.name=æ´å‡€æ¦çŸ³ç²‰
-item.itemDustZimbabweite.name=é’›é“Œé“…é’ çŸ³ç²‰
-item.itemDustTinyZimbabweite.name=å°æ’®é’›é“Œé“…é’ çŸ³ç²‰
-item.itemDustSmallZimbabweite.name=å°å †é’›é“Œé“…é’ çŸ³ç²‰
-item.crushedZimbabweite.name=ç²‰ç¢Žçš„é’›é“Œé“…é’ çŸ³çŸ¿çŸ³
-item.crushedCentrifugedZimbabweite.name=ç¦»å¿ƒé’›é“Œé“…é’ çŸ³çŸ¿çŸ³
-item.crushedPurifiedZimbabweite.name=æ´—å‡€çš„é’›é“Œé“…é’ çŸ³çŸ¿çŸ³
-item.dustImpureZimbabweite.name=å«æ‚é’›é“Œé“…é’ çŸ³ç²‰
-item.dustPureZimbabweite.name=æ´å‡€é’›é“Œé“…é’ çŸ³ç²‰
-item.itemDustZirconolite.name=钛锆é’矿粉
-item.itemDustTinyZirconolite.name=å°æ’®é’›é”†é’矿粉
-item.itemDustSmallZirconolite.name=å°å †é’›é”†é’矿粉
-item.crushedZirconolite.name=粉碎的钛锆é’矿矿石
-item.crushedCentrifugedZirconolite.name=离心钛锆é’矿矿石
-item.crushedPurifiedZirconolite.name=洗净的钛锆é’矿矿石
-item.dustImpureZirconolite.name=å«æ‚钛锆é’矿粉
-item.dustPureZirconolite.name=æ´å‡€é’›é”†é’矿粉
-item.itemDustGadoliniteCe.name=ç¡…é“钇矿(Ce)粉
-item.itemDustTinyGadoliniteCe.name=å°æ’®ç¡…é“钇矿(Ce)粉
-item.itemDustSmallGadoliniteCe.name=å°å †ç¡…é“钇矿(Ce)粉
-item.crushedGadoliniteCe.name=粉碎的硅é“钇矿(Ce)矿石
-item.crushedCentrifugedGadoliniteCe.name=离心硅é“钇矿(Ce)矿石
-item.crushedPurifiedGadoliniteCe.name=洗净的硅é“钇矿(Ce)矿石
-item.dustImpureGadoliniteCe.name=å«æ‚ç¡…é“钇矿(Ce)粉
-item.dustPureGadoliniteCe.name=æ´å‡€ç¡…é“钇矿(Ce)粉
-item.itemDustGadoliniteY.name=ç¡…é“钇矿(Y)粉
-item.itemDustTinyGadoliniteY.name=å°æ’®ç¡…é“钇矿(Y)粉
-item.itemDustSmallGadoliniteY.name=å°å †ç¡…é“钇矿(Y)粉
-item.crushedGadoliniteY.name=粉碎的硅é“钇矿(Y)矿石
-item.crushedCentrifugedGadoliniteY.name=离心硅é“钇矿(Y)矿石
-item.crushedPurifiedGadoliniteY.name=洗净的硅é“钇矿(Y)矿石
-item.dustImpureGadoliniteY.name=å«æ‚ç¡…é“钇矿(Y)粉
-item.dustPureGadoliniteY.name=æ´å‡€ç¡…é“钇矿(Y)粉
-item.itemDustLepersonnite.name=绿泥石粉
-item.itemDustTinyLepersonnite.name=å°æ’®ç»¿æ³¥çŸ³ç²‰
-item.itemDustSmallLepersonnite.name=å°å †ç»¿æ³¥çŸ³ç²‰
-item.crushedLepersonnite.name=粉碎的绿泥石矿石
-item.crushedCentrifugedLepersonnite.name=离心绿泥石矿石
-item.crushedPurifiedLepersonnite.name=洗净的绿泥石矿石
-item.dustImpureLepersonnite.name=å«æ‚绿泥石粉
-item.dustPureLepersonnite.name=æ´å‡€ç»¿æ³¥çŸ³ç²‰
-item.itemDustSamarskiteY.name=铌钇矿(Y)粉
-item.itemDustTinySamarskiteY.name=å°æ’®é“Œé’‡çŸ¿(Y)粉
-item.itemDustSmallSamarskiteY.name=å°å †é“Œé’‡çŸ¿(Y)粉
-item.crushedSamarskiteY.name=粉碎的铌钇矿(Y)矿石
-item.crushedCentrifugedSamarskiteY.name=离心铌钇矿(Y)矿石
-item.crushedPurifiedSamarskiteY.name=洗净的铌钇矿(Y)矿石
-item.dustImpureSamarskiteY.name=å«æ‚铌钇矿(Y)粉
-item.dustPureSamarskiteY.name=æ´å‡€é“Œé’‡çŸ¿(Y)粉
-item.itemDustSamarskiteYb.name=铌钇矿(Yb)粉
-item.itemDustTinySamarskiteYb.name=å°æ’®é“Œé’‡çŸ¿(Yb)粉
-item.itemDustSmallSamarskiteYb.name=å°å †é“Œé’‡çŸ¿(Yb)粉
-item.crushedSamarskiteYb.name=粉碎的铌钇矿(Yb)矿石
-item.crushedCentrifugedSamarskiteYb.name=离心铌钇矿(Yb)矿石
-item.crushedPurifiedSamarskiteYb.name=洗净的铌钇矿(Yb)矿石
-item.dustImpureSamarskiteYb.name=å«æ‚铌钇矿(Yb)粉
-item.dustPureSamarskiteYb.name=æ´å‡€é“Œé’‡çŸ¿(Yb)粉
-item.itemDustXenotime.name=磷钇矿粉
-item.itemDustTinyXenotime.name=å°æ’®ç£·é’‡çŸ¿ç²‰
-item.itemDustSmallXenotime.name=å°å †ç£·é’‡çŸ¿ç²‰
-item.crushedXenotime.name=粉碎的磷钇矿矿石
-item.crushedCentrifugedXenotime.name=离心磷钇矿矿石
-item.crushedPurifiedXenotime.name=洗净的磷钇矿矿石
-item.dustImpureXenotime.name=å«æ‚磷钇矿粉
-item.dustPureXenotime.name=æ´å‡€ç£·é’‡çŸ¿ç²‰
-item.itemDustYttriaite.name=钇矿粉
-item.itemDustTinyYttriaite.name=å°æ’®é’‡çŸ¿ç²‰
-item.itemDustSmallYttriaite.name=å°å †é’‡çŸ¿ç²‰
-item.crushedYttriaite.name=粉碎的钇矿矿石
-item.crushedCentrifugedYttriaite.name=离心钇矿矿石
-item.crushedPurifiedYttriaite.name=洗净的钇矿矿石
-item.dustImpureYttriaite.name=å«æ‚钇矿粉
-item.dustPureYttriaite.name=æ´å‡€é’‡çŸ¿ç²‰
-item.itemDustYttrialite.name=ç¡…é’钇矿粉
-item.itemDustTinyYttrialite.name=å°æ’®ç¡…é’钇矿粉
-item.itemDustSmallYttrialite.name=å°å †ç¡…é’钇矿粉
-item.crushedYttrialite.name=粉碎的硅é’钇矿矿石
-item.crushedCentrifugedYttrialite.name=离心硅é’钇矿矿石
-item.crushedPurifiedYttrialite.name=洗净的硅é’钇矿矿石
-item.dustImpureYttrialite.name=å«æ‚ç¡…é’钇矿粉
-item.dustPureYttrialite.name=æ´å‡€ç¡…é’钇矿粉
-item.itemDustYttrocerite.name=铈钇矿粉
-item.itemDustTinyYttrocerite.name=å°æ’®é“ˆé’‡çŸ¿ç²‰
-item.itemDustSmallYttrocerite.name=å°å †é“ˆé’‡çŸ¿ç²‰
-item.crushedYttrocerite.name=粉碎的铈钇矿矿石
-item.crushedCentrifugedYttrocerite.name=离心铈钇矿矿石
-item.crushedPurifiedYttrocerite.name=洗净的铈钇矿矿石
-item.dustImpureYttrocerite.name=å«æ‚铈钇矿粉
-item.dustPureYttrocerite.name=æ´å‡€é“ˆé’‡çŸ¿ç²‰
-item.itemDustZircon.name=锆石粉
-item.itemDustTinyZircon.name=å°æ’®é”†çŸ³ç²‰
-item.itemDustSmallZircon.name=å°å †é”†çŸ³ç²‰
-item.crushedZircon.name=粉碎的锆石矿石
-item.crushedCentrifugedZircon.name=离心锆石矿石
-item.crushedPurifiedZircon.name=洗净的锆石矿石
-item.dustImpureZircon.name=å«æ‚锆石粉
-item.dustPureZircon.name=æ´å‡€é”†çŸ³ç²‰
-item.itemDustPolycrase.name=锗铀钇矿粉
-item.itemDustTinyPolycrase.name=å°æ’®é”—铀钇矿粉
-item.itemDustSmallPolycrase.name=å°å †é”—铀钇矿粉
-item.crushedPolycrase.name=粉碎的锗铀钇矿矿石
-item.crushedCentrifugedPolycrase.name=离心锗铀钇矿矿石
-item.crushedPurifiedPolycrase.name=洗净的锗铀钇矿矿石
-item.dustImpurePolycrase.name=å«æ‚锗铀钇矿粉
-item.dustPurePolycrase.name=æ´å‡€é”—铀钇矿粉
-item.itemDustZircophyllite.name=锆星å¶çŸ³ç²‰
-item.itemDustTinyZircophyllite.name=å°æ’®é”†æ˜Ÿå¶çŸ³ç²‰
-item.itemDustSmallZircophyllite.name=å°å †é”†æ˜Ÿå¶çŸ³ç²‰
-item.crushedZircophyllite.name=粉碎的锆星å¶çŸ³çŸ¿çŸ³
-item.crushedCentrifugedZircophyllite.name=离心锆星å¶çŸ³çŸ¿çŸ³
-item.crushedPurifiedZircophyllite.name=洗净的锆星å¶çŸ³çŸ¿çŸ³
-item.dustImpureZircophyllite.name=å«æ‚锆星å¶çŸ³ç²‰
-item.dustPureZircophyllite.name=æ´å‡€é”†æ˜Ÿå¶çŸ³ç²‰
-item.itemDustZirkelite.name=锆英石粉
-item.itemDustTinyZirkelite.name=å°æ’®é”†è‹±çŸ³ç²‰
-item.itemDustSmallZirkelite.name=å°å †é”†è‹±çŸ³ç²‰
-item.crushedZirkelite.name=粉碎的锆英石矿石
-item.crushedCentrifugedZirkelite.name=离心锆英石矿石
-item.crushedPurifiedZirkelite.name=洗净的锆英石矿石
-item.dustImpureZirkelite.name=å«æ‚锆英石粉
-item.dustPureZirkelite.name=æ´å‡€é”†è‹±çŸ³ç²‰
-item.itemDustLanthaniteLa.name=镧石(La)粉
-item.itemDustTinyLanthaniteLa.name=å°æ’®é•§çŸ³(La)粉
-item.itemDustSmallLanthaniteLa.name=å°å †é•§çŸ³(La)粉
-item.crushedLanthaniteLa.name=粉碎的镧石(La)矿石
-item.crushedCentrifugedLanthaniteLa.name=离心镧石(La)矿石
-item.crushedPurifiedLanthaniteLa.name=洗净的镧石(La)矿石
-item.dustImpureLanthaniteLa.name=å«æ‚镧石(La)粉
-item.dustPureLanthaniteLa.name=æ´å‡€é•§çŸ³(La)粉
-item.itemDustLanthaniteCe.name=镧石(Ce)粉
-item.itemDustTinyLanthaniteCe.name=å°æ’®é•§çŸ³(Ce)粉
-item.itemDustSmallLanthaniteCe.name=å°å †é•§çŸ³(Ce)粉
-item.crushedLanthaniteCe.name=粉碎的镧石(Ce)矿石
-item.crushedCentrifugedLanthaniteCe.name=离心镧石(Ce)矿石
-item.crushedPurifiedLanthaniteCe.name=洗净的镧石(Ce)矿石
-item.dustImpureLanthaniteCe.name=å«æ‚镧石(Ce)粉
-item.dustPureLanthaniteCe.name=æ´å‡€é•§çŸ³(Ce)粉
-item.itemDustLanthaniteNd.name=镧石(Nd)粉
-item.itemDustTinyLanthaniteNd.name=å°æ’®é•§çŸ³(Nd)粉
-item.itemDustSmallLanthaniteNd.name=å°å †é•§çŸ³(Nd)粉
-item.crushedLanthaniteNd.name=粉碎的镧石(Nd)矿石
-item.crushedCentrifugedLanthaniteNd.name=离心镧石(Nd)矿石
-item.crushedPurifiedLanthaniteNd.name=洗净的镧石(Nd)矿石
-item.dustImpureLanthaniteNd.name=å«æ‚镧石(Nd)粉
-item.dustPureLanthaniteNd.name=æ´å‡€é•§çŸ³(Nd)粉
-item.itemDustAgarditeY.name=è±é“矿(Y)粉
-item.itemDustTinyAgarditeY.name=å°æ’®è±é“矿(Y)粉
-item.itemDustSmallAgarditeY.name=å°å †è±é“矿(Y)粉
-item.crushedAgarditeY.name=粉碎的è±é“矿(Y)矿石
-item.crushedCentrifugedAgarditeY.name=离心è±é“矿(Y)矿石
-item.crushedPurifiedAgarditeY.name=洗净的è±é“矿(Y)矿石
-item.dustImpureAgarditeY.name=å«æ‚è±é“矿(Y)粉
-item.dustPureAgarditeY.name=æ´å‡€è±é“矿(Y)粉
-item.itemDustAgarditeCd.name=è±é“矿(Cd)粉
-item.itemDustTinyAgarditeCd.name=å°æ’®è±é“矿(Cd)粉
-item.itemDustSmallAgarditeCd.name=å°å †è±é“矿(Cd)粉
-item.crushedAgarditeCd.name=粉碎的è±é“矿(Cd)矿石
-item.crushedCentrifugedAgarditeCd.name=离心è±é“矿(Cd)矿石
-item.crushedPurifiedAgarditeCd.name=洗净的è±é“矿(Cd)矿石
-item.dustImpureAgarditeCd.name=å«æ‚è±é“矿(Cd)粉
-item.dustPureAgarditeCd.name=æ´å‡€è±é“矿(Cd)粉
-item.itemDustAgarditeLa.name=è±é“矿(La)粉
-item.itemDustTinyAgarditeLa.name=å°æ’®è±é“矿(La)粉
-item.itemDustSmallAgarditeLa.name=å°å †è±é“矿(La)粉
-item.crushedAgarditeLa.name=粉碎的è±é“矿(La)矿石
-item.crushedCentrifugedAgarditeLa.name=离心è±é“矿(La)矿石
-item.crushedPurifiedAgarditeLa.name=洗净的è±é“矿(La)矿石
-item.dustImpureAgarditeLa.name=å«æ‚è±é“矿(La)粉
-item.dustPureAgarditeLa.name=æ´å‡€è±é“矿(La)粉
-item.itemDustAgarditeNd.name=è±é“矿(Nd)粉
-item.itemDustTinyAgarditeNd.name=å°æ’®è±é“矿(Nd)粉
-item.itemDustSmallAgarditeNd.name=å°å †è±é“矿(Nd)粉
-item.crushedAgarditeNd.name=粉碎的è±é“矿(Nd)矿石
-item.crushedCentrifugedAgarditeNd.name=离心è±é“矿(Nd)矿石
-item.crushedPurifiedAgarditeNd.name=洗净的è±é“矿(Nd)矿石
-item.dustImpureAgarditeNd.name=å«æ‚è±é“矿(Nd)粉
-item.dustPureAgarditeNd.name=æ´å‡€è±é“矿(Nd)粉
-item.itemDustHibonite.name=黑é“钙石粉
-item.itemDustTinyHibonite.name=å°æ’®é»‘é“钙石粉
-item.itemDustSmallHibonite.name=å°å †é»‘é“钙石粉
-item.crushedHibonite.name=粉碎的黑é“钙石矿石
-item.crushedCentrifugedHibonite.name=离心黑é“钙石矿石
-item.crushedPurifiedHibonite.name=洗净的黑é“钙石矿石
-item.dustImpureHibonite.name=å«æ‚黑é“钙石粉
-item.dustPureHibonite.name=æ´å‡€é»‘é“钙石粉
-item.itemDustCerite.name=铈硅石粉
-item.itemDustTinyCerite.name=å°æ’®é“ˆç¡…石粉
-item.itemDustSmallCerite.name=å°å †é“ˆç¡…石粉
-item.crushedCerite.name=粉碎的铈硅石矿石
-item.crushedCentrifugedCerite.name=离心铈硅石矿石
-item.crushedPurifiedCerite.name=洗净的铈硅石矿石
-item.dustImpureCerite.name=å«æ‚铈硅石粉
-item.dustPureCerite.name=æ´å‡€é“ˆç¡…石粉
-item.itemDustFluorcaphite.name=氟碳铈矿粉
-item.itemDustTinyFluorcaphite.name=å°æ’®æ°Ÿç¢³é“ˆçŸ¿ç²‰
-item.itemDustSmallFluorcaphite.name=å°å †æ°Ÿç¢³é“ˆçŸ¿ç²‰
-item.crushedFluorcaphite.name=粉碎的氟碳铈矿矿石
-item.crushedCentrifugedFluorcaphite.name=离心氟碳铈矿矿石
-item.crushedPurifiedFluorcaphite.name=洗净的氟碳铈矿矿石
-item.dustImpureFluorcaphite.name=å«æ‚氟碳铈矿粉
-item.dustPureFluorcaphite.name=æ´å‡€æ°Ÿç¢³é“ˆçŸ¿ç²‰
-item.itemDustFlorencite.name=磷é“铈矿粉
-item.itemDustTinyFlorencite.name=å°æ’®ç£·é“铈矿粉
-item.itemDustSmallFlorencite.name=å°å †ç£·é“铈矿粉
-item.crushedFlorencite.name=粉碎的磷é“铈矿矿石
-item.crushedCentrifugedFlorencite.name=离心磷é“铈矿矿石
-item.crushedPurifiedFlorencite.name=洗净的磷é“铈矿矿石
-item.dustImpureFlorencite.name=å«æ‚磷é“铈矿粉
-item.dustPureFlorencite.name=æ´å‡€ç£·é“铈矿粉
-item.itemDustCryolite.name=冰晶石粉
-item.itemDustTinyCryolite.name=å°æ’®å†°æ™¶çŸ³ç²‰
-item.itemDustSmallCryolite.name=å°å †å†°æ™¶çŸ³ç²‰
-item.crushedCryolite.name=粉碎的冰晶石矿石
-item.crushedCentrifugedCryolite.name=离心冰晶石矿石
-item.crushedPurifiedCryolite.name=洗净的冰晶石矿石
-item.dustImpureCryolite.name=å«æ‚冰晶石粉
-item.dustPureCryolite.name=æ´å‡€å†°æ™¶çŸ³ç²‰
-item.itemDustTinyYellorium.name=å°æ’®é»„铀矿粉
-item.itemDustSmallYellorium.name=å°å †é»„铀矿粉
-item.crushedYellorium.name=粉碎的黄铀矿矿石
-item.crushedCentrifugedYellorium.name=离心黄铀矿矿石
-item.crushedPurifiedYellorium.name=洗净的黄铀矿矿石
-item.dustImpureYellorium.name=å«æ‚黄铀矿粉
-item.dustPureYellorium.name=æ´å‡€é»„铀矿粉
-
-//Shards
-item.itemDrained.name=枯ç«ç¢Žç‰‡
-item.itemDustInfusedAir.name=风之é”晶粉
-item.itemDustInfusedFire.name=ç«ä¹‹é”晶粉
-item.itemDustInfusedEarth.name=地之é”晶粉
-item.itemDustInfusedWater.name=水之é”晶粉
-
-
-//Misc Material Items
-item.itemDustLithiumCarbonate.name=碳酸锂粉
-item.itemDustSmallLithiumCarbonate.name=å°å †ç¢³é…¸é”‚粉
-item.itemDustTinyLithiumCarbonate.name=å°æ’®ç¢³é…¸é”‚粉
-item.itemDustLithiumPeroxide.name=过氧化锂粉
-item.itemDustSmallLithiumPeroxide.name=å°å †è¿‡æ°§åŒ–锂粉
-item.itemDustTinyLithiumPeroxide.name=å°æ’®è¿‡æ°§åŒ–锂粉
-item.itemDustLithiumHydroxide.name=氢氧化锂粉
-item.itemDustSmallLithiumHydroxide.name=å°å †æ°¢æ°§åŒ–锂粉
-item.itemDustTinyLithiumHydroxide.name=å°æ’®æ°¢æ°§åŒ–锂粉
-item.itemDustCalciumHydroxide.name=氢氧化钙粉
-item.itemDustSmallCalciumHydroxide.name=å°å †æ°¢æ°§åŒ–钙粉
-item.itemDustTinyCalciumHydroxide.name=å°æ’®æ°¢æ°§åŒ–钙粉
-item.itemDustCalciumCarbonate.name=碳酸钙粉
-item.itemDustSmallCalciumCarbonate.name=å°å †ç¢³é…¸é’™ç²‰
-item.itemDustTinyCalciumCarbonate.name=å°æ’®ç¢³é…¸é’™ç²‰
-item.itemDustGypsum.name=硫酸钙(石è†)粉
-item.itemDustSmallGypsum.name=å°å †ç¡«é…¸é’™(石è†)粉
-item.itemDustTinyGypsum.name=å°æ’®ç¡«é…¸é’™(石è†)粉
-item.itemDustLi2CO3CaOH2.name=碳酸锂+氢氧化钙å¤åˆç‰©ç²‰
-item.itemDustSmallLi2CO3CaOH2.name=å°å †ç¢³é…¸é”‚+氢氧化钙å¤åˆç‰©ç²‰
-item.itemDustTinyLi2CO3CaOH2.name=å°æ’®ç¢³é…¸é”‚+氢氧化钙å¤åˆç‰©ç²‰
-item.itemDustLi2BeF4.name=Li2BeF4 燃料å¤åˆç‰©ç²‰
-item.itemDustSmallLi2BeF4.name=å°å †Li2BeF4燃料å¤åˆç‰©ç²‰
-item.itemDustTinyLi2BeF4.name=å°æ’®Li2BeF4燃料å¤åˆç‰©ç²‰
-item.Li2BeF4.name=Li2BeF4å•å…ƒ
-item.itemCircuitLFTR.name=§a§a控制电路
-item.itemZirconiumPellet.name=锆颗粒[氯化锆]
-item.itemDustZrCl4.name=氯化锆粉
-item.itemDustSmallZrCl4.name=å°å †æ°¯åŒ–锆粉
-item.itemDustTinyZrCl4.name=å°æ’®æ°¯åŒ–锆粉
-item.itemDustCookedZrCl4.name=焙烧过的氯化锆粉
-item.itemDustSmallCookedZrCl4.name=å°å †ç„™çƒ§è¿‡çš„氯化锆粉
-item.itemDustTinyCookedZrCl4.name=å°æ’®ç„™çƒ§è¿‡çš„氯化锆粉
-item.itemDustUN18Fertiliser.name=æµä½“肥料UN-18粉
-item.itemDustSmallUN18Fertiliser.name=å°å †æµä½“肥料UN-18粉
-item.itemDustTinyUN18Fertiliser.name=å°æ’®æµä½“肥料un-18粉
-item.itemDustUN32Fertiliser.name=æµä½“肥料UN-32粉
-item.itemDustSmallUN32Fertiliser.name=å°å †æµä½“肥料UN-32粉
-item.itemDustTinyUN32Fertiliser.name=å°æ’®æµä½“肥料UN-32粉
-item.itemNuggetPlutonium239.name=é’š 239ç²’
-item.itemCellPlutonium239.name=é’š 239å•å…ƒ
-item.itemIngotPlutonium239.name=é’š 239é”
-item.itemPlatePlutonium239.name=é’š 239æ¿
-item.itemPlateDoublePlutonium239.name=åŒé‡é’š 239æ¿
-item.itemDustPlutonium239.name=钚 239粉
-item.itemDustSmallPlutonium239.name=å°å †é’š 239粉
-item.itemDustTinyPlutonium239.name=å°æ’®é’š 239粉
-
-
-//Multitools
-item.AluminiumMultipick.name=é“å¤åˆç¨¿
-item.AluminiumMultispade.name=é“å¤åˆé“²
-item.BerylliumMultispade.name=é“å¤åˆé“²
-item.BismuthMultispade.name=é“‹å¤åˆé“²
-item.CarbonMultispade.name=碳å¤åˆé“²
-item.ChromeMultipick.name=铬å¤åˆç¨¿
-item.ChromeMultispade.name=铬å¤åˆé“²
-item.CobaltMultipick.name=é’´å¤åˆç¨¿
-item.CobaltMultispade.name=é’´å¤åˆé“²
-item.GoldMultispade.name=金å¤åˆé“²
-item.IridiumMultipick.name=铱å¤åˆç¨¿
-item.IridiumMultispade.name=铱å¤åˆé“²
-item.IronMultipick.name=é“å¤åˆç¨¿
-item.IronMultispade.name=é“å¤åˆé“²
-item.LeadMultispade.name=é“…å¤åˆé“²
-item.ManganeseMultipick.name=é”°å¤åˆç¨¿
-item.ManganeseMultispade.name=é”°å¤åˆé“²
-item.MolybdenumMultipick.name=é’¼å¤åˆç¨¿
-item.MolybdenumMultispade.name=é’¼å¤åˆé“²
-item.NeodymiumMultipick.name=é’•å¤åˆé•
-item.NeodymiumMultispade.name=é’•å¤åˆé“²
-item.NeutroniumMultipick.name=ä¸åç´ å¤åˆé•
-item.NeutroniumMultispade.name=ä¸åç´ å¤åˆé“²
-item.NickelMultispade.name=é•å¤åˆé“²
-item.OsmiumMultipick.name=锇å¤åˆé•
-item.OsmiumMultispade.name=锇å¤åˆé“²
-item.PalladiumMultipick.name=é’¯å¤åˆé•
-item.PalladiumMultispade.name=é’¯å¤åˆé“²
-item.PlatinumMultispade.name=é“‚å¤åˆé“²
-item.Plutonium241Multipick.name=é’š 241å¤åˆé•
-item.Plutonium241Multispade.name=é’š 241å¤åˆé“²
-item.SilverMultispade.name=银å¤åˆé“²
-item.ThoriumMultipick.name=é’å¤åˆé•
-item.ThoriumMultispade.name=é’å¤åˆé“²
-item.TitaniumMultipick.name=é’›å¤åˆé•
-item.TitaniumMultispade.name=é’›å¤åˆé“²
-item.TungstenMultipick.name=é’¨å¤åˆé•
-item.TungstenMultispade.name=é’¨å¤åˆé“²
-item.Uranium235Multipick.name=é“€ 235å¤åˆé•
-item.Uranium235Multispade.name=é“€ 235å¤åˆé“²
-item.DarkSteelMultipick.name=玄钢å¤åˆé•
-item.DarkSteelMultispade.name=玄钢å¤åˆé“²
-item.DuraniumMultipick.name=é“¿é“€å¤åˆé•
-item.DuraniumMultispade.name=é“¿é“€å¤åˆé“²
-item.InfusedGoldMultispade.name=注é”金å¤åˆé“²
-item.NaquadahMultipick.name=硅岩å¤åˆé•
-item.NaquadahMultispade.name=硅岩å¤åˆé“²
-item.NaquadahAlloyMultipick.name=硅岩åˆé‡‘å¤åˆé•
-item.NaquadahAlloyMultispade.name=硅岩åˆé‡‘å¤åˆé“²
-item.NaquadriaMultipick.name=超能硅岩å¤åˆé•
-item.NaquadriaMultispade.name=超能硅岩å¤åˆé“²
-item.TritaniumMultipick.name=三钛å¤åˆé•
-item.TritaniumMultispade.name=三钛å¤åˆé“²
-item.OsmiridiumMultipick.name=铱锇åˆé‡‘å¤åˆé•
-item.OsmiridiumMultispade.name=铱锇åˆé‡‘å¤åˆé“²
-item.BrassMultispade.name=黄铜å¤åˆé“²
-item.BronzeMultipick.name=é’é“œå¤åˆé•
-item.BronzeMultispade.name=é’é“œå¤åˆé“²
-item.CupronickelMultispade.name=白铜å¤åˆé“²
-item.ElectrumMultispade.name=ç¥ç€é‡‘å¤åˆé“²
-item.InvarMultipick.name=æ®·é’¢å¤åˆé•
-item.InvarMultispade.name=æ®·é’¢å¤åˆé“²
-item.KanthalMultispade.name=åŽå¡”å°”åˆé‡‘å¤åˆé“²
-item.MagnaliumMultipick.name=é•é“åˆé‡‘å¤åˆé•
-item.MagnaliumMultispade.name=é•é“åˆé‡‘å¤åˆé“²
-item.NichromeMultispade.name=é•é“¬åˆé‡‘å¤åˆé“²
-item.PigIronMultipick.name=生é“å¤åˆé•
-item.PigIronMultispade.name=生é“å¤åˆé“²
-item.PolycaprolactamMultispade.name=èšå·±å†…酰胺å¤åˆé“²
-item.PolytetrafluoroethyleneMultispade.name=èšå››æ°Ÿä¹™çƒ¯å¤åˆé“²
-item.NickelZincFerriteMultispade.name=é•é”Œé“氧体å¤åˆé“²
-item.PolyphenyleneSulfideMultispade.name=èšè‹¯ç¡«é†šå¤åˆé“²
-item.StainlessSteelMultipick.name=ä¸é”ˆé’¢å¤åˆé•
-item.StainlessSteelMultispade.name=ä¸é”ˆé’¢å¤åˆé“²
-item.SteelMultipick.name=é’¢å¤åˆé•
-item.SteelMultispade.name=é’¢å¤åˆé“²
-item.TinAlloyMultispade.name=锡é“åˆé‡‘å¤åˆé“²
-item.UltimetMultipick.name=哈æ°åˆé‡‘å¤åˆé•
-item.UltimetMultispade.name=哈æ°åˆé‡‘å¤åˆé“²
-item.WroughtIronMultipick.name=é”»é“å¤åˆé•
-item.WroughtIronMultispade.name=é”»é“å¤åˆé“²
-item.SterlingSilverMultipick.name=æ ‡å‡†çº¯é“¶å¤åˆé•
-item.SterlingSilverMultispade.name=æ ‡å‡†çº¯é“¶å¤åˆé“²
-item.RoseGoldMultipick.name=玫瑰金å¤åˆé•
-item.RoseGoldMultispade.name=玫瑰金å¤åˆé“²
-item.BlackBronzeMultipick.name=黑é’é“œå¤åˆé•
-item.BlackBronzeMultispade.name=黑é’é“œå¤åˆé“²
-item.BismuthBronzeMultipick.name=é“‹é’é“œå¤åˆé•
-item.BismuthBronzeMultispade.name=é“‹é’é“œå¤åˆé“²
-item.BlackSteelMultipick.name=黑钢å¤åˆé•
-item.BlackSteelMultispade.name=黑钢å¤åˆé“²
-item.RedSteelMultipick.name=红钢å¤åˆé•
-item.RedSteelMultispade.name=红钢å¤åˆé“²
-item.BlueSteelMultipick.name=è“é’¢å¤åˆé•
-item.BlueSteelMultispade.name=è“é’¢å¤åˆé“²
-item.DamascusSteelMultipick.name=大马士é©é’¢å¤åˆé•
-item.DamascusSteelMultispade.name=大马士é©é’¢å¤åˆé“²
-item.MithrilMultispade.name=秘银å¤åˆé“²
-item.CobaltBrassMultipick.name=钴黄铜å¤åˆé•
-item.CobaltBrassMultispade.name=钴黄铜å¤åˆé“²
-item.ThaumiumMultipick.name=神秘é”å¤åˆé•
-item.ThaumiumMultispade.name=神秘é”å¤åˆé“²
-item.HSSGMultipick.name=高速钢-Gå¤åˆé•
-item.HSSGMultispade.name=高速钢-Gå¤åˆé“²
-item.HSSEMultipick.name=高速钢-Eå¤åˆé•
-item.HSSEMultispade.name=高速钢-Eå¤åˆé“²
-item.HSSSMultipick.name=高速钢-Så¤åˆé•
-item.HSSSMultispade.name=高速钢-Så¤åˆé“²
-item.HastelloyC276Multipick.name=哈斯特洛ä¾åˆé‡‘-C276å¤åˆé•
-item.HastelloyC276Multispade.name=哈斯特洛ä¾åˆé‡‘-C276å¤åˆé“²
-item.HastelloyNMultipick.name=哈斯特洛ä¾åˆé‡‘-Nå¤åˆé•
-item.HastelloyNMultispade.name=哈斯特洛ä¾åˆé‡‘-Nå¤åˆé“²
-item.HastelloyWMultipick.name=哈斯特洛ä¾åˆé‡‘-Wå¤åˆé•
-item.HastelloyWMultispade.name=哈斯特洛ä¾åˆé‡‘-Wå¤åˆé“²
-item.HastelloyXMultipick.name=哈斯特洛ä¾åˆé‡‘-Xå¤åˆé•
-item.HastelloyXMultispade.name=哈斯特洛ä¾åˆé‡‘-Xå¤åˆé“²
-item.Incoloy020Multipick.name=è€çƒé“¬é“åˆé‡‘-020å¤åˆé•
-item.Incoloy020Multispade.name=è€çƒé“¬é“åˆé‡‘-020å¤åˆé“²
-item.IncoloyDSMultipick.name=è€çƒé“¬é“åˆé‡‘-DSå¤åˆé•
-item.IncoloyDSMultispade.name=è€çƒé“¬é“åˆé‡‘-DSå¤åˆé“²
-item.IncoloyMA956Multipick.name=è€çƒé“¬é“åˆé‡‘-MA956å¤åˆé•
-item.IncoloyMA956Multispade.name=è€çƒé“¬é“åˆé‡‘-MA956å¤åˆé“²
-item.Inconel625Multipick.name=é•é“¬åŸºåˆé‡‘-625å¤åˆé•
-item.Inconel625Multispade.name=é•é“¬åŸºåˆé‡‘-625å¤åˆé“²
-item.Inconel690Multipick.name=é•é“¬åŸºåˆé‡‘-690å¤åˆé•
-item.Inconel690Multispade.name=é•é“¬åŸºåˆé‡‘-690å¤åˆé“²
-item.Inconel792Multipick.name=é•é“¬åŸºåˆé‡‘-792å¤åˆé•
-item.Inconel792Multispade.name=é•é“¬åŸºåˆé‡‘-792å¤åˆé“²
-item.GrisiumMultipick.name=ç°é’›åˆé‡‘å¤åˆé•
-item.GrisiumMultispade.name=ç°é’›åˆé‡‘å¤åˆé“²
-item.Tantalloy60Multipick.name=钽钨åˆé‡‘-60å¤åˆé•
-item.Tantalloy60Multispade.name=钽钨åˆé‡‘-60å¤åˆé“²
-item.Tantalloy61Multipick.name=钽钨åˆé‡‘-61å¤åˆé•
-item.Tantalloy61Multispade.name=钽钨åˆé‡‘-61å¤åˆé“²
-item.StaballoyMultipick.name=è´«é“€åˆé‡‘å¤åˆé•
-item.StaballoyMultispade.name=è´«é“€åˆé‡‘å¤åˆé“²
-item.QuantumMultipick.name=é‡ååˆé‡‘å¤åˆé•
-item.QuantumMultispade.name=é‡ååˆé‡‘å¤åˆé“²
-item.PotinMultipick.name=ç²—é’é“œåˆé‡‘å¤åˆé•
-item.PotinMultispade.name=ç²—é’é“œåˆé‡‘å¤åˆé“²
-item.TumbagaMultipick.name=铜金åˆé‡‘å¤åˆé•
-item.TumbagaMultispade.name=铜金åˆé‡‘å¤åˆé“²
-item.TaloniteMultipick.name=铬钴磷酸ç›åˆé‡‘å¤åˆé•
-item.TaloniteMultispade.name=铬钴磷酸ç›åˆé‡‘å¤åˆé“²
-item.StelliteMultipick.name=铬钴锰钛åˆé‡‘å¤åˆé•
-item.StelliteMultispade.name=铬钴锰钛åˆé‡‘å¤åˆé“²
-item.TungstenCarbideMultipick.name=碳化钨å¤åˆé•
-item.TungstenCarbideMultispade.name=碳化钨å¤åˆé“²
-item.TantalumCarbideMultipick.name=碳化钽å¤åˆé•
-item.TantalumCarbideMultispade.name=碳化钽å¤åˆé“²
-
-
-//Items that Don't fit into another category
-
-//Plates
-item.itemPlateClay.name=粘土æ¿
-item.itemPlateDoubleClay.name=åŒé‡ç²˜åœŸæ¿
-item.itemPlateLithium.name=锂æ¿
-item.itemPlateDoubleEuropium.name=åŒé‡é“•æ¿
-
-//Gears
-item.itemSmallGearWroughtIron.name=å°åž‹é”»é“齿轮
-
-//Misc
-item.itemFoilUranium235.name=é“€235ç®”
-
-item.itemBoilerChassis_0.name=高级锅炉外壳[1级]
-item.itemDehydratorCoilWire_0.name=ç¼ ç»•å¯¼çº¿ [EV]
-item.itemDehydratorCoil_0.name=脱水线圈 [EV]
-item.itemAirFilter_0.name=空气过滤器
-item.itemAirFilter_1.name=空气过滤器
-item.itemLavaFilter.name=岩浆过滤器
-item.itemGrindleTablet.name=Git
-item.itemDragonJar.name=é¾™æ•èŽ·ä¹‹å£¶
-item.CoalGas.name=煤气å•å…ƒ
-item.Ethylbenzene.name=乙苯å•å…ƒ
-item.Anthracene.name=è’½å•å…ƒ
-item.Toluene.name=甲苯å•å…ƒ
-item.CoalTar.name=煤焦油å•å…ƒ
-item.CoalTarOil.name=煤焦油å•å…ƒ
-item.SulfuricCoalTarOil.name=硫酸煤焦油å•å…ƒ
-item.Naphthalene.name=è˜å•å…ƒ
-item.PhthalicAcid.name=邻苯二甲酸å•å…ƒ
-item.itemDustPhthalicAnhydride.name=邻苯二甲酸é…粉
-item.itemDustSmallPhthalicAnhydride.name=å°å †é‚»è‹¯äºŒç”²é…¸é…粉
-item.itemDustTinyPhthalicAnhydride.name=å°æ’®é‚»è‹¯äºŒç”²é…¸é…粉
-item.2Ethylanthraquinone.name=2-乙基蒽醌å•å…ƒ
-item.2Ethylanthrahydroquinone.name=2-乙基氢蒽醌å•å…ƒ
-item.HydrogenPeroxide.name=过氧化氢å•å…ƒ
-item.itemDustLithiumHydroperoxide.name=过氧化氢锂粉
-item.itemDustSmallLithiumHydroperoxide.name=å°å †è¿‡æ°§åŒ–氢锂粉
-item.itemDustTinyLithiumHydroperoxide.name=å°æ’®è¿‡æ°§åŒ–氢锂粉
-item.LithiumPeroxide.name=过氧化锂å•å…ƒ
-item.itemPotionChilly.name=冰凉è¯æ°´
-item.itemKeyBig4000DC's.name=4000DC的大钥匙
-item.itemGemDull.name=沉闷å®çŸ³
-item.itemMushroomForest.name=森林蘑è‡
-item.itemPlateVanadium.name=é’’é’¢æ¿
-item.thekeytothecity.name=通往城市的钥匙
-item.modularbauble.name=模å—化饰å“
-item.itemDustSoularium.name=é‚金粉
-item.itemDustSmallSoularium.name=å°å †é‚金粉
-item.itemDustTinySoularium.name=å°æ’®é‚金粉
-item.itemDustRedstoneAlloy.name=红石åˆé‡‘粉
-item.itemDustSmallRedstoneAlloy.name=å°å †çº¢çŸ³åˆé‡‘粉
-item.itemDustTinyRedstoneAlloy.name=å°æ’®çº¢çŸ³åˆé‡‘粉
-item.itemDustElectricalSteel.name=ç£é’¢ç²‰
-item.itemDustSmallElectricalSteel.name=å°å †ç£é’¢ç²‰
-item.itemDustTinyElectricalSteel.name=å°æ’®ç£é’¢ç²‰
-item.itemDustPulsatingIron.name=脉冲é“粉
-item.itemDustSmallPulsatingIron.name=å°å †è„‰å†²é“粉
-item.itemDustTinyPulsatingIron.name=å°æ’®è„‰å†²é“粉
-item.itemDustEnergeticAlloy.name=充能åˆé‡‘粉
-item.itemDustSmallEnergeticAlloy.name=å°å †å……能åˆé‡‘粉
-item.itemDustTinyEnergeticAlloy.name=å°æ’®å……能åˆé‡‘粉
-item.itemDustVibrantAlloy.name=脉冲åˆé‡‘粉
-item.itemDustSmallVibrantAlloy.name=å°å †è„‰å†²åˆé‡‘粉
-item.itemDustTinyVibrantAlloy.name=å°æ’®è„‰å†²åˆé‡‘粉
-item.itemDustConductiveIron.name=导电é“粉
-item.itemDustSmallConductiveIron.name=å°å †å¯¼ç”µé“粉
-item.itemDustTinyConductiveIron.name=å°æ’®å¯¼ç”µé“粉
-item.itemPlateSoularium.name=é‚金æ¿
-item.itemPlateRedstoneAlloy.name=红石åˆé‡‘æ¿
-item.itemPlateElectricalSteel.name=ç£é’¢æ¿
-item.itemPlatePhasedIron.name=脉冲é“æ¿
-item.itemPlateEnergeticAlloy.name=充能åˆé‡‘æ¿
-item.itemPlateVibrantAlloy.name=脉冲åˆé‡‘æ¿
-item.itemPlateConductiveIron.name=导电é“æ¿
-item.itemPlateBlutonium.name=è“é’šæ¿
-item.itemPlateCyanite.name=è“晶石æ¿
-item.itemPlateLudicrite.name=纯镥æ¿
-item.itemPlateVoid.name=虚空æ¿
-item.itemPlateDimensionShard.name=维度碎片æ¿
-item.rfEUBattery.name=通用充电电æ±
-item.personalCloakingDevice.name=§9§9个人éšå½¢è£…置§7
-item.personalHealingDevice.name=§9§9ä¸ªäººçº³ç±³æ²»ç–—åŠ é€Ÿå™¨Â§r
-item.SlowBuildingRing.name=§e§e缓建指环§7
-item.itemStaballoyPickaxe.name=隧é“挖掘者
-item.itemStaballoyAxe.name=æ ‘æž—ç ä¼è€…
-item.itemSandstoneHammer.name=圆石粉碎者
-item.itemBufferCore1.name=能é‡æ ¸å¿ƒ [ULV]
-item.itemBufferCore2.name=能é‡æ ¸å¿ƒ [LV]
-item.itemBufferCore3.name=能é‡æ ¸å¿ƒ [MV]
-item.itemBufferCore4.name=能é‡æ ¸å¿ƒ [HV]
-item.itemBufferCore5.name=能é‡æ ¸å¿ƒ [EV]
-item.itemBufferCore6.name=能é‡æ ¸å¿ƒ [IV]
-item.itemBufferCore7.name=能é‡æ ¸å¿ƒ [LuV]
-item.itemBufferCore8.name=能é‡æ ¸å¿ƒ [ZPM]
-item.itemBufferCore9.name=能é‡æ ¸å¿ƒ [UV]
-item.itemBufferCore10.name=能é‡æ ¸å¿ƒ [MAX]
-item.itemPLACEHOLDER_Circuit.name=夸克æ“纵者 (UV)
-item.itembookgt.name=§o§oçƒåŠ›é”…炉手册
-
-// Everglade Items
-item.everglades.trigger.name=§6§6Alkalus圆盘[§c激活§6]
-
-
-
-
-
-
-
-//Blocks
-tile.blockRainforestOakLog.name=雨林橡木
-tile.blockRainforestOakLeaves.name=æ©¡æ ‘æ ‘å¶
-tile.blockRainforestOakSapling.name=é›¨æž—æ©¡æ ‘æ ‘è‹—
-
-//TC Stuff
-tile.blockFastAlchemyFurnace.0.name=æŸå
-tile.blockFastArcaneAlembic.1.name=æŸå
-
-//Frame Boxes
-tile.Block of Selenium.name=ç¡’å—
-tile.Selenium Frame Box.name=硒框架
-tile.Block of Bromine.name=溴å—
-tile.Block of Strontium.name=锶å—
-tile.Strontium Frame Box.name=锶框架
-tile.Block of Zirconium.name=锆å—
-tile.Zirconium Frame Box.name=锆框架
-tile.Block of Ruthenium.name=é’Œå—
-tile.Ruthenium Frame Box.name=钌框架
-tile.Block of Iodine.name=碘å—
-tile.Iodine Frame Box.name=碘框架
-tile.Block of Hafnium.name=铪å—
-tile.Hafnium Frame Box.name=铪框架
-tile.Block of Dysprosium.name=é•å—
-tile.Dysprosium Frame Box.name=é•æ¡†æž¶
-tile.Block of Tellurium.name=碲å—
-tile.Tellurium Frame Box.name=碲框架
-tile.Block of Rhodium.name=é“‘å—
-tile.Rhodium Frame Box.name=铑框架
-tile.Block of Rhenium.name=铼å—
-tile.Rhenium Frame Box.name=铼框架
-tile.Block of Thallium.name=é“Šå—
-tile.Thallium Frame Box.name=铊框架
-tile.Block of Technetium.name=é”å—
-tile.Block of Polonium.name=é’‹å—
-tile.Block of Astatine.name=ç ¹å—
-tile.Block of Francium.name=é’«å—
-tile.Block of Radium.name=é•å—
-tile.Block of Actinium.name=锕å—
-tile.Block of Protactinium.name=镤å—
-tile.Block of Neptunium.name=é•Žå—
-tile.Block of Curium.name=é””å—
-tile.Block of Berkelium.name=锫å—
-tile.Block of Californium.name=锎å—
-tile.Block of Einsteinium.name=锿å—
-tile.Block of Fermium.name=é•„å—
-tile.Block of Thorium 232.name=é’-232å—
-tile.Block of Uranium 232.name=é“€-232å—
-tile.Block of Uranium 233.name=é“€-233å—
-tile.Block of Plutonium-238.name=é’š-238å—
-tile.Block of Strontium-90.name=锶-90å—
-tile.Block of Polonium-210.name=é’‹-210å—
-tile.Block of Americium-241.name=é•…-241å—
-tile.Block of Silicon Carbide.name=碳化硅å—
-tile.Silicon Carbide Frame Box.name=碳化硅框架
-tile.Block of Zirconium Carbide.name=碳化锆å—
-tile.Zirconium Carbide Frame Box.name=碳化锆框架
-tile.Block of Tantalum Carbide.name=碳化钽å—
-tile.Tantalum Carbide Frame Box.name=碳化钽框架
-tile.Block of Niobium Carbide.name=碳化铌å—
-tile.Niobium Carbide Frame Box.name=碳化铌框架
-tile.Block of Beryllium Fluoride.name=氟化é“å—
-tile.Block of Lithium Fluoride.name=氟化锂å—
-tile.Block of Thorium Tetrafluoride.name=四氟化é’å—
-tile.Block of Thorium Hexafluoride.name=å…氟化é’å—
-tile.Block of Uranium Tetrafluoride.name=四氟化铀å—
-tile.Block of Uranium Hexafluoride.name=å…氟化铀å—
-tile.Block of Zirconium Tetrafluoride.name=四氟化锆å—
-tile.Block of Neptunium Hexafluoride.name=å…氟化镎å—
-tile.Block of Technetium Hexafluoride.name=å…氟化é”å—
-tile.Block of Selenium Hexafluoride.name=å…氟化硒å—
-tile.Block of LiFBeF2ZrF4U235.name=é“€235å¤åˆæ°ŸåŒ–物å—
-tile.Block of LiFBeF2ZrF4UF4.name=铀锆å¤åˆæ°ŸåŒ–物å—
-tile.Block of LiFBeF2ThF4UF4.name=é“€é’å¤åˆæ°ŸåŒ–物å—
-tile.Block of Energy Crystal.name=能é‡æ°´æ™¶å—
-tile.Energy Crystal Frame Box.name=能é‡æ°´æ™¶æ¡†æž¶
-tile.Block of Blood Steel.name=血钢å—
-tile.Blood Steel Frame Box.name=血钢框架
-tile.Block of Zeron-100.name=å¡žé¾™-100å—
-tile.Zeron-100 Frame Box.name=塞龙-100框架
-tile.Block of Tumbaga.name=铜金åˆé‡‘å—
-tile.Tumbaga Frame Box.name=铜金åˆé‡‘框架
-tile.Block of Potin.name=ç²—é’é“œåˆé‡‘å—
-tile.Potin Frame Box.name=ç²—é’é“œåˆé‡‘框架
-tile.Block of Staballoy.name=è´«é“€åˆé‡‘å—
-tile.Staballoy Frame Box.name=è´«é“€åˆé‡‘框架
-tile.Block of Tantalloy-60.name=钽钨åˆé‡‘-60å—
-tile.Tantalloy-60 Frame Box.name=钽钨åˆé‡‘-60框架
-tile.Block of Tantalloy-61.name=钽钨åˆé‡‘-61å—
-tile.Tantalloy-61 Frame Box.name=钽钨åˆé‡‘-61框架
-tile.Block of Inconel-625.name=é•é“¬åŸºåˆé‡‘-625å—
-tile.Inconel-625 Frame Box.name=é•é“¬åŸºåˆé‡‘-625框架
-tile.Block of Inconel-690.name=é•é“¬åŸºåˆé‡‘-690å—
-tile.Inconel-690 Frame Box.name=é•é“¬åŸºåˆé‡‘-690框架
-tile.Block of Inconel-792.name=é•é“¬åŸºåˆé‡‘-792å—
-tile.Inconel-792 Frame Box.name=é•é“¬åŸºåˆé‡‘-792框架
-tile.Block of Eglin Steel.name=åŸƒæ ¼æž—é’¢å—
-tile.Eglin Steel Frame Box.name=åŸƒæ ¼æž—é’¢æ¡†æž¶
-tile.Block of Maraging Steel 250.name=马æ°ä½“时效钢250å—
-tile.Maraging Steel 250 Frame Box.name=马æ°ä½“时效钢250框架
-tile.Block of Maraging Steel 300.name=马æ°ä½“时效钢300å—
-tile.Maraging Steel 300 Frame Box.name=马æ°ä½“时效钢300框架
-tile.Block of Maraging Steel 350.name=马æ°ä½“时效钢350å—
-tile.Maraging Steel 350 Frame Box.name=马æ°ä½“时效钢350框架
-tile.Block of Stellite.name=铬钴锰钛åˆé‡‘å—
-tile.Stellite Frame Box.name=铬钴锰钛åˆé‡‘框架
-tile.Block of Talonite.name=铬钴磷酸ç›åˆé‡‘å—
-tile.Talonite Frame Box.name=铬钴磷酸ç›åˆé‡‘框架
-tile.Block of Hastelloy-W.name=哈斯特洛ä¾åˆé‡‘-Wå—
-tile.Hastelloy-W Frame Box.name=哈斯特洛ä¾åˆé‡‘-W框架
-tile.Block of Hastelloy-X.name=哈斯特洛ä¾åˆé‡‘-Xå—
-tile.Hastelloy-X Frame Box.name=哈斯特洛ä¾åˆé‡‘-X框架
-tile.Block of Hastelloy-C276.name=哈斯特洛ä¾åˆé‡‘-C276å—
-tile.Hastelloy-C276 Frame Box.name=哈斯特洛ä¾åˆé‡‘-C276框架
-tile.Block of Hastelloy-N.name=哈斯特洛ä¾åˆé‡‘-Nå—
-tile.Hastelloy-N Frame Box.name=哈斯特洛ä¾åˆé‡‘-N框架
-tile.Block of Incoloy-020.name=è€çƒé“¬é“åˆé‡‘-020å—
-tile.Incoloy-020 Frame Box.name=è€çƒé“¬é“åˆé‡‘-020框架
-tile.Block of Incoloy-DS.name=è€çƒé“¬é“åˆé‡‘-DSå—
-tile.Incoloy-DS Frame Box.name=è€çƒé“¬é“åˆé‡‘-DS框架
-tile.Block of Incoloy-MA956.name=è€çƒé“¬é“åˆé‡‘-MA956å—
-tile.Incoloy-MA956 Frame Box.name=è€çƒé“¬é“åˆé‡‘-MA956框架
-tile.Block of Grisium.name=ç°é’›åˆé‡‘å—
-tile.Grisium Frame Box.name=ç°é’›åˆé‡‘框架
-tile.Block of Trinium.name=三元金属å—
-tile.Block of Refined Trinium.name=精制三元金属å—
-tile.Block of Trinium Titanium Alloy.name=三元钛åˆé‡‘å—
-tile.Trinium Titanium Alloy Frame Box.name=三元钛åˆé‡‘框架
-tile.Block of Trinium Naquadah Alloy.name=三元硅岩åˆé‡‘å—
-tile.Block of Trinium Naquadah Carbonite.name=碳化三元硅岩åˆé‡‘å—
-tile.Trinium Naquadah Carbonite Frame Box.name=碳化三元硅岩åˆé‡‘框架
-tile.Block of Quantum.name=é‡ååˆé‡‘å—
-tile.Quantum Frame Box.name=é‡ååˆé‡‘框架
-
-//Ores
-tile.OreFluorite.name=氟石矿石
-tile.OreCrocoite.name=赤铅矿矿石
-tile.OreGeikielite.name=é•é’›çŸ¿çŸ¿çŸ³
-tile.OreNichromite.name=é•é“¬çŸ¿çŸ¿çŸ³
-tile.OreTitanite.name=æ¦çŸ³çŸ¿çŸ³
-tile.OreZimbabweite.name=é’›é“Œé“…é’ çŸ³çŸ¿çŸ³
-tile.OreZirconolite.name=钛锆é’矿矿石
-tile.OreGadoliniteCe.name=ç¡…é“钇矿(Ce)矿石
-tile.OreGadoliniteY.name=ç¡…é“钇矿(Y)矿石
-tile.OreLepersonnite.name=绿泥石矿石
-tile.OreSamarskiteY.name=铌钇矿(Y)矿石
-tile.OreSamarskiteYb.name=铌钇矿(Yb)矿石
-tile.OreXenotime.name=磷钇矿矿石
-tile.OreYttriaite.name=钇矿矿石
-tile.OreYttrialite.name=ç¡…é’钇矿矿石
-tile.OreYttrocerite.name=铈钇矿矿石
-tile.OreZircon.name=锆石矿石
-tile.OrePolycrase.name=锗铀钇矿矿石
-tile.OreZircophyllite.name=锆星å¶çŸ³çŸ¿çŸ³
-tile.OreZirkelite.name=锆英石矿石
-tile.OreLanthaniteLa.name=镧石(La)矿石
-tile.OreLanthaniteCe.name=镧石(Ce)矿石
-tile.OreLanthaniteNd.name=镧石(Nd)矿石
-tile.OreAgarditeY.name=è±é“矿(Y)矿石
-tile.OreAgarditeCd.name=è±é“矿(Cd)矿石
-tile.OreAgarditeLa.name=è±é“矿(La)矿石
-tile.OreAgarditeNd.name=è±é“矿(Nd)矿石
-tile.OreHibonite.name=黑é“钙石矿石
-tile.OreCerite.name=铈硅石矿石
-tile.OreFluorcaphite.name=氟碳铈矿矿石
-tile.OreFlorencite.name=磷é“铈矿矿石
-tile.OreCryolite.name=冰晶石矿石
-
-//Misc
-tile.blockMFEffect.name=特殊
-tile.fluidBlockSludge.name=污泥
-tile.blockWorkbenchGT.name=工作å°
-tile.blockWorkbenchGTAdvanced.name=高级工作å°
-tile.blockHeliumGenerator.name=æ°¦å‘生器
-tile.blockFirePit.name=ç«å‘
-tile.blockFishTrap.name=æ•é±¼è€…
-tile.blockInfiniteFluidTank.name=æ— é™æµä½“储ç½
-tile.blockMiningExplosives.name=矿用炸è¯
-tile.blockHellFire.name=地狱之ç«
-tile.blockProjectBench.name=工程å°
-tile.blockTradeBench.name=贸易å°
-tile.blockModularity.name=模å—化工作å°
-tile.blockBlackGate.name=凋零笼å
-tile.blockTankXpConverter.name=ç»éªŒè½¬æ¢å™¨
-
-//Everglades Blocks
-tile.fluidSludge.0.name=ä¸æµåŠ¨çš„废水
-tile.blockDarkWorldPortal.name=未æ¥çš„æŽ å½±
-tile.blockDarkWorldGround.name=ä¸ç¨³å®šçš„土壤
-tile.blockDarkWorldGround2.name=污染的土壤
-tile.blockDarkWorldGround2.2.name=高度污染的土壤
-tile.blockDarkWorldPortalFrame.name=é制框架
-
-
-//Added 1/4/18
-tile.Block of Plutonium-239.name=é’š-239å—
-tile.Fluorite Ore [Old].name=氟石矿[ä¸å¯ç”¨çš„]
-tile.blockMiningPipeFake.name=强化钢ç‹æŒ–掘管é“
-tile.blockMiningHeadFake.name=基岩钻头
-item.itemCellLiFBeF2ThF4UF4.name=熔ç›å•å…ƒ[é“€é’å¤åˆæ°ŸåŒ–物]
-item.itemCellLiFBeF2ZrF4UF4.name=熔ç›å•å…ƒ[铀锆å¤åˆæ°ŸåŒ–物]
-item.itemCellLiFBeF2ZrF4U235.name=熔ç›å•å…ƒ[é“€235å¤åˆæ°ŸåŒ–物]
-item.itemPlateMeatRaw.name=生肉æ¿
-tile.Block of MeatRaw.name=生肉å—
-
-//Added 26/5/18
-item.BurntLiFBeF2ThF4UF4.name=枯ç«ç†”ç›å•å…ƒ[é“€é’å¤åˆæ°ŸåŒ–物]
-item.BurntLiFBeF2ZrF4UF4.name=枯ç«ç†”ç›å•å…ƒ[铀锆å¤åˆæ°ŸåŒ–物]
-item.BurntLiFBeF2ZrF4U235.name=枯ç«ç†”ç›å•å…ƒ[é“€235å¤åˆæ°ŸåŒ–物]
-item.itemBigEgg.name= 盎å¸çš„大鸡蛋
-item.itemPlateSodium.name=é’ æ¿
-
-item.itemNuggetPromethium.name=é’·ç²’
-item.itemIngotPromethium.name=é’·é”
-item.itemDustSmallPromethium.name=å°å †é’·ç²‰
-item.itemDustTinyPromethium.name=å°æ’®é’·ç²‰
-item.itemDustPromethium.name=钷粉
-tile.Block of Promethium.name=é’·å—
-
-item.itemCellAmericium241.name=é•…-241å•å…ƒ
-item.itemCellPolonium210.name=é’‹-210å•å…ƒ
-item.itemCellStrontium90.name=锶-90å•å…ƒ
-item.itemCellPlutonium238.name=é’š-238å•å…ƒ
-
-entity.MiningCharge.name=采矿费用
-entity.throwablePotionSulfuric.name=硫酸烧瓶
-entity.throwablePotionHydrofluoric.name=氢氟酸烧瓶
-entity.toxinBall.name=æ¯’ç´ å°çƒ
-entity.plasmaBolt.name=ç‰ç¦»å体
-entity.bigChickenFriendly.name=巨大的鸡
-
-//Added 26/6/18
-tile.OreTrinium.name=三元金属矿石
-item.crushedTrinium.name=粉碎三元金属矿石
-item.crushedCentrifugedTrinium.name=离心三元金属矿石
-item.crushedPurifiedTrinium.name=洗净的三元金属矿石
-item.dustImpureTrinium.name=å«æ‚三元金属粉
-item.dustPureTrinium.name=洗净的三元金属粉
-
-//Added 1/7/18
-entity.WiseVillager.name=èªæ˜Žçš„æ‘æ°‘
-tile.blockMobSpawnerEx.0.name=刷怪笼
-tile.blockMobSpawnerEx.1.name=刷怪笼
-tile.blockMobSpawnerEx.2.name=刷怪笼
-tile.blockMobSpawnerEx.3.name=刷怪笼
-tile.blockMobSpawnerEx.4.name=刷怪笼
-tile.blockMobSpawnerEx.5.name=刷怪笼
-tile.blockMobSpawnerEx.6.name=刷怪笼
-tile.blockMobSpawnerEx.7.name=刷怪笼
-tile.blockMobSpawnerEx.8.name=刷怪笼
-tile.blockMobSpawnerEx.9.name=刷怪笼
-tile.blockMobSpawnerEx.10.name=刷怪笼
-tile.blockMobSpawnerEx.11.name=刷怪笼
-tile.blockMobSpawnerEx.12.name=刷怪笼
-tile.blockMobSpawnerEx.13.name=刷怪笼
-tile.blockMobSpawnerEx.14.name=刷怪笼
-tile.blockMobSpawnerEx.15.name=刷怪笼
-description.villager.profession.miscutils.banker=银行家
-description.villager.profession.miscutils.technician=GT技术员
-description.villager.profession.miscutils.trader=矿石交易员
-description.villager.profession.miscutils.aboriginal=澳大利亚土著
-
-//Added 23/8/18
-item.itemHatTinFoil.name=锡薄帽
-
-//Added 13/9/18
-entity.WiseVillager.name=èªæ˜Žçš„æ‘æ°‘
-entity.Aboriginal.name=澳大利亚土著
-entity.miscutils.constructStaballoy.name=è´«é“€åˆé‡‘结构
-entity.miscutils.sickBlaze.name=被感染的狂çƒè€…
-
-//Added 15/9/18
-item.ZirconiumTetrafluoride.name=四氟化锆å•å…ƒ
-item.Formaldehyde.name=甲醛å•å…ƒ
-item.RocketFuelMixA.name=H8N4C2O4ç«ç®ç‡ƒæ–™å•å…ƒ
-item.RocketFuelMixB.name=RP-1ç«ç®ç‡ƒæ–™å•å…ƒ
-item.RocketFuelMixC.name=CN3H7O3ç«ç®ç‡ƒæ–™å•å…ƒ
-item.RocketFuelMixD.name=密集肼ç«ç®ç‡ƒæ–™å•å…ƒ
-item.RP1Fuel.name=RP-1燃料å•å…ƒ
-item.Monomethylhydrazine.name=甲基肼å•å…ƒ
-item.Hydrazine.name=肼å•å…ƒ
-item.NitrogenTetroxide.name=四氧化二氮å•å…ƒ
-item.NitrousOxide.name=一氧化二氮å•å…ƒ
-item.AmmoniumNitrateSlurry.name=ç¡é…¸é“µæµ†æ¶²å•å…ƒ
-item.Kerosene.name=煤油å•å…ƒ
-item.LiquidOxygen.name=液化氧å•å…ƒ[LOX]
-
-//Added 8/1/19
-
-//Ores
-
-tile.OreIrarsite.name=ç¡«ç ·é“±çŸ¿çŸ³
-item.crushedIrarsite.name=ç²‰ç¢Žç¡«ç ·é“±çŸ¿çŸ³
-item.crushedCentrifugedIrarsite.name=ç¦»å¿ƒç²‰ç¢Žç¡«ç ·é“±çŸ¿çŸ³
-item.crushedPurifiedIrarsite.name=çº¯å‡€ç²‰ç¢Žç¡«ç ·é“±çŸ¿çŸ³
-item.dustImpureIrarsite.name=å«æ‚ç¡«ç ·é“±ç²‰
-item.dustPureIrarsite.name=çº¯å‡€ç¡«ç ·é“±ç²‰
-item.itemDustIrarsite.name=ç¡«ç ·é“±ç²‰
-item.itemDustTinyIrarsite.name=å°æ’®ç¡«ç ·é“±ç²‰
-item.itemDustSmallIrarsite.name=å°å †ç¡«ç ·é“±ç²‰
-
-tile.OreMiessiite.name=ç¡…ç°çŸ³çŸ¿çŸ³
-item.crushedMiessiite.name=粉碎硅ç°çŸ³çŸ¿çŸ³
-item.crushedCentrifugedMiessiite.name=离心粉碎硅ç°çŸ³çŸ¿çŸ³
-item.crushedPurifiedMiessiite.name=纯净硅ç°çŸ³çŸ¿çŸ³
-item.dustImpureMiessiite.name=å«æ‚ç¡…ç°çŸ³ç²‰
-item.dustPureMiessiite.name=纯净硅ç°çŸ³ç²‰
-item.itemDustMiessiite.name=ç¡…ç°çŸ³ç²‰
-item.itemDustTinyMiessiite.name=å°æ’®ç¡…ç°çŸ³ç²‰
-item.itemDustSmallMiessiite.name=å°å †ç¡…ç°çŸ³ç²‰
-
-tile.OreComancheite.name=溴汞石矿石
-item.crushedComancheite.name=粉碎溴汞石矿石
-item.crushedCentrifugedComancheite.name=离心粉碎溴汞石矿石
-item.crushedPurifiedComancheite.name=纯净粉碎溴汞石矿石
-item.dustImpureComancheite.name=å«æ‚溴汞石矿石
-item.dustPureComancheite.name=纯净溴汞石粉
-item.itemDustComancheite.name=溴汞石粉
-item.itemDustTinyComancheite.name=å°æ’®æº´æ±žçŸ³ç²‰
-item.itemDustSmallComancheite.name=å°å †æº´æ±žçŸ³ç²‰
-
-tile.OreKoboldite.name=妖金矿石
-item.crushedKoboldite.name=粉碎妖金矿石
-item.crushedCentrifugedKoboldite.name=离心粉碎妖金矿石
-item.crushedPurifiedKoboldite.name=纯净粉碎妖金矿石
-item.dustImpureKoboldite.name=å«æ‚妖金粉
-item.dustPureKoboldite.name=纯净妖金粉
-item.itemDustKoboldite.name=妖金粉
-item.itemDustTinyKoboldite.name=å°æ’®å¦–金粉
-item.itemDustSmallKoboldite.name=å°å †å¦–金粉
-
-tile.OrePerroudite.name=溴硫银汞矿石
-item.crushedPerroudite.name=粉碎溴硫银汞矿石
-item.crushedCentrifugedPerroudite.name=离心溴硫银汞矿石
-item.crushedPurifiedPerroudite.name=纯净溴硫银汞矿石
-item.dustImpurePerroudite.name=å«æ‚溴硫银汞粉
-item.dustPurePerroudite.name=纯净溴硫银汞粉
-item.itemDustPerroudite.name=溴硫银汞粉
-item.itemDustTinyPerroudite.name=å°æ’®æº´ç¡«é“¶æ±žç²‰
-item.itemDustSmallPerroudite.name=å°å †æº´ç¡«é“¶æ±žç²‰
-
-tile.OreDemicheleite.name=é‡é—ªçŸ³çŸ¿çŸ³
-item.crushedDemicheleite.name=粉碎é‡é—ªçŸ³çŸ¿çŸ³
-item.crushedCentrifugedDemicheleite.name=离心粉碎é‡é—ªçŸ³çŸ¿çŸ³
-item.crushedPurifiedDemicheleite.name=纯净粉碎é‡é—ªçŸ³çŸ¿çŸ³
-item.dustImpureDemicheleite.name=å«æ‚é‡é—ªçŸ³ç²‰
-item.dustPureDemicheleite.name=纯净é‡é—ªçŸ³ç²‰
-item.itemDustDemicheleite.name=é‡é—ªçŸ³ç²‰
-item.itemDustTinyDemicheleite.name=å°æ’®é‡é—ªçŸ³ç²‰
-item.itemDustSmallDemicheleite.name=å°å †é‡é—ªçŸ³ç²‰
-
-tile.OreAlburnite.name=é“尖晶石矿石
-item.crushedAlburnite.name=粉碎é“尖晶石矿石
-item.crushedCentrifugedAlburnite.name=离心粉碎é“尖晶石矿石
-item.crushedPurifiedAlburnite.name=纯净粉碎é“尖晶石矿石
-item.dustImpureAlburnite.name=å«æ‚é“尖晶石粉
-item.dustPureAlburnite.name=纯净é“尖晶石粉
-item.itemDustAlburnite.name=é“尖晶石粉
-item.itemDustTinyAlburnite.name=å°æ’®é“尖晶石粉
-item.itemDustSmallAlburnite.name=å°å †é“尖晶石粉
-
-tile.OreLautarite.name=碘钙石矿石
-item.crushedLautarite.name=粉碎碘钙石矿石
-item.crushedCentrifugedLautarite.name=离心粉碎碘钙石矿石
-item.crushedPurifiedLautarite.name=纯净粉碎碘钙石矿石
-item.dustImpureLautarite.name=å«æ‚碘钙石粉
-item.dustPureLautarite.name=纯净碘钙石粉
-item.itemDustLautarite.name=碘钙石粉
-item.itemDustTinyLautarite.name=å°æ’®ç¢˜é’™çŸ³ç²‰
-item.itemDustSmallLautarite.name=å°å †ç¢˜é’™çŸ³ç²‰
-
-tile.OreBariteRd.name=é‡æ™¶çŸ³(Rd)矿石
-item.crushedBariteRd.name=粉碎é‡æ™¶çŸ³(Rd)矿石
-item.crushedCentrifugedBariteRd.name=离心粉碎 é‡æ™¶çŸ³(Rd)矿石
-item.crushedPurifiedBariteRd.name=纯净粉碎é‡æ™¶çŸ³(Rd)矿石
-item.dustImpureBariteRd.name=å«æ‚ é‡æ™¶çŸ³(Rd)粉
-item.dustPureBariteRd.name=纯净 é‡æ™¶çŸ³(Rd)粉
-item.itemDustBariteRd.name=é‡æ™¶çŸ³(Rd)粉
-item.itemDustTinyBariteRd.name=å°æ’®é‡æ™¶çŸ³(Rd)粉
-item.itemDustSmallBariteRd.name=å°å †é‡æ™¶çŸ³(Rd)粉
-
-tile.OreHoneaite.name=碲化金铊矿石
-item.crushedHoneaite.name=粉碎碲化金铊矿石
-item.crushedCentrifugedHoneaite.name=离心粉碎碲化金铊矿石
-item.crushedPurifiedHoneaite.name=纯净粉碎碲化金铊矿石
-item.dustImpureHoneaite.name=å«æ‚碲化金铊粉
-item.dustPureHoneaite.name=纯净碲化金铊粉
-item.itemDustHoneaite.name=碲化金铊粉
-item.itemDustTinyHoneaite.name=å°æ’®ç¢²åŒ–金铊粉
-item.itemDustSmallHoneaite.name=å°å †ç¢²åŒ–金铊粉
-
-tile.OreLafossaite.name=é“Šç›çŸ¿çŸ³
-item.crushedLafossaite.name=粉碎铊ç›çŸ¿çŸ³
-item.crushedCentrifugedLafossaite.name=离心粉碎铊ç›çŸ¿çŸ³
-item.crushedPurifiedLafossaite.name=纯净粉碎铊ç›çŸ¿çŸ³
-item.dustImpureLafossaite.name=å«æ‚é“Šç›ç²‰
-item.dustPureLafossaite.name=纯净铊ç›ç²‰
-item.itemDustLafossaite.name=é“Šç›ç²‰
-item.itemDustTinyLafossaite.name=å°æ’®é“Šç›ç²‰
-item.itemDustSmallLafossaite.name=å°å †é“Šç›ç²‰
-
-tile.OreKashinite.name=硫铑钛铜矿石
-item.crushedKashinite.name=粉碎硫铑钛铜矿石
-item.crushedCentrifugedKashinite.name=离心粉碎硫铑钛铜矿石
-item.crushedPurifiedKashinite.name=纯净粉碎硫铑钛铜矿石
-item.dustImpureKashinite.name=å«æ‚硫铑钛铜粉
-item.dustPureKashinite.name=纯净硫铑钛铜粉
-item.itemDustKashinite.name=硫铑钛铜粉
-item.itemDustTinyKashinite.name=å°æ’®ç¡«é“‘钛铜粉
-item.itemDustSmallKashinite.name=å°å †ç¡«é“‘钛铜粉
-
-tile.OreRadioactiveMineralMix.name=奇异矿石
-item.crushedRadioactiveMineralMix.name=粉碎奇异矿石
-item.crushedCentrifugedRadioactiveMineralMix.name=离心粉碎奇异矿石
-item.crushedPurifiedRadioactiveMineralMix.name=纯净粉碎奇异矿石
-item.dustImpureRadioactiveMineralMix.name=å«æ‚奇异粉
-item.dustPureRadioactiveMineralMix.name=纯净奇异粉
-item.itemDustRadioactiveMineralMix.name=奇异粉
-item.itemDustTinyRadioactiveMineralMix.name=å°æ’®å¥‡å¼‚粉
-item.itemDustSmallRadioactiveMineralMix.name=å°å †å¥‡å¼‚粉
-
-tile.OreDemicheleiteBr.name=é‡é—ªçŸ³(Br)矿石
-item.crushedDemicheleiteBr.name=粉碎é‡é—ªçŸ³(Br)矿石
-item.crushedCentrifugedDemicheleiteBr.name=离心粉碎é‡é—ªçŸ³(Br)矿石
-item.crushedPurifiedDemicheleiteBr.name=纯净粉碎é‡é—ªçŸ³(Br)矿石
-item.dustImpureDemicheleiteBr.name=å«æ‚é‡é—ªçŸ³(Br)粉
-item.dustPureDemicheleiteBr.name=纯净é‡é—ªçŸ³(Br)粉
-item.itemDustDemicheleiteBr.name=é‡é—ªçŸ³(Br)粉
-
-
-//Materials
-
-item.itemIngotTitansteel.name=æ³°å¦ç²¾é’¢
-item.itemHotIngotTitansteel.name=çƒæ³°å¦ç²¾é’¢
-item.itemDustTitansteel.name=æ³°å¦ç²¾é’¢ç²‰
-item.itemDustTinyTitansteel.name=å°æ’®æ³°å¦ç²¾é’¢ç²‰
-item.itemDustSmallTitansteel.name=å°å †æ³°å¦ç²¾é’¢ç²‰
-item.itemNuggetTitansteel.name=æ³°å¦ç²¾é’¢ç²’
-item.itemPlateTitansteel.name=æ³°å¦ç²¾é’¢æ¿
-item.itemPlateDoubleTitansteel.name=åŒé‡æ³°å¦ç²¾é’¢æ¿
-item.itemBoltTitansteel.name=æ³°å¦ç²¾é’¢èžºæ “
-item.itemRodTitansteel.name=æ³°å¦ç²¾é’¢æ†
-item.itemRodLongTitansteel.name=é•¿æ³°å¦ç²¾é’¢æ†
-item.itemRingTitansteel.name=æ³°å¦ç²¾é’¢çŽ¯
-item.itemScrewTitansteel.name=æ³°å¦ç²¾é’¢èžºä¸
-item.itemRotorTitansteel.name=æ³°å¦ç²¾é’¢è½¬å
-item.itemGearTitansteel.name=æ³°å¦ç²¾é’¢é½¿è½®
-item.itemCellTitansteel.name=æ³°å¦ç²¾é’¢å•å…ƒ
-tile.Block of Titansteel.name=æ³°å¦ç²¾é’¢å—
-tile.Titansteel Frame Box.name=æ³°å¦ç²¾é’¢æ¡†æž¶
-
-item.itemIngotOctiron.name=八角é“é”
-item.itemHotIngotOctiron.name=çƒå…«è§’é“é”
-item.itemDustOctiron.name=八角é“粉
-item.itemDustTinyOctiron.name=å°æ’®å…«è§’é“粉
-item.itemDustSmallOctiron.name=å°å †å…«è§’é“粉
-item.itemNuggetOctiron.name=八角é“ç²’
-item.itemPlateOctiron.name=八角é“æ¿
-item.itemPlateDoubleOctiron.name=åŒé‡å…«è§’é“æ¿
-item.itemBoltOctiron.name=八角é“èžºæ “
-item.itemRodOctiron.name=八角é“æ†
-item.itemRodLongOctiron.name=长八角é“æ†
-item.itemRingOctiron.name=八角é“环
-item.itemScrewOctiron.name=八角é“螺ä¸
-item.itemRotorOctiron.name=八角é“转å
-item.itemGearOctiron.name=八角é“齿轮
-item.itemCellOctiron.name=八角é“å•å…ƒ
-tile.Block of Octiron.name=八角é“å—
-tile.Octiron Frame Box.name=八角é“框架
-
-item.itemIngotWatertightSteel.name=防水钢é”
-item.itemHotIngotWatertightSteel.name=çƒé˜²æ°´é’¢é”
-item.itemDustWatertightSteel.name=防水钢粉
-item.itemDustTinyWatertightSteel.name=å°æ’®é˜²æ°´é’¢ç²‰
-item.itemDustSmallWatertightSteel.name=å°å †é˜²æ°´é’¢ç²‰
-item.itemNuggetWatertightSteel.name=防水钢粒
-item.itemPlateWatertightSteel.name=防水钢æ¿
-item.itemPlateDoubleWatertightSteel.name=åŒé‡é˜²æ°´é’¢æ¿
-item.itemBoltWatertightSteel.name=é˜²æ°´é’¢èžºæ “
-item.itemRodWatertightSteel.name=防水钢æ†
-item.itemRodLongWatertightSteel.name=长防水钢æ†
-item.itemRingWatertightSteel.name=防水钢环
-item.itemScrewWatertightSteel.name=防水钢螺ä¸
-item.itemRotorWatertightSteel.name=防水钢转å
-item.itemGearWatertightSteel.name=防水钢齿轮
-item.itemCellWatertightSteel.name=防水钢å•å…ƒ
-tile.Block of Watertight Steel.name=防水钢å—
-tile.Watertight Steel Frame Box.name=防水钢框架
-
-item.itemIngotCelestialTungsten.name=天体钨é”
-item.itemHotIngotCelestialTungsten.name=çƒå¤©ä½“é’¨é”
-item.itemDustCelestialTungsten.name=天体钨粉
-item.itemDustTinyCelestialTungsten.name=å°æ’®å¤©ä½“钨粉
-item.itemDustSmallCelestialTungsten.name=å°å †å¤©ä½“钨粉
-item.itemNuggetCelestialTungsten.name=天体钨粒
-item.itemPlateCelestialTungsten.name=天体钨æ¿
-item.itemPlateDoubleCelestialTungsten.name=åŒé‡å¤©ä½“é’¨æ¿
-item.itemBoltCelestialTungsten.name=å¤©ä½“é’¨èžºæ “
-item.itemRodCelestialTungsten.name=天体钨æ†
-item.itemRodLongCelestialTungsten.name=长天体钨æ†
-item.itemRingCelestialTungsten.name=天体钨环
-item.itemScrewCelestialTungsten.name=天体钨螺ä¸
-item.itemRotorCelestialTungsten.name=天体钨转å
-item.itemGearCelestialTungsten.name=天体钨齿轮
-item.itemCellCelestialTungsten.name=天体钨å•å…ƒ
-tile.Block of Celestial Tungsten.name=天体钨å—
-tile.Celestial Tungsten Frame Box.name=天体钨框架
-
-item.itemIngotHypogen.name=æµ·ç€çé”
-item.itemHotIngotHypogen.name=çƒæµ·ç€çé”
-item.itemDustHypogen.name=æµ·ç€ç粉
-item.itemDustTinyHypogen.name=å°æ’®æµ·ç€ç粉
-item.itemDustSmallHypogen.name=å°å †æµ·ç€ç粉
-item.itemNuggetHypogen.name=æµ·ç€çç²’
-item.itemPlateHypogen.name=æµ·ç€çæ¿
-item.itemPlateDoubleHypogen.name=åŒé‡æµ·ç€çæ¿
-item.itemBoltHypogen.name=æµ·ç€çèžºæ “
-item.itemRodHypogen.name=æµ·ç€çæ†
-item.itemRodLongHypogen.name=é•¿æµ·ç€çæ†
-item.itemRingHypogen.name=æµ·ç€ç环
-item.itemScrewHypogen.name=æµ·ç€ç螺ä¸
-item.itemRotorHypogen.name=æµ·ç€ç转å
-item.itemGearHypogen.name=æµ·ç€ç齿轮
-item.itemCellHypogen.name=æµ·ç€çå•å…ƒ
-tile.Block of Hypogen.name=æµ·ç€çå—
-tile.Hypogen Frame Box.name=æµ·ç€ç框架
-
-item.itemIngotArceusAlloy2B.name=阿塞俄斯åˆé‡‘2Bé”
-item.itemHotIngotArceusAlloy2B.name=çƒé˜¿å¡žä¿„æ–¯åˆé‡‘2Bé”
-item.itemDustArceusAlloy2B.name=阿塞俄斯åˆé‡‘2B粉
-item.itemDustTinyArceusAlloy2B.name=å°æ’®é˜¿å¡žä¿„æ–¯åˆé‡‘2B粉
-item.itemDustSmallArceusAlloy2B.name=å°å †é˜¿å¡žä¿„æ–¯åˆé‡‘2B粉
-item.itemNuggetArceusAlloy2B.name=阿塞俄斯åˆé‡‘2Bç²’
-item.itemPlateArceusAlloy2B.name=阿塞俄斯åˆé‡‘2Bæ¿
-item.itemPlateDoubleArceusAlloy2B.name=åŒé‡é˜¿å¡žä¿„æ–¯åˆé‡‘2Bæ¿
-item.itemBoltArceusAlloy2B.name=阿塞俄斯åˆé‡‘2Bèžºæ “
-item.itemRodArceusAlloy2B.name=阿塞俄斯åˆé‡‘2Bæ†
-item.itemRodLongArceusAlloy2B.name=长阿塞俄斯åˆé‡‘2Bæ†
-item.itemRingArceusAlloy2B.name=阿塞俄斯åˆé‡‘2B环
-item.itemScrewArceusAlloy2B.name=阿塞俄斯åˆé‡‘2B螺ä¸
-item.itemRotorArceusAlloy2B.name=阿塞俄斯åˆé‡‘2B转å
-item.itemGearArceusAlloy2B.name=阿塞俄斯åˆé‡‘2B齿轮
-item.itemCellArceusAlloy2B.name=阿塞俄斯åˆé‡‘2Bå•å…ƒ
-tile.Block of Arceus Alloy 2B.name=阿塞俄斯åˆé‡‘2Bå—
-tile.Arceus Alloy 2B Frame Box.name=阿塞俄斯åˆé‡‘2B框架
-
-item.itemIngotChromaticGlass.name=彩色玻璃é”
-item.itemHotIngotChromaticGlass.name=çƒå½©è‰²çŽ»ç’ƒé”
-item.itemDustChromaticGlass.name=彩色玻璃粉
-item.itemDustTinyChromaticGlass.name=å°æ’®å½©è‰²çŽ»ç’ƒç²‰
-item.itemDustSmallChromaticGlass.name=å°å †å½©è‰²çŽ»ç’ƒç²‰
-item.itemNuggetChromaticGlass.name=彩色玻璃粒
-item.itemPlateChromaticGlass.name=彩色玻璃æ¿
-item.itemPlateDoubleChromaticGlass.name=åŒé‡å½©è‰²çŽ»ç’ƒæ¿
-item.itemBoltChromaticGlass.name=å½©è‰²çŽ»ç’ƒèžºæ “
-item.itemRodChromaticGlass.name=彩色玻璃æ†
-item.itemRodLongChromaticGlass.name=长彩色玻璃æ†
-item.itemRingChromaticGlass.name=彩色玻璃环
-item.itemScrewChromaticGlass.name=彩色玻璃螺ä¸
-item.itemRotorChromaticGlass.name=彩色玻璃转å
-item.itemGearChromaticGlass.name=彩色玻璃齿轮
-item.itemCellChromaticGlass.name=彩色玻璃å•å…ƒ
-tile.Block of Chromatic Glass.name=彩色玻璃å—
-tile.Chromatic Glass Frame Box.name=彩色玻璃框架
-
-item.itemIngotAstralTitanium.name=星体钛é”
-item.itemHotIngotAstralTitanium.name=çƒæ˜Ÿä½“é’›é”
-item.itemDustAstralTitanium.name=星体钛粉
-item.itemDustTinyAstralTitanium.name=å°æ’®æ˜Ÿä½“钛粉
-item.itemDustSmallAstralTitanium.name=å°å †æ˜Ÿä½“钛粉
-item.itemNuggetAstralTitanium.name=星体钛粒
-item.itemPlateAstralTitanium.name=星体钛æ¿
-item.itemPlateDoubleAstralTitanium.name=åŒé‡æ˜Ÿä½“é’›æ¿
-item.itemBoltAstralTitanium.name=æ˜Ÿä½“é’›èžºæ “
-item.itemRodAstralTitanium.name=星体钛æ†
-item.itemRodLongAstralTitanium.name=长星体钛æ†
-item.itemRingAstralTitanium.name=星体钛环
-item.itemScrewAstralTitanium.name=星体钛螺ä¸
-item.itemRotorAstralTitanium.name=星体钛转å
-item.itemGearAstralTitanium.name=星体钛齿轮
-item.itemCellAstralTitanium.name=星体钛å•å…ƒ
-tile.Block of Astral Titanium.name=星体钛å—
-tile.Astral Titanium Frame Box.name=星体钛框架
-
-item.itemIngotTungstenTitaniumCarbide.name=碳化钨钛åˆé‡‘é”
-item.itemHotIngotTungstenTitaniumCarbide.name=çƒç¢³åŒ–钨钛åˆé‡‘é”
-item.itemDustTungstenTitaniumCarbide.name=碳化钨钛åˆé‡‘粉
-item.itemDustTinyTungstenTitaniumCarbide.name=å°æ’®ç¢³åŒ–钨钛åˆé‡‘粉
-item.itemDustSmallTungstenTitaniumCarbide.name=å°å †ç¢³åŒ–钨钛åˆé‡‘粉
-item.itemNuggetTungstenTitaniumCarbide.name=碳化钨钛åˆé‡‘ç²’
-item.itemPlateTungstenTitaniumCarbide.name=碳化钨钛åˆé‡‘æ¿
-item.itemPlateDoubleTungstenTitaniumCarbide.name=åŒé‡ç¢³åŒ–钨钛åˆé‡‘æ¿
-item.itemBoltTungstenTitaniumCarbide.name=碳化钨钛åˆé‡‘èžºæ “
-item.itemRodTungstenTitaniumCarbide.name=碳化钨钛åˆé‡‘æ†
-item.itemRodLongTungstenTitaniumCarbide.name=长碳化钨钛åˆé‡‘æ†
-item.itemRingTungstenTitaniumCarbide.name=碳化钨钛åˆé‡‘环
-item.itemScrewTungstenTitaniumCarbide.name=碳化钨钛åˆé‡‘螺ä¸
-item.itemRotorTungstenTitaniumCarbide.name=碳化钨钛åˆé‡‘转å
-item.itemGearTungstenTitaniumCarbide.name=碳化钨钛åˆé‡‘齿轮
-item.itemCellTungstenTitaniumCarbide.name=碳化钨钛åˆé‡‘å•å…ƒ
-tile.Block of Tungsten Titanium Carbide.name=碳化钨钛åˆé‡‘å—
-tile.Tungsten Titanium Carbide Frame Box.name=碳化钨钛åˆé‡‘框架
-
-item.itemIngotNitinol60.name=é•é’›è¯º60é”
-item.itemHotIngotNitinol60.name=çƒé•é’›è¯º60é”
-item.itemDustNitinol60.name=é•é’›è¯º60粉
-item.itemDustTinyNitinol60.name=å°æ’®é•é’›è¯º60粉
-item.itemDustSmallNitinol60.name=å°å †é•é’›è¯º60粉
-item.itemNuggetNitinol60.name=é•é’›è¯º60ç²’
-item.itemPlateNitinol60.name=é•é’›è¯º60æ¿
-item.itemPlateDoubleNitinol60.name=åŒé‡é•é’›è¯º60æ¿
-item.itemBoltNitinol60.name=é•é’›è¯º60èžºæ “
-item.itemRodNitinol60.name=é•é’›è¯º60æ†
-item.itemRodLongNitinol60.name=é•¿é•é’›è¯º60æ†
-item.itemRingNitinol60.name=é•é’›è¯º60环
-item.itemScrewNitinol60.name=é•é’›è¯º60螺ä¸
-item.itemRotorNitinol60.name=é•é’›è¯º60转å
-item.itemGearNitinol60.name=é•é’›è¯º60齿轮
-item.itemCellNitinol60.name=é•é’›è¯º60å•å…ƒ
-tile.Block of Nitinol 60.name=é•é’›è¯º60å—
-tile.Nitinol 60 Frame Box.name=é•é’›è¯º60框架
-
-item.itemIngotAdvancedNitinol.name=高级é•é’›è¯ºé”
-item.itemHotIngotAdvancedNitinol.name=çƒé«˜çº§é•é’›è¯ºé”
-item.itemDustAdvancedNitinol.name=高级é•é’›è¯ºç²‰
-item.itemDustTinyAdvancedNitinol.name=å°æ’®é«˜çº§é•é’›è¯ºç²‰
-item.itemDustSmallAdvancedNitinol.name=å°å †é«˜çº§é•é’›è¯ºç²‰
-item.itemNuggetAdvancedNitinol.name=高级é•é’›è¯ºç²’
-item.itemPlateAdvancedNitinol.name=高级é•é’›è¯ºæ¿
-item.itemPlateDoubleAdvancedNitinol.name=åŒé‡é«˜çº§é•é’›è¯ºæ¿
-item.itemBoltAdvancedNitinol.name=高级é•é’›è¯ºèžºæ “
-item.itemRodAdvancedNitinol.name=高级é•é’›è¯ºæ†
-item.itemRodLongAdvancedNitinol.name=长高级é•é’›è¯ºæ†
-item.itemRingAdvancedNitinol.name=高级é•é’›è¯ºçŽ¯
-item.itemScrewAdvancedNitinol.name=高级é•é’›è¯ºèžºä¸
-item.itemRotorAdvancedNitinol.name=高级é•é’›è¯ºè½¬å
-item.itemGearAdvancedNitinol.name=高级é•é’›è¯ºé½¿è½®
-item.itemCellAdvancedNitinol.name=高级é•é’›è¯ºå•å…ƒ
-tile.Block of Advanced Nitinol.name=高级é•é’›è¯ºå—
-tile.Advanced Nitinol Frame Box.name=高级é•é’›è¯ºæ¡†æž¶
-
-item.itemIngotArcanite.name=奥金é”
-item.itemHotIngotArcanite.name=çƒå¥¥é‡‘é”
-item.itemDustArcanite.name=奥金粉
-item.itemDustTinyArcanite.name=å°æ’®å¥¥é‡‘粉
-item.itemDustSmallArcanite.name=å°å †å¥¥é‡‘粉
-item.itemNuggetArcanite.name=奥金粒
-item.itemPlateArcanite.name=奥金æ¿
-item.itemPlateDoubleArcanite.name=åŒé‡å¥¥é‡‘æ¿
-item.itemBoltArcanite.name=å¥¥é‡‘èžºæ “
-item.itemRodArcanite.name=奥金æ†
-item.itemRodLongArcanite.name=长奥金æ†
-item.itemRingArcanite.name=奥金环
-item.itemScrewArcanite.name=奥金螺ä¸
-item.itemRotorArcanite.name=奥金转å
-item.itemGearArcanite.name=奥金齿轮
-item.itemCellArcanite.name=奥金å•å…ƒ
-tile.Block of Arcanite.name=奥金å—
-tile.Arcanite Frame Box.name=奥金框架
-
-item.itemIngotPikyonium64B.name=çš®å¡ä¼˜åˆé‡‘64Bé”
-item.itemHotIngotPikyonium64B.name=çƒçš®å¡ä¼˜åˆé‡‘64Bé”
-item.itemDustPikyonium64B.name=çš®å¡ä¼˜åˆé‡‘64B粉
-item.itemDustTinyPikyonium64B.name=å°æ’®çš®å¡ä¼˜åˆé‡‘64B粉
-item.itemDustSmallPikyonium64B.name=å°å †çš®å¡ä¼˜åˆé‡‘64B粉
-item.itemNuggetPikyonium64B.name=çš®å¡ä¼˜åˆé‡‘64Bç²’
-item.itemPlatePikyonium64B.name=çš®å¡ä¼˜åˆé‡‘64Bæ¿
-item.itemPlateDoublePikyonium64B.name=åŒé‡çš®å¡ä¼˜åˆé‡‘64Bæ¿
-item.itemBoltPikyonium64B.name=çš®å¡ä¼˜åˆé‡‘64Bèžºæ “
-item.itemRodPikyonium64B.name=çš®å¡ä¼˜åˆé‡‘64Bæ†
-item.itemRodLongPikyonium64B.name=é•¿çš®å¡ä¼˜åˆé‡‘64Bæ†
-item.itemRingPikyonium64B.name=çš®å¡ä¼˜åˆé‡‘64B环
-item.itemScrewPikyonium64B.name=çš®å¡ä¼˜åˆé‡‘64B螺ä¸
-item.itemRotorPikyonium64B.name=çš®å¡ä¼˜åˆé‡‘64B转å
-item.itemGearPikyonium64B.name=çš®å¡ä¼˜åˆé‡‘64B齿轮
-item.itemCellPikyonium64B.name=çš®å¡ä¼˜åˆé‡‘64Bå•å…ƒ
-tile.Block of Pikyonium 64B.name=çš®å¡ä¼˜åˆé‡‘64Bå—
-tile.Pikyonium 64B Frame Box.name=çš®å¡ä¼˜åˆé‡‘64B框架
-
-item.itemIngotCinobiteA243.name=西诺æŸA243é”
-item.itemHotIngotCinobiteA243.name=çƒè¥¿è¯ºæŸA243é”
-item.itemDustCinobiteA243.name=西诺æŸA243粉
-item.itemDustTinyCinobiteA243.name=å°æ’®è¥¿è¯ºæŸA243粉
-item.itemDustSmallCinobiteA243.name=å°å †è¥¿è¯ºæŸA243粉
-item.itemNuggetCinobiteA243.name=西诺æŸA243ç²’
-item.itemPlateCinobiteA243.name=西诺æŸA243æ¿
-item.itemPlateDoubleCinobiteA243.name=åŒé‡è¥¿è¯ºæŸA243æ¿
-item.itemBoltCinobiteA243.name=西诺æŸA243èžºæ “
-item.itemRodCinobiteA243.name=西诺æŸA243æ†
-item.itemRodLongCinobiteA243.name=长西诺æŸA243æ†
-item.itemRingCinobiteA243.name=西诺æŸA243环
-item.itemScrewCinobiteA243.name=西诺æŸA243螺ä¸
-item.itemRotorCinobiteA243.name=西诺æŸA243转å
-item.itemGearCinobiteA243.name=西诺æŸA243齿轮
-item.itemCellCinobiteA243.name=西诺æŸA243å•å…ƒ
-tile.Block of Cinobite A243.name=西诺æŸA243å—
-tile.Cinobite A243 Frame Box.name=西诺æŸA243框架
-
-item.itemIngotLafiumCompound.name=è·¯è²æ©åŒ–åˆç‰©é”
-item.itemHotIngotLafiumCompound.name=çƒè·¯è²æ©åŒ–åˆç‰©é”
-item.itemDustLafiumCompound.name=è·¯è²æ©åŒ–åˆç‰©ç²‰
-item.itemDustTinyLafiumCompound.name=å°æ’®è·¯è²æ©åŒ–åˆç‰©ç²‰
-item.itemDustSmallLafiumCompound.name=å°å †è·¯è²æ©åŒ–åˆç‰©ç²‰
-item.itemNuggetLafiumCompound.name=è·¯è²æ©åŒ–åˆç‰©ç²’
-item.itemPlateLafiumCompound.name=è·¯è²æ©åŒ–åˆç‰©æ¿
-item.itemPlateDoubleLafiumCompound.name=åŒé‡è·¯è²æ©åŒ–åˆç‰©æ¿
-item.itemBoltLafiumCompound.name=è·¯è²æ©åŒ–åˆç‰©èžºæ “
-item.itemRodLafiumCompound.name=è·¯è²æ©åŒ–åˆç‰©æ†
-item.itemRodLongLafiumCompound.name=é•¿è·¯è²æ©åŒ–åˆç‰©æ†
-item.itemRingLafiumCompound.name=è·¯è²æ©åŒ–åˆç‰©çŽ¯
-item.itemScrewLafiumCompound.name=è·¯è²æ©åŒ–åˆç‰©èžºä¸
-item.itemRotorLafiumCompound.name=è·¯è²æ©åŒ–åˆç‰©è½¬å
-item.itemGearLafiumCompound.name=è·¯è²æ©åŒ–åˆç‰©é½¿è½®
-item.itemCellLafiumCompound.name=è·¯è²æ©åŒ–åˆç‰©å•å…ƒ
-tile.Block of Lafium Compound.name=è·¯è²æ©åŒ–åˆç‰©å—
-tile.Lafium Compound Frame Box.name=è·¯è²æ©åŒ–åˆç‰©æ¡†æž¶
-
-item.itemIngotKoboldite.name=妖金é”
-item.itemHotIngotKoboldite.name=çƒå¦–金é”
-item.itemDustKoboldite.name=妖金粉
-item.itemDustTinyKoboldite.name=å°æ’®å¦–金粉
-item.itemDustSmallKoboldite.name=å°å †å¦–金粉
-item.itemNuggetKoboldite.name=妖金粒
-item.itemPlateKoboldite.name=妖金æ¿
-item.itemPlateDoubleKoboldite.name=åŒé‡å¦–金æ¿
-item.itemBoltKoboldite.name=å¦–é‡‘èžºæ “
-item.itemRodKoboldite.name=妖金æ†
-item.itemRodLongKoboldite.name=长妖金æ†
-item.itemRingKoboldite.name=妖金环
-item.itemScrewKoboldite.name=妖金螺ä¸
-item.itemRotorKoboldite.name=妖金转å
-item.itemGearKoboldite.name=妖金齿轮
-item.itemCellKoboldite.name=妖金å•å…ƒ
-tile.Block of Koboldite.name=妖金å—
-tile.Koboldite Frame Box.name=妖金框架
-
-item.itemIngotAbyssalAlloy.name=深渊åˆé‡‘é”
-item.itemHotIngotAbyssalAlloy.name=çƒæ·±æ¸Šåˆé‡‘é”
-item.itemDustAbyssalAlloy.name=深渊åˆé‡‘粉
-item.itemDustTinyAbyssalAlloy.name=å°æ’®æ·±æ¸Šåˆé‡‘粉
-item.itemDustSmallAbyssalAlloy.name=å°å †æ·±æ¸Šåˆé‡‘粉
-item.itemNuggetAbyssalAlloy.name=深渊åˆé‡‘ç²’
-item.itemPlateAbyssalAlloy.name=深渊åˆé‡‘æ¿
-item.itemPlateDoubleAbyssalAlloy.name=åŒé‡æ·±æ¸Šåˆé‡‘æ¿
-item.itemBoltAbyssalAlloy.name=深渊åˆé‡‘èžºæ “
-item.itemRodAbyssalAlloy.name=深渊åˆé‡‘æ†
-item.itemRodLongAbyssalAlloy.name=长深渊åˆé‡‘æ†
-item.itemRingAbyssalAlloy.name=深渊åˆé‡‘环
-item.itemScrewAbyssalAlloy.name=深渊åˆé‡‘螺ä¸
-item.itemRotorAbyssalAlloy.name=深渊åˆé‡‘转å
-item.itemGearAbyssalAlloy.name=深渊åˆé‡‘齿轮
-item.itemCellAbyssalAlloy.name=深渊åˆé‡‘å•å…ƒ
-tile.Block of Abyssal Alloy.name=深渊åˆé‡‘å—
-tile.Abyssal Alloy Frame Box.name=深渊åˆé‡‘框架
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-//Radioactive
-item.dustTechnetium99M.name=é”99M粉
-item.dustTechnetium99.name=é”99粉
-item.dustMolybdenum99.name=钼99粉
-
-//Bags
-item.item.MysticBag.name=神秘袋
-item.item.Eatotron9000.name=埃托特洛尼克9000型
-item.item.ToolBox.name=工人的工具箱
-
-//Cells
-item.Bromine.name=溴å•å…ƒ
-item.Krypton.name=æ°ªå•å…ƒ
-item.cryotheum.name=凛冰å•å…ƒ
-item.pyrotheum.name=烈焰之炽焱å•å…ƒ
-item.GeneticMutagen.name=诱å˜å‰‚å•å…ƒ
-
-//Ingots
-item.itemHotIngotIncoloy020.name=çƒè€çƒé“¬é“åˆé‡‘-020é”
-item.itemHotIngotIncoloyDS.name=çƒè€çƒé“¬é“åˆé‡‘-DSé”
-item.itemHotIngotTalonite.name=çƒé“¬é’´ç£·é…¸ç›åˆé‡‘é”
-item.itemHotIngotHastelloyX.name=çƒå“ˆæ–¯ç‰¹æ´›ä¾åˆé‡‘-Xé”
-item.itemHotIngotHastelloyW.name=çƒå“ˆæ–¯ç‰¹æ´›ä¾åˆé‡‘-W碳化物é”
-
-//Railcraft Fix
-item.railcraft.part.plate.lead.name=é“…æ¿
-
-//Ions
-item.particle.ion.Hydrogen.name=氢离å
-item.particle.ion.Helium.name=氦离å
-item.particle.ion.Lithium.name=锂离å
-item.particle.ion.Beryllium.name=é“离å
-item.particle.ion.Boron.name=硼离å
-item.particle.ion.Carbon.name=碳离å
-item.particle.ion.Nitrogen.name=氮离å
-item.particle.ion.Oxygen.name=氧离å
-item.particle.ion.Fluorine.name=氟离å
-item.particle.ion.Neon.name=氖离å
-item.particle.ion.Sodium.name=é’ ç¦»å
-item.particle.ion.Magnesium.name=é•ç¦»å
-item.particle.ion.Aluminum.name=é“离å
-item.particle.ion.Silicon.name=硅离å
-item.particle.ion.Phosphorus.name=磷离å
-item.particle.ion.Sulfur.name=硫离å
-item.particle.ion.Chlorine.name=氯离å
-item.particle.ion.Argon.name=氩离å
-item.particle.ion.Potassium.name=钾离å
-item.particle.ion.Calcium.name=钙离å
-item.particle.ion.Scandium.name=钪离å
-item.particle.ion.Titanium.name=钛离å
-item.particle.ion.Vanadium.name=钒离å
-item.particle.ion.Chromium.name=铬离å
-item.particle.ion.Manganese.name=锰离å
-item.particle.ion.Iron.name=é“离å
-item.particle.ion.Cobalt.name=钴离å
-item.particle.ion.Nickel.name=é•ç¦»å
-item.particle.ion.Copper.name=铜离å
-item.particle.ion.Zinc.name=锌离å
-item.particle.ion.Gallium.name=镓离å
-item.particle.ion.Germanium.name=锗离å
-item.particle.ion.Arsenic.name=ç ·ç¦»å
-item.particle.ion.Selenium.name=硒离å
-item.particle.ion.Bromine.name=溴离å
-item.particle.ion.Krypton.name=氪离å
-item.particle.ion.Rubidium.name=铷离å
-item.particle.ion.Strontium.name=锶离å
-item.particle.ion.Yttrium.name=钇离å
-item.particle.ion.Zirconium.name=锆离å
-item.particle.ion.Niobium.name=铌离å
-item.particle.ion.Molybdenum.name=钼离å
-item.particle.ion.Technetium.name=é”离å
-item.particle.ion.Ruthenium.name=钌离å
-item.particle.ion.Rhodium.name=铑离å
-item.particle.ion.Palladium.name=钯离å
-item.particle.ion.Silver.name=银离å
-item.particle.ion.Cadmium.name=镉离å
-item.particle.ion.Indium.name=铟离å
-item.particle.ion.Tin.name=锡离å
-item.particle.ion.Antimony.name=锑离å
-item.particle.ion.Tellurium.name=碲离å
-item.particle.ion.Iodine.name=碘离å
-item.particle.ion.Xenon.name=氙离å
-item.particle.ion.Cesium.name=铯离å
-item.particle.ion.Barium.name=钡离å
-item.particle.ion.Lanthanum.name=镧离å
-item.particle.ion.Cerium.name=铈离å
-item.particle.ion.Praseodymium.name=镨离å
-item.particle.ion.Neodymium.name=钕离å
-item.particle.ion.Promethium.name=钷离å
-item.particle.ion.Samarium.name=é’离å
-item.particle.ion.Europium.name=铕离å
-item.particle.ion.Gadolinium.name=钆离å
-item.particle.ion.Terbium.name=铽离å
-item.particle.ion.Dysprosium.name=é•ç¦»å
-item.particle.ion.Holmium.name=钬离å
-item.particle.ion.Erbium.name=铒离å
-item.particle.ion.Thulium.name=铥离å
-item.particle.ion.Ytterbium.name=镱离å
-item.particle.ion.Lutetium.name=é•ç¦»å
-item.particle.ion.Hafnium.name=铪离å
-item.particle.ion.Tantalum.name=钽离å
-item.particle.ion.Tungsten.name=钨离å
-item.particle.ion.Rhenium.name=铼离å
-item.particle.ion.Osmium.name=锇离å
-item.particle.ion.Iridium.name=铱离å
-item.particle.ion.Platinum.name=铂离å
-item.particle.ion.Gold.name=金离å
-item.particle.ion.Mercury.name=汞离å
-item.particle.ion.Thallium.name=铊离å
-item.particle.ion.Lead.name=铅离å
-item.particle.ion.Bismuth.name=铋离å
-item.particle.ion.Polonium.name=钋离å
-item.particle.ion.Astatine.name=ç ¹ç¦»å
-item.particle.ion.Radon.name=氡离å
-item.particle.ion.Francium.name=钫离å
-item.particle.ion.Radium.name=é•ç¦»å
-item.particle.ion.Actinium.name=锕离å
-item.particle.ion.Thorium.name=é’离å
-item.particle.ion.Protactinium.name=镤离å
-item.particle.ion.Uranium.name=铀离å
-item.particle.ion.Neptunium.name=镎离å
-item.particle.ion.Plutonium.name=钚离å
-item.particle.ion.Americium.name=镅离å
-item.particle.ion.Curium.name=锔离å
-item.particle.ion.Berkelium.name=锫离å
-item.particle.ion.Californium.name=锎离å
-item.particle.ion.Einsteinium.name=锿离å
-item.particle.ion.Fermium.name=镄离å
-item.particle.ion.Mendelevium.name=钔离å
-item.particle.ion.Nobelium.name=锘离å
-item.particle.ion.Lawrencium.name=铹离å
-item.particle.ion.Rutherfordium.name=离å
-item.particle.ion.Dubnium.name=î¤ç¦»å
-item.particle.ion.Seaborgium.name=离å
-item.particle.ion.Bohrium.name=离å
-item.particle.ion.Hassium.name=离å
-item.particle.ion.Meitnerium.name=é¿ç¦»å
-item.particle.ion.Darmstadtium.name=离å
-item.particle.ion.Roentgenium.name=离å
-item.particle.ion.Copernicium.name=鿔离å
-item.particle.ion.Nihonium.name=é¿ç¦»å
-item.particle.ion.Flerovium.name=离å
-item.particle.ion.Moscovium.name=镆离å
-item.particle.ion.Livermorium.name=离å
-item.particle.ion.Tennessine.name=鿬离å
-item.particle.ion.Oganesson.name=鿫离å
-
-
-item.particle.base.Graviton.name=引力å
-item.particle.base.Up.name=u夸克
-item.particle.base.Down.name=b夸克
-item.particle.base.Charm.name=c夸克
-item.particle.base.Strange.name=s夸克
-item.particle.base.Top.name=t夸克
-item.particle.base.Bottom.name=b夸克
-item.particle.base.Electron.name=eå
-item.particle.base.Electron Neutrino.name=eåä¸å¾®å
-item.particle.base.Muon.name=μå
-item.particle.base.Muon Neutrino.name=μåä¸å¾®å
-item.particle.base.Tau.name=Ï„å
-item.particle.base.Tau Neutrino.name=Ï„åä¸å¾®å
-item.particle.base.Gluon.name=胶å
-item.particle.base.Photon.name=å…‰å
-item.particle.base.Z Boson.name=Z玻色å
-item.particle.base.W Boson.name=W玻色å
-item.particle.base.Higgs Boson.name=å¸Œæ ¼æ–¯çŽ»è‰²å
-item.particle.base.Proton.name=è´¨å
-item.particle.base.Neutron.name=ä¸å
-item.particle.base.Lambda.name=λ
-item.particle.base.Omega.name=Ω
-item.particle.base.Pion.name=介å
-item.particle.base.ETA Meson.name=η介å
-item.particle.base.Unknown.name=未知粒å
-
-//Added 12/1/19
-
-tile.playerDoorGlass.name=玻璃自动门
-tile.playerDoorCactus.name=仙人掌自动门
-tile.playerDoorIce.name=冰自动门
-tile.playerDoorIron.name=é“自动门
-tile.playerDoorWood.name=木自动门
-
-//Added 4/2/19
-
-item.GTPP.BattPack.06.name=充电工具包[LuV]
-item.GTPP.BattPack.07.name=充电工具包[ZPM]
-item.GTPP.BattPack.08.name=充电工具包[UV]
-item.GTPP.BattPack.09.name=充电工具包[MAX]
-
-
-//Added 13/3/19
-item.gtpp.debug.scanner.name=GT++排错扫æ器
-item.RawWaste.name=动物粪便å•å…ƒ
-item.ManureSlurry.name=粪浆å•å…ƒ
-item.FertileManureSlurry.name=肥沃的粪浆å•å…ƒ
-item.itemDustTinyDemicheleiteBr.name=å°æ’®å¾·ç±³å‡¯èŽ±(Br)
-item.itemDustSmallDemicheleiteBr.name=å°å †å¾·ç±³å‡¯èŽ±(Br)
-tile.blockPooCollector.name=农业下水é“
-tile.Block of Lithium 7.name=锂7å—
-
-//Added 14/3/19
-item.blood.name=è¡€å•å…ƒ
-item.aniline.name=苯胺å•å…ƒ
-item.cadaverine.name=尸胺å•å…ƒ
-item.polyurethane.name=èšæ°¨é…¯å•å…ƒ
-item.putrescine.name=è…胺å•å…ƒ
-item.cyclohexane.name=环己胺å•å…ƒ
-item.cyclohexanone.name=环己酮å•å…ƒ
-item.nitrobenzene.name=ç¡åŸºè‹¯å•å…ƒ
-item.ender.name=液体末影å•å…ƒ
-item.xpjuice.name=液体ç»éªŒå•å…ƒ
-item.itemBombUnf.name=å¯æŠ•æŽ·ç‚¸å¼¹(未完æˆ)
-item.itemBombCasing.name=炸弹框架
-item.gtpp.throwable.bomb.name=å¯æŠ•æŽ·ç‚¸å¼¹
-item.itemDetCable.name=炸弹ä¿é™©ä¸
-tile.blockPooCollector.0.name=农业下水é“
-tile.blockPooCollector.8.name=生物å¤åˆæ”¶é›†å™¨
-item.itemIngotBakelite.name=电木é”
-item.itemDustBakelite.name=电木粉
-item.itemDustTinyBakelite.name=å°æ’®ç”µæœ¨ç²‰
-item.itemDustSmallBakelite.name=å°å †ç”µæœ¨ç²‰
-item.itemNuggetBakelite.name=电木粒
-item.itemPlateBakelite.name=电木æ¿
-item.itemPlateDoubleBakelite.name=åŒé‡ç”µæœ¨æ¿
-item.itemCellBakelite.name=电木å•å…ƒ
-tile.Block of Bakelite.name=电木å—
-item.itemIngotNylon.name=尼龙é”
-item.itemDustNylon.name=尼龙粉
-item.itemDustTinyNylon.name=å°æ’®å°¼é¾™ç²‰
-item.itemDustSmallNylon.name=å°å †å°¼é¾™ç²‰
-item.itemNuggetNylon.name=尼龙粒
-item.itemPlateNylon.name=尼龙æ¿
-item.itemPlateDoubleNylon.name=åŒé‡å°¼é¾™æ¿
-item.itemCellNylon.name=尼龙å•å…ƒ
-tile.Block of Nylon.name=尼龙å—
-item.itemIngotTeflon.name=特氟龙é”
-item.itemDustTeflon.name=特氟龙粉
-item.itemDustTinyTeflon.name=å°æ’®ç‰¹æ°Ÿé¾™ç²‰
-item.itemDustSmallTeflon.name=å°å †ç‰¹æ°Ÿé¾™ç²‰
-item.itemNuggetTeflon.name=特氟龙粒
-item.itemPlateTeflon.name=特氟龙æ¿
-item.itemPlateDoubleTeflon.name=åŒé‡ç‰¹æ°Ÿé¾™æ¿
-item.itemCellTeflon.name=特氟龙å•å…ƒ
-tile.Block of Teflon.name=特氟龙å—
-
-//Added 17/4/19
-//Spelling Corrections
-item.particle.ion.Aluminium.name=é“离å
-item.particle.ion.Caesium.name=铯离å
-
-item.GTPP.MonsterKiller.Enderman.name=末影人æ€æ‰‹
-item.GTPP.MonsterKiller.Spider.name=蜘蛛æ€æ‰‹
-item.GTPP.MonsterKiller.Skeleton.name=骷髅æ€æ‰‹
-item.GTPP.MonsterKiller.Creeper.name=爬行者æ€æ‰‹
-item.GTPP.MonsterKiller.Zombie.name=僵尸æ€æ‰‹
-item.GTPP.MonsterKiller.Hellish.name=下界生物æ€æ‰‹
-
-item.itemIngotRunite.name=虚æ©é”
-item.itemDustRunite.name=虚æ©ç²‰
-item.itemDustTinyRunite.name=å°æ’®è™šæ©ç²‰
-item.itemDustSmallRunite.name=å°å †è™šæ©ç²‰
-item.itemNuggetRunite.name=虚æ©é”
-item.itemPlateRunite.name=虚æ©æ¿
-item.itemPlateDoubleRunite.name=åŒé‡è™šæ©æ¿
-item.itemCellRunite.name=虚æ©å•å…ƒ
-tile.Block of Runite.name=虚æ©å—
-
-item.itemIngotDragonblood.name=龙血é”
-item.itemDustDragonblood.name=龙血粉
-item.itemDustTinyDragonblood.name=å°æ’®é¾™è¡€ç²‰
-item.itemDustSmallDragonblood.name=å°å †é¾™è¡€ç²‰
-item.itemNuggetDragonblood.name=龙血粒
-item.itemPlateDragonblood.name=龙血æ¿
-item.itemPlateDoubleDragonblood.name=åŒé‡é¾™è¡€æ¿
-item.itemCellDragonblood.name=龙血å•å…ƒ
-tile.Block of Dragonblood.name=龙血å—
-
-item.itemIngotBlackTitanium.name=黑钛é”
-item.itemDustBlackTitanium.name=黑钛粉
-item.itemDustTinyBlackTitanium.name=å°æ’®é»‘钛粉
-item.itemDustSmallBlackTitanium.name=å°å †é»‘钛粉
-item.itemNuggetBlackTitanium.name=黑钛粒
-item.itemPlateBlackTitanium.name=黑钛æ¿
-item.itemPlateDoubleBlackTitanium.name=åŒé‡é»‘é’›æ¿
-item.itemCellBlackTitanium.name=黑钛å•å…ƒ
-tile.Block of Black Titanium.name=黑钛å—
-
-item.itemIngotAncientGranite.name=å¤èŠ±å²—岩é”
-item.itemHotIngotAncientGranite.name=çƒå¤èŠ±å²—岩é”
-item.itemDustAncientGranite.name=å¤èŠ±å²—岩粉
-item.itemDustTinyAncientGranite.name=å°æ’®å¤èŠ±å²—岩粉
-item.itemDustSmallAncientGranite.name=å°å †å¤èŠ±å²—岩粉
-item.itemNuggetAncientGranite.name=å¤èŠ±å²—岩粒
-item.itemPlateAncientGranite.name=å¤èŠ±å²—岩æ¿
-item.itemPlateDoubleAncientGranite.name=åŒé‡å¤èŠ±å²—岩æ¿
-tile.Block of Ancient Granite.name=å¤èŠ±å²—岩å—
-
-item.itemIngotBabbitAlloy.name=å·´æ°åˆé‡‘é”
-item.itemHotIngotBabbitAlloy.name=çƒå·´æ°åˆé‡‘é”
-item.itemDustBabbitAlloy.name=å·´æ°åˆé‡‘粉
-item.itemDustTinyBabbitAlloy.name=å°æ’®å·´æ°åˆé‡‘粉
-item.itemDustSmallBabbitAlloy.name=å°å †å·´æ°åˆé‡‘粉
-item.itemNuggetBabbitAlloy.name=å·´æ°åˆé‡‘ç²’
-item.itemPlateBabbitAlloy.name=å·´æ°åˆé‡‘æ¿
-item.itemPlateDoubleBabbitAlloy.name=åŒé‡å·´æ°åˆé‡‘æ¿
-item.itemCellBabbitAlloy.name=å·´æ°åˆé‡‘å•å…ƒ
-tile.Block of Babbit Alloy.name=å·´æ°åˆé‡‘å—
-
-item.itemIngotBlackMetal.name=黑物质é”
-item.itemHotIngotBlackMetal.name=çƒé»‘物质é”
-item.itemDustBlackMetal.name=黑物质粉
-item.itemDustTinyBlackMetal.name=å°æ’®é»‘物质粉
-item.itemDustSmallBlackMetal.name=å°å †é»‘物质粉
-item.itemNuggetBlackMetal.name=黑物质粒
-item.itemPlateBlackMetal.name=黑物质æ¿
-item.itemPlateDoubleBlackMetal.name=åŒé‡é»‘物质æ¿
-item.itemBoltBlackMetal.name=é»‘ç‰©è´¨èžºæ “
-item.itemRodBlackMetal.name=黑物质æ†
-item.itemRodLongBlackMetal.name=长黑物质æ†
-item.itemRingBlackMetal.name=黑物质环
-item.itemScrewBlackMetal.name=黑物质螺ä¸
-item.itemRotorBlackMetal.name=黑物质转å
-item.itemGearBlackMetal.name=黑物质齿轮
-item.itemCellBlackMetal.name=黑物质å•å…ƒ
-tile.Block of Black Metal.name=黑物质å—
-tile.Black Metal Frame Box.name=黑物质框架
-
-item.itemIngotWhiteMetal.name=白物质é”
-item.itemHotIngotWhiteMetal.name=çƒç™½ç‰©è´¨é”
-item.itemDustWhiteMetal.name=白物质粉
-item.itemDustTinyWhiteMetal.name=å°æ’®ç™½ç‰©è´¨ç²‰
-item.itemDustSmallWhiteMetal.name=å°å †ç™½ç‰©è´¨ç²‰
-item.itemNuggetWhiteMetal.name=白物质粒
-item.itemPlateWhiteMetal.name=白物质æ¿
-item.itemPlateDoubleWhiteMetal.name=åŒé‡ç™½ç‰©è´¨æ¿
-item.itemBoltWhiteMetal.name=ç™½ç‰©è´¨èžºæ “
-item.itemRodWhiteMetal.name=白物质æ†
-item.itemRodLongWhiteMetal.name=长白物质æ†
-item.itemRingWhiteMetal.name=白物质环
-item.itemScrewWhiteMetal.name=白物质螺ä¸
-item.itemRotorWhiteMetal.name=白物质转å
-item.itemGearWhiteMetal.name=白物质齿轮
-item.itemCellWhiteMetal.name=白物质å•å…ƒ
-tile.Block of White Metal.name=白物质å—
-tile.White Metal Frame Box.name=白物质框架
-
-//Added 29/04/2019
-tile.OreRunite.name=虚æ©çŸ¿
-item.crushedRunite.name=粉碎的虚æ©çŸ¿
-item.crushedCentrifugedRunite.name=离心的粉碎虚æ©çŸ¿
-item.crushedPurifiedRunite.name=洗净的的粉碎虚æ©çŸ¿
-item.dustImpureRunite.name=å«æ‚虚æ©ç²‰
-item.dustPureRunite.name=洗净虚æ©ç²‰
-
-tile.OreAncientGranite.name=å¤èŠ±å²—岩矿
-item.crushedAncientGranite.name=粉碎的å¤èŠ±å²—岩矿
-item.crushedCentrifugedAncientGranite.name=离心的粉碎å¤èŠ±å²—岩矿
-item.crushedPurifiedAncientGranite.name=洗净的粉碎å¤èŠ±å²—岩矿
-item.dustImpureAncientGranite.name=å«æ‚å¤èŠ±å²—岩粉
-item.dustPureAncientGranite.name=洗净å¤èŠ±å²—岩粉
-
-item.itemIngotRhugnor.name=é²æ ¼è¯ºé”
-item.itemDustRhugnor.name=é²æ ¼è¯ºç²‰
-item.itemDustTinyRhugnor.name=å°æ’®é²æ ¼è¯ºç²‰
-item.itemDustSmallRhugnor.name=å°å †é²æ ¼è¯ºç²‰
-item.itemNuggetRhugnor.name=é²æ ¼è¯ºç²’
-item.itemPlateRhugnor.name=é²æ ¼è¯ºæ¿
-item.itemPlateDoubleRhugnor.name=åŒé‡é²æ ¼è¯ºæ¿
-item.itemCellRhugnor.name=é²æ ¼è¯ºå•å…ƒ
-tile.Block of Rhugnor.name=é²æ ¼è¯ºå—
-
-
-
-
-//Added 13/5/19
-
-item.GTPP.BattPack.01.name=充电工具包[LV]
-item.GTPP.BattPack.02.name=充电工具包[MV]
-item.GTPP.BattPack.03.name=充电工具包[HV]
-item.GTPP.BattPack.04.name=充电工具包[EV]
-item.GTPP.BattPack.05.name=充电工具包[IV]
-item.IndustrialDiamondExquisite.name=精致的工业钻石
-
-item.itemSpringCelestialTungsten.name=天体钨弹簧
-item.itemSpringWhiteMetal.name=白物质弹簧
-item.itemSpringNitinol60.name=é•é’›è¯º60弹簧
-item.itemSpringWatertightSteel.name=防水钢弹簧
-item.itemSpringEglinSteel.name=åŸƒæ ¼æž—é’¢å¼¹ç°§
-
-item.itemSmallSpringMaragingSteel250.name=å°åž‹é©¬æ°ä½“时效钢250弹簧
-item.itemSmallSpringNichrome.name=å°åž‹é•é“¬åˆé‡‘弹簧
-item.itemSmallSpringStaballoy.name=å°åž‹è´«é“€åˆé‡‘弹簧
-item.itemSmallSpringBlackSteel.name=å°åž‹é»‘钢弹簧
-item.itemSmallSpringBlackTitanium.name=å°åž‹é»‘钛弹簧
-
-item.itemFineWireWhiteMetal.name=精致白物质导线
-item.itemFineWirePalladium.name=精致钯导线
-item.itemFineWireZirconium.name=精致锆导线
-item.itemFineWireGrisium.name=精致ç°é’›åˆé‡‘导线
-item.itemFineWireBabbitAlloy.name=精致巴æ°åˆé‡‘导线
-item.itemFineWireKoboldite.name=精致妖金导线
-item.itemFineWireHG1223.name=精致HG-1223导线
-item.itemFineWireQuantum.name=精致é‡å导线
-
-item.itemHeavyPlatePotin.name=é‡åž‹ç²—é’é“œæ¿
-item.itemHeavyPlateWatertightSteel.name=é‡åž‹é˜²æ°´é’¢æ¿
-item.itemHeavyPlateBronze.name=é‡åž‹é’é“œæ¿
-item.itemHeavyPlateOsmiridium.name=é‡åž‹é“±é”‡åˆé‡‘æ¿
-item.itemHeavyPlateQuantum.name=é‡åž‹é‡åæ¿
-item.itemHeavyPlateBlackSteel.name=é‡åž‹é»‘é’¢æ¿
-item.itemHeavyPlateStainlessSteel.name=é‡åž‹ä¸é”ˆé’¢æ¿
-item.itemHeavyPlateEglinSteel.name=é‡åž‹åŸƒæ ¼æž—é’¢æ¿
-item.itemHeavyPlateMaragingSteel300.name=é‡åž‹é©¬æ°ä½“时效钢300æ¿
-item.itemHeavyPlateTalonite.name=铬钴磷酸ç›åˆé‡‘æ¿
-item.itemHeavyPlateHypogen.name=é‡åž‹æµ·ç€çæ¿
-item.itemHeavyPlateRhugnor.name=é‡åž‹é²æ ¼è¯ºæ¿
-item.itemHeavyPlateAdvancedNitinol.name=é‡åž‹é«˜çº§é•é’›è¯ºæ¿
-item.itemHeavyPlateAstralTitanium.name=é‡åž‹æ˜Ÿä½“é’›æ¿
-item.itemHeavyPlateCelestialTungsten.name=é‡åž‹å¤©ä½“é’¨æ¿
-item.itemHeavyPlateWhiteMetal.name=é‡åž‹ç™½ç‰©è´¨æ¿
-item.itemHeavyPlateBlackMetal.name=é‡åž‹é»‘物质æ¿
-item.itemHeavyPlateAncientGranite.name=é‡åž‹å¤èŠ±å²—岩æ¿
-
-item.GTPP.bauble.fireprotection.0.name=超级披è¨æ‰‹å¥—
-
-
-//Added 16/5/19
-item.itemCellSeleniumDioxide.name=二氧化硒å•å…ƒ
-item.itemCellSeleniousAcid.name=亚硒酸å•å…ƒ
-
-//Added 25/7/19
-container.pestkiller=害虫æ€æ‰‹
-
-//Added 15/8/19
-gtpp.nei.decayables=å¯è¡°å˜ç®±å(é“…å°ç›’)
-entity.batKing.name=è™è 之王
-item.itemCellCarbyne.name=直链乙炔碳å•å…ƒ
-item.itemCellHydrogenCyanide.name=氢氰酸å•å…ƒ
-item.itemCactusCharcoal.name=仙人掌ç‚
-item.itemCactusCoke.name=仙人掌焦ç‚
-item.itemSugarCharcoal.name=ç³–ç‚
-item.itemSugarCoke.name=糖焦ç‚
-item.LiquidHydrogen.name=液氢å•å…ƒ[LOH]
-
-
-
-//Added 24/8/19
-//Debug Labels
-tile.blockDoorAlloy.name=防爆门
-tile.blockInhibitorObelisk.name=ä¼ é€æŠ‘制方尖碑
-tile.Battlesign.name=战斗牌å
-tile.blockMagicBox.name=奥法之盒
-tile.blockManaPod.name=法力èšèŒŽ
-tile.buildToolBlock.name=工具方å—
-tile.blockRedPlasma.name=红色ç‰ç¦»å体方å—
-tile.pipeBlock.name=管é“
-item.null.name=å‘ALKALUS报告错误
-
-
-//Added 24/8/19
-tile.OreGreenockite.name=硫镉矿石
-item.crushedGreenockite.name=粉碎的硫镉矿石
-item.crushedCentrifugedGreenockite.name=离心硫镉矿石
-item.crushedPurifiedGreenockite.name=洗净的硫镉矿石
-item.dustImpureGreenockite.name=å«æ‚硫镉矿粉
-item.dustPureGreenockite.name=æ´å‡€ç¡«é•‰çŸ¿ç²‰
-item.itemDustGreenockite.name=硫镉矿粉
-item.itemDustTinyGreenockite.name=å°æ’®ç¡«é•‰çŸ¿ç²‰
-item.itemDustSmallGreenockite.name=å°å †ç¡«é•‰çŸ¿ç²‰
-
-tile.OreRareEarthI.name=稀土(I)矿石
-item.crushedRareEarthI.name=粉碎的稀土(I)矿石
-item.crushedCentrifugedRareEarthI.name=离心稀土(I)矿石
-item.crushedPurifiedRareEarthI.name=洗净的稀土(I)矿石
-item.dustImpureRareEarthI.name=å«æ‚稀土(I)粉
-item.dustPureRareEarthI.name=æ´å‡€ç¨€åœŸ(I)粉
-item.itemDustRareEarthI.name=稀土(I)粉
-item.itemDustTinyRareEarthI.name=å°æ’®ç¨€åœŸ(I)粉
-item.itemDustSmallRareEarthI.name=å°å †ç¨€åœŸ(I)粉
-
-tile.OreRareEarthII.name=稀土(II)矿石
-item.crushedRareEarthII.name=粉碎的稀土(II)矿石
-item.crushedCentrifugedRareEarthII.name=离心稀土(II)矿石
-item.crushedPurifiedRareEarthII.name=洗净的稀土(II)矿石
-item.dustImpureRareEarthII.name=å«æ‚稀土(II)粉
-item.dustPureRareEarthII.name=æ´å‡€ç¨€åœŸ(II)粉
-item.itemDustRareEarthII.name=稀土(II)粉
-item.itemDustTinyRareEarthII.name=å°æ’®ç¨€åœŸ(II)粉
-item.itemDustSmallRareEarthII.name=å°å †ç¨€åœŸ(II)粉
-
-tile.OreRareEarthIII.name=稀土(III)矿石
-item.crushedRareEarthIII.name=粉碎的稀土(III)矿石
-item.crushedCentrifugedRareEarthIII.name=离心稀土(III)矿石
-item.crushedPurifiedRareEarthIII.name=洗净的稀土(III)矿石
-item.dustImpureRareEarthIII.name=å«æ‚稀土(III)粉
-item.dustPureRareEarthIII.name=æ´å‡€ç¨€åœŸ(III)粉
-item.itemDustRareEarthIII.name=稀土(III)粉
-item.itemDustTinyRareEarthIII.name=å°æ’®ç¨€åœŸ(III)粉
-item.itemDustSmallRareEarthIII.name=å°å †ç¨€åœŸ(III)粉
-
-
-
-//Added 13/10/19
-tile.blockRoundRobinator.0.name=自动输出机 I
-tile.blockRoundRobinator.1.name=自动输出机 II
-tile.blockRoundRobinator.2.name=自动输出机 III
-tile.blockRoundRobinator.3.name=自动输出机 IV
-tile.blockRoundRobinator.4.name=自动输出机 V
-
-
-//Added 16/10/19
-item.BioRecipeSelector.name=编程生物电路
-item.FermentationBase.name=å‘酵基å•å…ƒ
-item.ureamix.name=å°¿ç´ æ··åˆç‰©å•å…ƒ
-item.liquidresin.name=液æ€æ ‘è„‚å•å…ƒ
-item.propionicacid.name=丙酸å•å…ƒ
-item.aceticacid.name=乙酸å•å…ƒ
-item.BasicAgrichemItem.0.name=藻类生物质
-item.BasicAgrichemItem.1.name=绿藻生物质
-item.BasicAgrichemItem.2.name=è¤è—»ç”Ÿç‰©è´¨
-item.BasicAgrichemItem.3.name=金è¤è—»ç”Ÿç‰©è´¨
-item.BasicAgrichemItem.4.name=红藻生物质
-item.BasicAgrichemItem.5.name=çº¤ç»´ç´ çº¤ç»´
-item.BasicAgrichemItem.6.name=金è¤çº¤ç»´ç´ 纤维
-item.BasicAgrichemItem.7.name=çº¢è‰²çº¤ç»´ç´ çº¤ç»´
-item.BasicAgrichemItem.8.name=å †è‚¥
-item.BasicAgrichemItem.9.name=木颗粒
-item.BasicAgrichemItem.10.name=æœ¨ç –
-item.BasicAgrichemItem.11.name=çº¤ç»´ç´ æµ†
-item.BasicAgrichemItem.12.name=ç²—åˆ¶ç”Ÿç‰©æ ‘è„‚
-item.BasicAgrichemItem.13.name=催化剂载体
-item.BasicAgrichemItem.14.name=绿色金属催化剂
-item.BasicAgrichemItem.15.name=藻酸
-item.BasicAgrichemItem.16.name=氧化é“
-item.BasicAgrichemItem.17.name=é“颗粒
-item.BasicAgrichemItem.18.name=é“é…¸é’
-item.BasicAgrichemItem.19.name=氢氧化é’
-item.BasicAgrichemItem.20.name=碳酸é’
-item.BasicAgrichemItem.21.name=氯化锂
-
-//Added 24/10/19
-item.butanol.name=ä¸é†‡å•å…ƒ
-
-//Try Fix IC2 Garbage vv
-fluidHotWater=çƒæ°´
-fluidHotWater.name=çƒæ°´
-//Try Fix IC2 Garbage ^^
-
-
-//Added 11/12/19
-item.itemHotIngotTitanium.name=çƒé’›é”
-item.OilHeavy.name=é‡æ²¹å•å…ƒ
-item.UnsymmetricalDimethylhydrazine.name=å二甲肼å•å…ƒ
-item.benzene.name=苯å•å…ƒ
-item.Benzene.name=苯å•å…ƒ
-item.phenol.name=苯酚å•å…ƒ
-item.CarbonDioxide.name=二氧化碳å•å…ƒ
-item.itemCellCarbonDioxide.name=二氧化碳å•å…ƒ
-item.CarbonMonoxide.name=一氧化碳å•å…ƒ
-item.itemCellCarbonMonoxide.name=一氧化碳å•å…ƒ
-item.acetone.name=丙酮å•å…ƒ
-item.saltwater.name=ç›æ°´å•å…ƒ
-item.BasicAgrichemItem.22.name=模具(颗粒)
-item.BasicAgrichemItem.23.name=æ´å‡€é“æ··åˆç‰©
-
-//Added 12/12/19
-
-item.BasicGenericChemItem.0.name=红色金属催化剂
-item.BasicGenericChemItem.1.name=黄色金属催化剂
-item.BasicGenericChemItem.2.name=è“色金属催化剂
-item.BasicGenericChemItem.3.name=橙色金属催化剂
-item.BasicGenericChemItem.4.name=紫色金属催化剂
-item.BasicGenericChemItem.5.name=棕色金属催化剂
-item.MudRedSlurry.name=红色泥浆å•å…ƒ
-item.liquid_toluene.name=甲苯å•å…ƒ
-
-item.BasicAlgaeItem.0.name=å¯åŸ¹æ¤è—»ç±»(I)
-item.BasicAlgaeItem.1.name=å¯åŸ¹æ¤è—»ç±»(II)
-item.BasicAlgaeItem.2.name=å¯åŸ¹æ¤è—»ç±»(III)
-item.BasicAlgaeItem.3.name=å¯åŸ¹æ¤è—»ç±»(IV)
-item.BasicAlgaeItem.4.name=å¯åŸ¹æ¤è—»ç±»(V)
-item.BasicAlgaeItem.5.name=å¯åŸ¹æ¤è—»ç±»(VI)
-item.BasicAlgaeItem.6.name=å¯åŸ¹æ¤è—»ç±»(VII)
-
-//Added 17/01/20
-item.BasicGenericChemItem.6.name=粉色金属催化剂
-
-//Added 23/03/20
-item.BasicMetaFood.0.name=生人肉
-item.BasicMetaFood.1.name=熟人肉
-item.BasicMetaFood.2.name=生马肉
-item.BasicMetaFood.3.name=熟马肉
-item.BasicMetaFood.4.name=生狼肉
-item.BasicMetaFood.5.name=熟狼肉
-item.BasicMetaFood.6.name=生猫肉
-item.BasicMetaFood.7.name=熟猫肉
-item.BasicMetaFood.8.name=烈焰人肉
-
-item.itemCellNaquadahFuel.name=硅岩燃料å•å…ƒ
-item.itemCellEnrichedNaquadahFuel.name=富集硅岩燃料å•å…ƒ
-item.itemCellNaquadriaFuel.name=超能硅岩燃料å•å…ƒ
-item.boricacid.name=硼酸å•å…ƒ
-item.hydrochloricacid.name=ç›é…¸å•å…ƒ
-
-item.BasicAlgaeItem.name=å¯åŸ¹æ¤è—»ç±»
-item.BasicAlgaeItem.0.name=å¯åŸ¹æ¤è—»ç±»(I)
-item.BasicAlgaeItem.1.name=å¯åŸ¹æ¤è—»ç±»(II)
-item.BasicAlgaeItem.2.name=å¯åŸ¹æ¤è—»ç±»(III)
-item.BasicAlgaeItem.3.name=å¯åŸ¹æ¤è—»ç±»(IV)
-item.BasicAlgaeItem.4.name=å¯åŸ¹æ¤è—»ç±»(V)
-item.BasicAlgaeItem.5.name=å¯åŸ¹æ¤è—»ç±»(VI)
-item.BasicAlgaeItem.6.name=å¯åŸ¹æ¤è—»ç±»(VII)
-
-//Added 30/03/20
-item.milledChalcopyrite.name=ç ”ç£¨é»„é“œçŸ¿
-item.milledSphalerite.name=ç ”ç£¨é—ªé”ŒçŸ¿
-item.milledNickel.name=ç ”ç£¨é•çŸ¿
-item.milledPlatinum.name=ç ”ç£¨é“‚çŸ¿
-item.milledPentlandite.name=ç ”ç£¨é•é»„é“矿
-item.FrothZincflotation.name=闪锌矿浮选泡沫å•å…ƒ
-item.FrothCopperflotation.name=黄铜矿浮选泡沫å•å…ƒ
-item.FrothNickelflotation.name=é•çŸ¿æµ®é€‰æ³¡æ²«å•å…ƒ
-item.FrothPlatinumflotation.name=铂矿浮选泡沫å•å…ƒ
-item.FrothPentlanditeflotation.name=é•é»„é“矿浮选泡沫å•å…ƒ
-item.BasicGenericChemItem.7.name=é“ç ”ç£¨çƒ
-item.BasicGenericChemItem.8.name=çš‚çŸ³ç ”ç£¨çƒ
-
-//Added 31/03/20
-item.BasicGenericChemItem.9.name=ä¹™é†‡é’ ç²‰
-item.BasicGenericChemItem.10.name=ä¹™åŸºé»„åŽŸé…¸é’ ç²‰
-item.BasicGenericChemItem.11.name=乙基黄原酸钾粉
-item.BasicGenericChemItem.12.name=氢氧化钾粉
-item.CarbonDisulfide.name=二硫化碳å•å…ƒ
-item.HydrogenSulfide.name=硫化氢å•å…ƒ
-item.BasicAgrichemItem.24.name=æ¾æžœ
-item.BasicAgrichemItem.25.name=æ¾æ ‘碎料
-item.pineoil.name=æ¾æ²¹å•å…ƒ
-
-//Added 11/4/20
-item.milledRedstone.name=ç ”ç£¨çº¢çŸ³çŸ¿
-item.milledSpessartine.name=ç ”ç£¨é”°é“榴石
-item.milledGrossular.name=ç ”ç£¨é’™é“榴石
-item.milledAlmandine.name=ç ”ç£¨é“é“榴石
-item.milledPyrope.name=ç ”ç£¨é•é“榴石
-item.FrothRedstoneflotation.name=红石矿浮选泡沫å•å…ƒ
-item.FrothSpessartineflotation.name=é”°é“榴石浮选泡沫å•å…ƒ
-item.FrothGrossularflotation.name=é’™é“榴石浮选泡沫å•å…ƒ
-item.FrothAlmandineflotation.name=é“é“榴石浮选泡沫å•å…ƒ
-item.FrothPyropeflotation.name=é•é“榴石浮选泡沫å•å…ƒ
-
-//Added 13/04/20
-item.T3RecipeSelector.name=çªç ´ç¼–程电路
-
-//Added 03/05/20
-entity.miscutils.batKing.name=å¹½çµè™è
-entity.miscutils.bigChickenFriendly.name=巨大的鸡
-entity.miscutils.AusDingo.name=澳洲野狗
-entity.miscutils.AusBoar.name=澳洲野猪
-entity.miscutils.AusSpider.name=森林蜘蛛
-entity.miscutils.AusOctopus.name=æ¾³æ´²ç« é±¼
-container.EggBox=鸡蛋åµåŒ–ç›’
-
-//Added 24/05/20
-container.VolumetricFlaskSetter=容é‡ç“¶é…置器
-
-//Added 26/05/20
-item.itemIngotLaurenium.name=劳伦姆åˆé‡‘é”
-item.itemHotIngotLaurenium.name=çƒåŠ³ä¼¦å§†åˆé‡‘é”
-item.itemDustLaurenium.name=劳伦姆åˆé‡‘粉
-item.itemDustTinyLaurenium.name=å°æ’®åŠ³ä¼¦å§†åˆé‡‘粉
-item.itemDustSmallLaurenium.name=å°å †åŠ³ä¼¦å§†åˆé‡‘粉
-item.itemNuggetLaurenium.name=劳伦姆åˆé‡‘ç²’
-item.itemPlateLaurenium.name=劳伦姆åˆé‡‘æ¿
-item.itemPlateDoubleLaurenium.name=åŒé‡åŠ³ä¼¦å§†åˆé‡‘æ¿
-item.itemBoltLaurenium.name=劳伦姆åˆé‡‘èžºæ “
-item.itemRodLaurenium.name=劳伦姆åˆé‡‘æ†
-item.itemRodLongLaurenium.name=长劳伦姆åˆé‡‘æ†
-item.itemRingLaurenium.name=劳伦姆åˆé‡‘环
-item.itemScrewLaurenium.name=劳伦姆åˆé‡‘螺ä¸
-item.itemRotorLaurenium.name=劳伦姆åˆé‡‘转å
-item.itemGearLaurenium.name=劳伦姆åˆé‡‘齿轮
-item.itemCellLaurenium.name=劳伦姆åˆé‡‘å•å…ƒ
-tile.Block of Laurenium.name=劳伦姆åˆé‡‘å—
-tile.Laurenium Frame Box.name=劳伦姆åˆé‡‘框架
-item.itemIngotBotmium.name=åšç‰¹å§†åˆé‡‘é”
-item.itemHotIngotBotmium.name=çƒåšç‰¹å§†åˆé‡‘é”
-item.itemDustBotmium.name=åšç‰¹å§†åˆé‡‘粉
-item.itemDustTinyBotmium.name=å°æ’®åšç‰¹å§†åˆé‡‘粉
-item.itemDustSmallBotmium.name=å°å †åšç‰¹å§†åˆé‡‘粉
-item.itemNuggetBotmium.name=åšç‰¹å§†åˆé‡‘ç²’
-item.itemPlateBotmium.name=åšç‰¹å§†åˆé‡‘æ¿
-item.itemPlateDoubleBotmium.name=åŒé‡åšç‰¹å§†åˆé‡‘æ¿
-item.itemBoltBotmium.name=åšç‰¹å§†åˆé‡‘èžºæ “
-item.itemRodBotmium.name=åšç‰¹å§†åˆé‡‘æ†
-item.itemRodLongBotmium.name=é•¿åšç‰¹å§†åˆé‡‘æ†
-item.itemRingBotmium.name=åšç‰¹å§†åˆé‡‘环
-item.itemScrewBotmium.name=åšç‰¹å§†åˆé‡‘螺ä¸
-item.itemRotorBotmium.name=åšç‰¹å§†åˆé‡‘转å
-item.itemGearBotmium.name=åšç‰¹å§†åˆé‡‘齿轮
-item.itemCellBotmium.name=åšç‰¹å§†åˆé‡‘å•å…ƒ
-tile.Block of Botmium.name=åšç‰¹å§†åˆé‡‘å—
-tile.Botmium Frame Box.name=åšç‰¹å§†åˆé‡‘框架
-
-//Added 29/05/20
-item.itemBasicTurbine.name=基础涡轮
-item.itemBasicTurbine_0.name=基础é“涡轮
-item.itemBasicTurbine_1.name=基础é’铜涡轮
-
-interaction.voidexcess.enabled=å¯ç”¨è¿‡é‡é”€æ¯
-interaction.voidexcess.disabled=ç¦ç”¨è¿‡é‡é”€æ¯
-
-interaction.separateBusses.enabled=独立输入总线
+//Creative Tabs +itemGroup.MiscUtilBlockTab=[GT++] æ–¹å— +itemGroup.MiscUtilMiscTab=[GT++] ç‰©å“ +itemGroup.MiscUtilCombatTab=[GT++] 战斗 +itemGroup.MiscUtilToolsTab=[GT++] 工具 +itemGroup.MiscUtilMachineTab=[GT++] 机器 +itemGroup.MiscUtilOtherTab=[GT++] ç‰©å“ II +itemGroup.MiscUtilBOP=[GT++]超多生物群系附属 + +//Debug +item.AAA_Broken.name=[ä¸å˜åœ¨çš„物å“]请在Github上å馈这个åˆæˆ +item.itemBedLocator_Base.name=床定ä½å™¨[NBT测试] +item.itemBaseItemWithCharge.name=基础å¯å……ç”µç‰©å“ +item.miscutils_itemDebugShapeSpawner.name=[调试用]å¡‘å½¢ + +//Fluids +tile.fluidSludge.name=ä¸æµåŠ¨çš„废水 +tile.fluidSludge.0.name=ä¸æµåŠ¨çš„废水 + +//Death Messages +death.attack.plasmabolt=%s æ»äºŽæ»šçƒ«çš„ç‰ç¦»å体. +death.attack.plasmabolt.player=%1$s 被 %2$s 使用ç‰ç¦»å体击æ€. +death.attack.gtpp.grinder=%s 被艾è¨ç ”磨机磨æˆäº†æ¸£æ¸£. + +//Alternative Materials +item.itemPlateBatteryAlloy.name=ç”µæ± åˆé‡‘æ¿ +item.itemIngotBatteryAlloy.name=ç”µæ± åˆé‡‘é” +item.itemStickyRubber.name=粘性橡胶团 + +//Unused Fuel rods +item.itemFuelRod_Empty.name=空燃料棒 +item.itemFuelRod_Thorium.name=é’燃料棒 +item.itemFuelRod_Uranium.name=铀燃料棒 +item.itemFuelRod_Plutonium.name=钚燃料棒 + +//Entities +entity.constructStaballoy.name=è´«é“€åˆé‡‘结构 +entity.sickBlaze.name=被感染的狂çƒè€… + +//Tile Entities +tile.blockToolBuilder.name=æ ¼é›·å·¥å…·ç»„è£…å° + +//Tools +item.itemBufferCore.name=能é‡æ ¸å¿ƒ +item.itemStaballoyPickaxe.name=隧é“挖掘者 +item.itemStaballoyAxe.name=æ ‘æž—ç ä¼è€… +item.itemSandstoneHammer.name=圆石粉碎者 + +//Thermal Foundation Stuff +item.MiscUtils.bucket.bucketPyrotheum.name=烈焰之炽焱桶 +item.MiscUtils.bucket.bucketCryotheum.name=æžå¯’之凛冰桶 +item.MiscUtils.bucket.bucketEnder.name=è°æŒ¯ç†”èžæœ«å½±çç 桶 +item.MiscUtils.material.dustPyrotheum.name=炽焱之尘 +item.MiscUtils.material.dustCryotheum.name=凛冰之尘 +item.MiscUtils.material.rodBlizz.name=暴雪棒 +item.MiscUtils.material.dustBlizz.name=暴雪粉 + +//============== +tile.miscutils.fluid.pyrotheum.name=烈焰之炽焱 +tile.miscutils.fluid.cryotheum.name=æžå¯’之凛冰 +tile.miscutils.fluid.ender.name=è°æŒ¯ç†”èžæœ«å½±çç +//============== + +//Forestry Stuff +item.frameAccelerated.name=åŠ é€Ÿæ¡†æž¶ +item.frameVoid.name=虚空框架 +item.frameMutagenic.name=诱å˜æ¡†æž¶ +item.frameBusy.name=工作框架 +item.frameChocolate.name=巧克力框架 +item.frameRestraint.name=约æŸæ¡†æž¶ +item.frameSoul.name=çµé‚框架 +item.frameHealing.name=治愈框架 +item.frameNova.name=新星框架 +item.frameArborists.name=æ ‘è‰ºæ¡†æž¶ +item.frameDecaying.name=è…烂框架 +item.frameSlowing.name=å‡é€Ÿæ¡†æž¶ +item.frameStabilizing.name=稳定框架 +item.frameUseless.name=æ— ç”¨æ¡†æž¶ + +//IC2 stuff +item.itemEnergeticRotorBlade.name=充能åˆé‡‘æ‰‡å¶ +item.itemTungstenSteelRotorBlade.name=é’¨é’¢æ‰‡å¶ +item.itemVibrantRotorBlade.name=脉冲åˆé‡‘æ‰‡å¶ +item.itemIridiumRotorBlade.name=é“±æ‰‡å¶ +item.itemEnergeticShaft.name=充能åˆé‡‘è½´ +item.itemTungstenSteelShaft.name=钨钢轴 +item.itemVibrantShaft.name=脉冲åˆé‡‘è½´ +item.itemIridiumShaft.name=铱轴 +item.itemMagnaliumRotorBlade.name=é•é“åˆé‡‘æ‰‡å¶ +item.itemUltimetRotorBlade.name=哈æ°åˆé‡‘æ‰‡å¶ +item.itemMagnaliumShaft.name=é•é“åˆé‡‘è½´ +item.itemUltimetShaft.name=哈æ°åˆé‡‘è½´ + + +//Misc Items +item.itemPLACEHOLDER_Circuit.name=夸克æ“纵者 (UV) +item.itemPlateEnrichedSoularium.name=富集阳光åˆé‡‘æ¿ +item.itemHeliumBlob.name=神秘氢气物质 +item.itemAlkalusDisk.name=Alkalus圆盘 +item.itemHotIngotRaisinBread.name=一份çƒè‘¡è„å¹²é¢åŒ… +item.itemIngotRaisinBread.name=一份葡è„å¹²é¢åŒ… + +//Misc Blocks +tile.blockCompressedObsidian.0.name=压缩黑曜石(9) +tile.blockCompressedObsidian.1.name=二é‡åŽ‹ç¼©é»‘曜石(81) +tile.blockCompressedObsidian.2.name=三é‡åŽ‹ç¼©é»‘曜石(729) +tile.blockCompressedObsidian.3.name=å››é‡åŽ‹ç¼©é»‘曜石(6561) +tile.blockCompressedObsidian.4.name=五é‡åŽ‹ç¼©é»‘曜石(59049) +tile.blockCompressedObsidian.5.name=å转黑曜石 +tile.blockNet.name=网 + + +//GT++ Items + +//Meta Tool +MU-metaitem.01.0.name=MU-metaitem.01.0.name + +//Cells +item.SulfurDioxide.name=优质二氧化硫å•å…ƒ +item.mobessence.name=怪物精åŽæ¶²å•å…ƒ +item.Fertiliser.name=æµä½“肥料å•å…ƒ +item.UN32Fertiliser.name=UN-32肥料å•å…ƒ +item.UN18Fertiliser.name=UN-18肥料å•å…ƒ +item.RaisinJuice.name=è‘¡è„æ±å•å…ƒ +item.BerylliumHydroxide.name=氢氧化é“å•å…ƒ +item.AmmoniumBifluoride.name=氟化氢铵å•å…ƒ +item.Hydroxide.name=氢氧化物å•å…ƒ +item.Ammonium.name=铵å•å…ƒ +item.AmmoniumTetrafluoroberyllate.name=四氟硼酸铵å•å…ƒ + +//Resources +item.itemStickyRubber.name=粘性橡胶团 +item.itemCoalCoke.name=焦煤 +item.itemHydrogenBlob.name=神秘氢气团 +item.itemHeliumBlob.name=神秘氢气物质 + +//Normal Items +item.itemAlkalusDisk.name=Alkalus圆盘 +item.itemSimpleFiremaker.name=基础起ç«å™¨ +item.itemFiber.name=æ¤ç‰©çº¤ç»´ +item.itemRope.name=绳索 +item.backpackRed.name=红色背包 +item.backpackGreen.name=绿色背包 +item.backpackBlue.name=è“色背包 +item.backpackYellow.name=黄色背包 +item.backpackPurple.name=紫色背包 +item.backpackCyan.name=é’色背包 +item.backpackMaroon.name=棕色背包 +item.backpackOlive.name=橄榄绿色背包 +item.backpackDarkGreen.name=深绿色背包 +item.backpackDarkPurple.name=深紫色背包 +item.backpackTeal.name=è“绿色背包 +item.backpackNavy.name=æ·±è“色背包 +item.backpackSilver.name=银色背包 +item.backpackGray.name=ç°è‰²èƒŒåŒ… +item.backpackBlack.name=黑色背包 +item.backpackWhite.name=白色背包 +item.itemBlueprint.name=è“图[æ— ç”¨] +item.itemGemShards.name=钻石碎片 +item.itemHalfCompleteCasings.name=åŠæˆå“æœºæ¢°æ–¹å— +item.itemSulfuricPotion.name=喷溅型 ç¡«é…¸ +item.itemHydrofluoricPotion.name=喷溅型 氢氟酸 +item.itemIngotRaisinBread.name=一份葡è„å¹²é¢åŒ… +item.itemHotIngotRaisinBread.name=一份çƒè‘¡è„å¹²é¢åŒ… +item.itemFoodRaisinToast.name=一份葡è„干烤é¢åŒ… +item.itemHotFoodRaisinToast.name=一份çƒè‘¡è„干烤é¢åŒ… +item.itemFoodCurriedSausages.name=ä¸€ä»½å’–å–±é¦™è‚ +item.itemHotFoodCurriedSausages.name=一份çƒå’–å–±é¦™è‚ + + +//Conversion Dusts +item.dustNeptunium238.name=é•Ž 238粉 +item.dustRadium226.name=é• 226粉 +item.itemDustDecayedRadium226.name=è¡°å˜é• 226粉 +item.itemDustSmallDecayedRadium226.name=å°å †è¡°å˜é• 226粉 +item.itemDustTinyDecayedRadium226.name=å°æ’®è¡°å˜é• 226粉 + +//Material Items +item.itemDustGadolinium.name=钆粉 +item.itemDustSmallGadolinium.name=å°å †é’†ç²‰ +item.itemDustTinyGadolinium.name=å°æ’®é’†ç²‰ +item.itemDustYtterbium.name=镱粉 +item.itemDustSmallYtterbium.name=å°å †é•±ç²‰ +item.itemDustTinyYtterbium.name=å°æ’®é•±ç²‰ +item.itemDustSamarium.name=é’粉 +item.itemDustSmallSamarium.name=å°å †é’粉 +item.itemDustTinySamarium.name=å°æ’®é’粉 +item.itemDustLanthanum.name=镧粉 +item.itemDustSmallLanthanum.name=å°å †é•§ç²‰ +item.itemDustTinyLanthanum.name=å°æ’®é•§ç²‰ +item.itemCellNeon.name=æ°–å•å…ƒ +item.itemCellGermanium.name=é”—å•å…ƒ +item.itemCellSelenium.name=ç¡’å•å…ƒ +item.itemCellBromine.name=溴å•å…ƒ +item.itemCellKrypton.name=æ°ªå•å…ƒ +item.itemCellZirconium.name=锆å•å…ƒ +item.itemCellTechnetium.name=é”å•å…ƒ +item.itemCellRuthenium.name=é’Œå•å…ƒ +item.itemCellRhodium.name=é“‘å•å…ƒ +item.itemCellIodine.name=碘å•å…ƒ +item.itemCellXenon.name=æ°™å•å…ƒ +item.itemCellHafnium.name=铪å•å…ƒ +item.itemCellRhenium.name=铼å•å…ƒ +item.itemCellThallium.name=é“Šå•å…ƒ +item.itemCellPolonium.name=é’‹å•å…ƒ +item.itemCellAstatine.name=ç ¹å•å…ƒ +item.itemCellFrancium.name=é’«å•å…ƒ +item.itemCellRadium.name=é•å•å…ƒ +item.itemCellActinium.name=锕å•å…ƒ +item.itemCellProtactinium.name=镤å•å…ƒ +item.itemCellNeptunium.name=é•Žå•å…ƒ +item.itemCellCurium.name=é””å•å…ƒ +item.itemCellBerkelium.name=锫å•å…ƒ +item.itemCellCalifornium.name=锎å•å…ƒ +item.itemCellEinsteinium.name=锿å•å…ƒ +item.itemCellFermium.name=é•„å•å…ƒ +item.itemCellRefinedTrinium.name=精制三元金属å•å…ƒ +item.itemIngotSelenium.name=ç¡’é” +item.itemDustSelenium.name=硒粉 +item.itemDustTinySelenium.name=å°æ’®ç¡’粉 +item.itemDustSmallSelenium.name=å°å †ç¡’粉 +item.itemNuggetSelenium.name=ç¡’ç²’ +item.itemPlateSelenium.name=ç¡’æ¿ +item.itemPlateDoubleSelenium.name=åŒé‡ç¡’æ¿ +item.itemBoltSelenium.name=ç¡’èžºæ “ +item.itemRodSelenium.name=ç¡’æ† +item.itemRodLongSelenium.name=é•¿ç¡’æ† +item.itemRingSelenium.name=硒环 +item.itemScrewSelenium.name=ç¡’èžºä¸ +item.itemRotorSelenium.name=硒转å +item.itemGearSelenium.name=硒齿轮 +item.itemCellUranium232.name=é“€-232å•å…ƒ +item.itemCellUranium233.name=é“€-233å•å…ƒ +item.itemCellThoriumTetrafluoride.name=四氟化é’å•å…ƒ +item.itemCellThoriumHexafluoride.name=å…氟化é’å•å…ƒ +item.itemCellUraniumTetrafluoride.name=四氟化铀å•å…ƒ +item.itemCellUraniumHexafluoride.name=å…氟化铀å•å…ƒ +item.itemCellZirconiumTetrafluoride.name=四氟化锆å•å…ƒ +item.itemCellBerylliumFluoride.name=氟化é“å•å…ƒ +item.itemCellLithiumFluoride.name=氟化锂å•å…ƒ +item.itemCellHydroxide.name=氢氧化物å•å…ƒ +item.itemCellAmmonium.name=铵å•å…ƒ +item.itemCellAmmoniumBifluoride.name=氟化氢铵å•å…ƒ +item.itemCellBerylliumHydroxide.name=氢氧化é“å•å…ƒ +item.itemCellAmmoniumTetrafluoroberyllate.name=æ°Ÿé“酸铵å•å…ƒ +item.itemCellNeptuniumHexafluoride.name=å…氟化铀å•å…ƒ +item.itemCellTechnetiumHexafluoride.name=å…氟化é”å•å…ƒ +item.itemCellSeleniumHexafluoride.name=å…氟化硒å•å…ƒ +item.itemCellEnergyCrystal.name=能é‡æ°´æ™¶å•å…ƒ +item.itemCellBloodSteel.name=血钢å•å…ƒ +item.itemCellStaballoy.name=è´«é“€åˆé‡‘å•å…ƒ +item.itemCellTantalloy60.name=钽钨åˆé‡‘-60å•å…ƒ +item.itemCellTantalloy61.name=钽钨åˆé‡‘-61å•å…ƒ +item.itemCellTumbaga.name=铜金åˆé‡‘å•å…ƒ +item.itemCellPotin.name=ç²—é’é“œåˆé‡‘å•å…ƒ +item.itemCellInconel625.name=é•é“¬åŸºåˆé‡‘-625å•å…ƒ +item.itemCellInconel690.name=é•é“¬åŸºåˆé‡‘-690å•å…ƒ +item.itemCellInconel792.name=é•é“¬åŸºåˆé‡‘-792å•å…ƒ +item.itemCellZeron100.name=å¡žé¾™-100å•å…ƒ +item.itemCellMaragingSteel250.name=马æ°ä½“时效钢250å•å…ƒ +item.itemCellMaragingSteel300.name=马æ°ä½“时效钢300å•å…ƒ +item.itemCellMaragingSteel350.name=马æ°ä½“时效钢350å•å…ƒ +item.itemCellStellite.name=铬钴锰钛åˆé‡‘å•å…ƒ +item.itemCellTalonite.name=铬钴磷酸ç›åˆé‡‘å•å…ƒ +item.itemCellHastelloyW.name=哈斯特洛ä¾åˆé‡‘-Wå•å…ƒ +item.itemCellHastelloyX.name=哈斯特洛ä¾åˆé‡‘-Xå•å…ƒ +item.itemCellHastelloyN.name=哈斯特洛ä¾åˆé‡‘-Nå•å…ƒ +item.itemCellHastelloyC276.name=哈斯特洛ä¾åˆé‡‘-C276å•å…ƒ +item.itemCellIncoloy020.name=è€çƒè€çƒé“¬é“åˆé‡‘-020å•å…ƒ +item.itemCellIncoloyDS.name=è€çƒé“¬é“åˆé‡‘-DSå•å…ƒ +item.itemCellIncoloyMA956.name=è€çƒè€çƒé“¬é“åˆé‡‘-MA956å•å…ƒ +item.itemCellTungstenCarbide.name=碳化钨å•å…ƒ +item.itemCellSiliconCarbide.name=碳化硅å•å…ƒ +item.itemCellTantalumCarbide.name=碳化钽å•å…ƒ +item.itemCellZirconiumCarbide.name=碳化锆å•å…ƒ +item.itemCellNiobiumCarbide.name=碳化铌å•å…ƒ +item.itemCellGrisium.name=ç°é’›åˆé‡‘å•å…ƒ +item.itemCellEglinSteelBaseCompound.name=åŸƒæ ¼æž—é’¢å•å…ƒ +item.itemCellEglinSteel.name=åŸƒæ ¼æž—é’¢å•å…ƒ +item.itemCellHG1223.name=HG-1223å•å…ƒ +item.itemCellTriniumTitaniumAlloy.name=三元钛åˆé‡‘å•å…ƒ +item.itemCellTriniumNaquadahAlloy.name=三元硅岩åˆé‡‘å•å…ƒ +item.itemCellTriniumNaquadahCarbonite.name=碳化三元硅岩åˆé‡‘å•å…ƒ +item.itemCellQuantum.name=é‡ååˆé‡‘å•å…ƒ +item.itemIngotBromine.name=æº´é” +item.itemDustBromine.name=溴粉 +item.itemDustTinyBromine.name=å°æ’®æº´ç²‰ +item.itemDustSmallBromine.name=å°å †æº´ç²‰ +item.itemNuggetBromine.name=溴粒 +item.itemPlateBromine.name=æº´æ¿ +item.itemPlateDoubleBromine.name=åŒé‡æº´æ¿ +item.itemIngotStrontium.name=é”¶é” +item.itemDustStrontium.name=锶粉 +item.itemDustTinyStrontium.name=å°æ’®é”¶ç²‰ +item.itemDustSmallStrontium.name=å°å †é”¶ç²‰ +item.itemNuggetStrontium.name=锶粒 +item.itemPlateStrontium.name=é”¶æ¿ +item.itemPlateDoubleStrontium.name=åŒé‡é”¶æ¿ +item.itemBoltStrontium.name=é”¶èžºæ “ +item.itemRodStrontium.name=é”¶æ† +item.itemRodLongStrontium.name=é•¿é”¶æ† +item.itemRingStrontium.name=锶环 +item.itemScrewStrontium.name=é”¶èžºä¸ +item.itemRotorStrontium.name=锶转å +item.itemGearStrontium.name=锶齿轮 +item.itemIngotZirconium.name=é”†é” +item.itemDustZirconium.name=锆粉 +item.itemDustTinyZirconium.name=å°æ’®é”†ç²‰ +item.itemDustSmallZirconium.name=å°å †é”†ç²‰ +item.itemNuggetZirconium.name=锆粒 +item.itemPlateZirconium.name=é”†æ¿ +item.itemPlateDoubleZirconium.name=åŒé‡é”†æ¿ +item.itemBoltZirconium.name=é”†èžºæ “ +item.itemRodZirconium.name=é”†æ† +item.itemRodLongZirconium.name=é•¿é”†æ† +item.itemRingZirconium.name=锆环 +item.itemScrewZirconium.name=é”†èžºä¸ +item.itemRotorZirconium.name=锆转å +item.itemGearZirconium.name=锆齿轮 +item.itemIngotRuthenium.name=é’Œé” +item.itemDustRuthenium.name=钌粉 +item.itemDustTinyRuthenium.name=å°æ’®é’Œç²‰ +item.itemDustSmallRuthenium.name=å°å †é’Œç²‰ +item.itemNuggetRuthenium.name=钌粒 +item.itemPlateRuthenium.name=é’Œæ¿ +item.itemPlateDoubleRuthenium.name=åŒé‡é’Œæ¿ +item.itemBoltRuthenium.name=é’Œèžºæ “ +item.itemRodRuthenium.name=é’Œæ† +item.itemRodLongRuthenium.name=é•¿é’Œæ† +item.itemRingRuthenium.name=钌环 +item.itemScrewRuthenium.name=é’Œèžºä¸ +item.itemRotorRuthenium.name=钌转å +item.itemGearRuthenium.name=钌齿轮 +item.itemIngotIodine.name=ç¢˜é” +item.itemDustIodine.name=碘粉 +item.itemDustTinyIodine.name=å°æ’®ç¢˜ç²‰ +item.itemDustSmallIodine.name=å°å †ç¢˜ç²‰ +item.itemNuggetIodine.name=碘粒 +item.itemPlateIodine.name=ç¢˜æ¿ +item.itemPlateDoubleIodine.name=åŒé‡ç¢˜æ¿ +item.itemBoltIodine.name=ç¢˜èžºæ “ +item.itemRodIodine.name=ç¢˜æ† +item.itemRodLongIodine.name=é•¿ç¢˜æ† +item.itemRingIodine.name=碘环 +item.itemScrewIodine.name=ç¢˜èžºä¸ +item.itemRotorIodine.name=碘转å +item.itemGearIodine.name=碘齿轮 +item.itemIngotHafnium.name=é“ªé” +item.itemDustHafnium.name=铪粉 +item.itemDustTinyHafnium.name=å°æ’®é“ªç²‰ +item.itemDustSmallHafnium.name=å°å †é“ªç²‰ +item.itemNuggetHafnium.name=铪粒 +item.itemPlateHafnium.name=é“ªæ¿ +item.itemPlateDoubleHafnium.name=åŒé‡é“ªæ¿ +item.itemBoltHafnium.name=é“ªèžºæ “ +item.itemRodHafnium.name=é“ªæ† +item.itemRodLongHafnium.name=é•¿é“ªæ† +item.itemRingHafnium.name=铪环 +item.itemScrewHafnium.name=é“ªèžºä¸ +item.itemRotorHafnium.name=铪转å +item.itemGearHafnium.name=铪齿轮 +item.itemIngotDysprosium.name=é•é” +item.itemDustDysprosium.name=é•ç²‰ +item.itemDustTinyDysprosium.name=å°æ’®é•ç²‰ +item.itemDustSmallDysprosium.name=å°å †é•ç²‰ +item.itemNuggetDysprosium.name=é•ç²’ +item.itemPlateDysprosium.name=é•æ¿ +item.itemPlateDoubleDysprosium.name=åŒé‡é•æ¿ +item.itemBoltDysprosium.name=é•èžºæ “ +item.itemRodDysprosium.name=é•æ† +item.itemRodLongDysprosium.name=é•¿é•æ† +item.itemRingDysprosium.name=é•çŽ¯ +item.itemScrewDysprosium.name=é•èžºä¸ +item.itemRotorDysprosium.name=é•è½¬å +item.itemGearDysprosium.name=é•é½¿è½® +item.itemIngotTellurium.name=ç¢²é” +item.itemDustTellurium.name=碲粉 +item.itemDustTinyTellurium.name=å°æ’®ç¢²ç²‰ +item.itemDustSmallTellurium.name=å°å †ç¢²ç²‰ +item.itemNuggetTellurium.name=碲粒 +item.itemPlateTellurium.name=ç¢²æ¿ +item.itemPlateDoubleTellurium.name=åŒé‡ç¢²æ¿ +item.itemBoltTellurium.name=ç¢²èžºæ “ +item.itemRodTellurium.name=ç¢²æ† +item.itemRodLongTellurium.name=é•¿ç¢²æ† +item.itemRingTellurium.name=碲环 +item.itemScrewTellurium.name=ç¢²èžºä¸ +item.itemRotorTellurium.name=碲转å +item.itemGearTellurium.name=碲齿轮 +item.itemIngotRhodium.name=é“‘é” +item.itemDustRhodium.name=铑粉 +item.itemDustTinyRhodium.name=å°æ’®é“‘粉 +item.itemDustSmallRhodium.name=å°å †é“‘粉 +item.itemNuggetRhodium.name=é“‘ç²’ +item.itemPlateRhodium.name=é“‘æ¿ +item.itemPlateDoubleRhodium.name=åŒé‡é“‘æ¿ +item.itemBoltRhodium.name=é“‘èžºæ “ +item.itemRodRhodium.name=é“‘æ† +item.itemRodLongRhodium.name=é•¿é“‘æ† +item.itemRingRhodium.name=铑环 +item.itemScrewRhodium.name=é“‘èžºä¸ +item.itemRotorRhodium.name=铑转å +item.itemGearRhodium.name=铑齿轮 +item.itemIngotRhenium.name=é“¼é” +item.itemDustRhenium.name=铼粉 +item.itemDustTinyRhenium.name=å°æ’®é“¼ç²‰ +item.itemDustSmallRhenium.name=å°å †é“¼ç²‰ +item.itemNuggetRhenium.name=铼粒 +item.itemPlateRhenium.name=é“¼æ¿ +item.itemPlateDoubleRhenium.name=åŒé‡é“¼æ¿ +item.itemBoltRhenium.name=é“¼èžºæ “ +item.itemRodRhenium.name=é“¼æ† +item.itemRodLongRhenium.name=é•¿é“¼æ† +item.itemRingRhenium.name=铼环 +item.itemScrewRhenium.name=é“¼èžºä¸ +item.itemRotorRhenium.name=铼转å +item.itemGearRhenium.name=铼齿轮 +item.itemIngotThallium.name=é“Šé” +item.itemDustThallium.name=铊粉 +item.itemDustTinyThallium.name=å°æ’®é“Šç²‰ +item.itemDustSmallThallium.name=å°å †é“Šç²‰ +item.itemNuggetThallium.name=é“Šç²’ +item.itemPlateThallium.name=é“Šæ¿ +item.itemPlateDoubleThallium.name=åŒé‡é“Šæ¿ +item.itemBoltThallium.name=é“Šèžºæ “ +item.itemRodThallium.name=é“Šæ† +item.itemRodLongThallium.name=é•¿é“Šæ† +item.itemRingThallium.name=铊环 +item.itemScrewThallium.name=é“Šèžºä¸ +item.itemRotorThallium.name=铊转å +item.itemGearThallium.name=铊齿轮 +item.itemIngotTechnetium.name=é”é” +item.itemDustTechnetium.name=é”粉 +item.itemDustTinyTechnetium.name=å°æ’®é”粉 +item.itemDustSmallTechnetium.name=å°å †é”粉 +item.itemNuggetTechnetium.name=é”ç²’ +item.itemPlateTechnetium.name=é”æ¿ +item.itemPlateDoubleTechnetium.name=åŒé‡é”æ¿ +item.itemIngotPolonium.name=é’‹é” +item.itemDustPolonium.name=钋粉 +item.itemDustTinyPolonium.name=å°æ’®é’‹ç²‰ +item.itemDustSmallPolonium.name=å°å †é’‹ç²‰ +item.itemNuggetPolonium.name=é’‹ç²’ +item.itemPlatePolonium.name=é’‹æ¿ +item.itemPlateDoublePolonium.name=åŒé‡é’‹æ¿ +item.itemIngotAstatine.name=ç ¹é” +item.itemDustAstatine.name=ç ¹ç²‰ +item.itemDustTinyAstatine.name=å°æ’®ç ¹ç²‰ +item.itemDustSmallAstatine.name=å°å †ç ¹ç²‰ +item.itemNuggetAstatine.name=ç ¹ç²’ +item.itemPlateAstatine.name=ç ¹æ¿ +item.itemPlateDoubleAstatine.name=åŒé‡ç ¹æ¿ +item.itemIngotFrancium.name=é’«é” +item.itemDustFrancium.name=钫粉 +item.itemDustTinyFrancium.name=å°æ’®é’«ç²‰ +item.itemDustSmallFrancium.name=å°å †é’«ç²‰ +item.itemNuggetFrancium.name=é’«ç²’ +item.itemPlateFrancium.name=é’«æ¿ +item.itemPlateDoubleFrancium.name=åŒé‡é’«æ¿ +item.itemIngotRadium.name=é•é” +item.itemDustRadium.name=é•ç²‰ +item.itemDustTinyRadium.name=å°æ’®é•ç²‰ +item.itemDustSmallRadium.name=å°å †é•ç²‰ +item.itemNuggetRadium.name=é•ç²’ +item.itemPlateRadium.name=é•æ¿ +item.itemPlateDoubleRadium.name=åŒé‡é•æ¿ +item.itemIngotActinium.name=é”•é” +item.itemDustActinium.name=锕粉 +item.itemDustTinyActinium.name=å°æ’®é”•ç²‰ +item.itemDustSmallActinium.name=å°å †é”•ç²‰ +item.itemNuggetActinium.name=锕粒 +item.itemPlateActinium.name=é”•æ¿ +item.itemPlateDoubleActinium.name=åŒé‡é”•æ¿ +item.itemIngotProtactinium.name=é•¤é” +item.itemDustProtactinium.name=镤粉 +item.itemDustTinyProtactinium.name=å°æ’®é•¤ç²‰ +item.itemDustSmallProtactinium.name=å°å †é•¤ç²‰ +item.itemNuggetProtactinium.name=镤粒 +item.itemPlateProtactinium.name=é•¤æ¿ +item.itemPlateDoubleProtactinium.name=åŒé‡é•¤æ¿ +item.itemIngotNeptunium.name=é•Žé” +item.itemDustNeptunium.name=镎粉 +item.itemDustTinyNeptunium.name=å°æ’®é•Žç²‰ +item.itemDustSmallNeptunium.name=å°å †é•Žç²‰ +item.itemNuggetNeptunium.name=é•Žç²’ +item.itemPlateNeptunium.name=é•Žæ¿ +item.itemPlateDoubleNeptunium.name=åŒé‡é•Žæ¿ +item.itemIngotCurium.name=é””é” +item.itemDustCurium.name=锔粉 +item.itemDustTinyCurium.name=å°æ’®é””粉 +item.itemDustSmallCurium.name=å°å †é””粉 +item.itemNuggetCurium.name=锔粒 +item.itemPlateCurium.name=é””æ¿ +item.itemPlateDoubleCurium.name=åŒé‡é””æ¿ +item.itemIngotBerkelium.name=é”«é” +item.itemDustBerkelium.name=锫粉 +item.itemDustTinyBerkelium.name=å°æ’®é”«ç²‰ +item.itemDustSmallBerkelium.name=å°å †é”«ç²‰ +item.itemNuggetBerkelium.name=锫粒 +item.itemPlateBerkelium.name=é”«æ¿ +item.itemPlateDoubleBerkelium.name=åŒé‡é”«æ¿ +item.itemIngotCalifornium.name=é”Žé” +item.itemDustCalifornium.name=锎粉 +item.itemDustTinyCalifornium.name=å°æ’®é”Žç²‰ +item.itemDustSmallCalifornium.name=å°å †é”Žç²‰ +item.itemNuggetCalifornium.name=锎粒 +item.itemPlateCalifornium.name=é”Žæ¿ +item.itemPlateDoubleCalifornium.name=åŒé‡é”Žæ¿ +item.itemIngotEinsteinium.name=é”¿é” +item.itemDustEinsteinium.name=锿粉 +item.itemDustTinyEinsteinium.name=å°æ’®é”¿ç²‰ +item.itemDustSmallEinsteinium.name=å°å †é”¿ç²‰ +item.itemNuggetEinsteinium.name=锿粒 +item.itemPlateEinsteinium.name=é”¿æ¿ +item.itemPlateDoubleEinsteinium.name=åŒé‡é”¿æ¿ +item.itemIngotFermium.name=é•„é” +item.itemDustFermium.name=镄粉 +item.itemDustTinyFermium.name=å°æ’®é•„粉 +item.itemDustSmallFermium.name=å°å †é•„粉 +item.itemNuggetFermium.name=é•„ç²’ +item.itemPlateFermium.name=é•„æ¿ +item.itemPlateDoubleFermium.name=åŒé‡é•„æ¿ +item.itemIngotLithium7.name=锂 7é” +item.itemDustLithium7.name=锂 7粉 +item.itemDustTinyLithium7.name=å°æ’®é”‚ 7粉 +item.itemDustSmallLithium7.name=å°å †é”‚ 7粉 +item.itemNuggetLithium7.name=锂 7ç²’ +item.itemPlateLithium7.name=锂 7æ¿ +item.itemPlateDoubleLithium7.name=åŒé‡é”‚ 7æ¿ +item.itemIngotThorium232.name=é’-232é” +item.itemDustThorium232.name=é’-232粉 +item.itemDustTinyThorium232.name=å°æ’®é’-232粉 +item.itemDustSmallThorium232.name=å°å †é’-232粉 +item.itemNuggetThorium232.name=é’-232ç²’ +item.itemPlateThorium232.name=é’-232æ¿ +item.itemPlateDoubleThorium232.name=åŒé‡é’-232æ¿ +item.itemIngotUranium232.name=é“€-232é” +item.itemDustUranium232.name=é“€-232粉 +item.itemDustTinyUranium232.name=å°æ’®é“€-232粉 +item.itemDustSmallUranium232.name=å°å †é“€-232粉 +item.itemNuggetUranium232.name=é“€-232ç²’ +item.itemPlateUranium232.name=é“€-232æ¿ +item.itemRodUranium232.name=é“€-232æ† +item.itemRodLongUranium232.name=é•¿é“€-232æ† +item.itemIngotUranium233.name=é“€-233é” +item.itemDustUranium233.name=é“€-233粉 +item.itemDustTinyUranium233.name=å°æ’®é“€-233粉 +item.itemDustSmallUranium233.name=å°å †é“€-233粉 +item.itemNuggetUranium233.name=é“€-233ç²’ +item.itemPlateUranium233.name=é“€-233æ¿ +item.itemRodUranium233.name=é“€-233æ† +item.itemRodLongUranium233.name=é•¿é“€-233æ† +item.itemIngotPlutonium238.name=é’š-238é” +item.itemDustPlutonium238.name=é’š-238粉 +item.itemDustTinyPlutonium238.name=å°æ’®é’š-238粉 +item.itemDustSmallPlutonium238.name=å°å †é’š-238粉 +item.itemNuggetPlutonium238.name=é’š-238ç²’ +item.itemPlatePlutonium238.name=é’š-238æ¿ +item.itemPlateDoublePlutonium238.name=åŒé‡é’š-238æ¿ +item.itemIngotStrontium90.name=锶-90é” +item.itemDustStrontium90.name=锶-90粉 +item.itemDustTinyStrontium90.name=å°æ’®é”¶-90粉 +item.itemDustSmallStrontium90.name=å°å †é”¶-90粉 +item.itemNuggetStrontium90.name=锶-90ç²’ +item.itemPlateStrontium90.name=锶-90æ¿ +item.itemPlateDoubleStrontium90.name=åŒé‡é”¶-90æ¿ +item.itemIngotPolonium210.name=é’‹-210é” +item.itemDustPolonium210.name=é’‹-210粉 +item.itemDustTinyPolonium210.name=å°æ’®é’‹-210粉 +item.itemDustSmallPolonium210.name=å°å †é’‹-210粉 +item.itemNuggetPolonium210.name=é’‹-210ç²’ +item.itemPlatePolonium210.name=é’‹-210æ¿ +item.itemPlateDoublePolonium210.name=åŒé‡é’‹-210æ¿ +item.itemIngotAmericium241.name=é•…-241é” +item.itemDustAmericium241.name=é•…-241粉 +item.itemDustTinyAmericium241.name=å°æ’®é•…-241粉 +item.itemDustSmallAmericium241.name=å°å †é•…-241粉 +item.itemNuggetAmericium241.name=é•…-241ç²’ +item.itemPlateAmericium241.name=é•…-241æ¿ +item.itemPlateDoubleAmericium241.name=åŒé‡é•…-241æ¿ +item.itemIngotSiliconCarbide.name=ç¢³åŒ–ç¡…é” +item.itemDustSiliconCarbide.name=碳化硅粉 +item.itemDustTinySiliconCarbide.name=å°æ’®ç¢³åŒ–硅粉 +item.itemDustSmallSiliconCarbide.name=å°å †ç¢³åŒ–硅粉 +item.itemNuggetSiliconCarbide.name=碳化硅粒 +item.itemPlateSiliconCarbide.name=ç¢³åŒ–ç¡…æ¿ +item.itemPlateDoubleSiliconCarbide.name=åŒé‡ç¢³åŒ–ç¡…æ¿ +item.itemBoltSiliconCarbide.name=ç¢³åŒ–ç¡…èžºæ “ +item.itemRodSiliconCarbide.name=ç¢³åŒ–ç¡…æ† +item.itemRodLongSiliconCarbide.name=é•¿ç¢³åŒ–ç¡…æ† +item.itemRingSiliconCarbide.name=碳化硅环 +item.itemScrewSiliconCarbide.name=ç¢³åŒ–ç¡…èžºä¸ +item.itemRotorSiliconCarbide.name=碳化硅转å +item.itemGearSiliconCarbide.name=碳化硅齿轮 +item.itemIngotZirconiumCarbide.name=ç¢³åŒ–é”†é” +item.itemHotIngotZirconiumCarbide.name=çƒç¢³åŒ–é”†é” +item.itemDustZirconiumCarbide.name=碳化锆粉 +item.itemDustTinyZirconiumCarbide.name=å°æ’®ç¢³åŒ–锆粉 +item.itemDustSmallZirconiumCarbide.name=å°å †ç¢³åŒ–锆粉 +item.itemNuggetZirconiumCarbide.name=碳化锆粒 +item.itemPlateZirconiumCarbide.name=ç¢³åŒ–é”†æ¿ +item.itemPlateDoubleZirconiumCarbide.name=åŒé‡ç¢³åŒ–é”†æ¿ +item.itemBoltZirconiumCarbide.name=ç¢³åŒ–é”†èžºæ “ +item.itemRodZirconiumCarbide.name=ç¢³åŒ–é”†æ† +item.itemRodLongZirconiumCarbide.name=é•¿ç¢³åŒ–é”†æ† +item.itemRingZirconiumCarbide.name=碳化锆环 +item.itemScrewZirconiumCarbide.name=ç¢³åŒ–é”†èžºä¸ +item.itemRotorZirconiumCarbide.name=碳化锆转å +item.itemGearZirconiumCarbide.name=碳化锆齿轮 +item.itemIngotTantalumCarbide.name=ç¢³åŒ–é’½é” +item.itemHotIngotTantalumCarbide.name=çƒç¢³åŒ–é’½é” +item.itemDustTantalumCarbide.name=碳化钽粉 +item.itemDustTinyTantalumCarbide.name=å°æ’®ç¢³åŒ–钽粉 +item.itemDustSmallTantalumCarbide.name=å°å †ç¢³åŒ–钽粉 +item.itemNuggetTantalumCarbide.name=碳化钽粒 +item.itemPlateTantalumCarbide.name=ç¢³åŒ–é’½æ¿ +item.itemPlateDoubleTantalumCarbide.name=åŒé‡ç¢³åŒ–é’½æ¿ +item.itemBoltTantalumCarbide.name=ç¢³åŒ–é’½èžºæ “ +item.itemRodTantalumCarbide.name=ç¢³åŒ–é’½æ† +item.itemRodLongTantalumCarbide.name=é•¿ç¢³åŒ–é’½æ† +item.itemRingTantalumCarbide.name=碳化钽环 +item.itemScrewTantalumCarbide.name=ç¢³åŒ–é’½èžºä¸ +item.itemRotorTantalumCarbide.name=碳化钽转å +item.itemGearTantalumCarbide.name=碳化钽齿轮 +item.itemIngotNiobiumCarbide.name=ç¢³åŒ–é“Œé” +item.itemHotIngotNiobiumCarbide.name=çƒç¢³åŒ–é“Œé” +item.itemDustNiobiumCarbide.name=碳化铌粉 +item.itemDustTinyNiobiumCarbide.name=å°æ’®ç¢³åŒ–铌粉 +item.itemDustSmallNiobiumCarbide.name=å°å †ç¢³åŒ–铌粉 +item.itemNuggetNiobiumCarbide.name=碳化铌粒 +item.itemPlateNiobiumCarbide.name=ç¢³åŒ–é“Œæ¿ +item.itemPlateDoubleNiobiumCarbide.name=åŒé‡ç¢³åŒ–é“Œæ¿ +item.itemBoltNiobiumCarbide.name=ç¢³åŒ–é“Œèžºæ “ +item.itemRodNiobiumCarbide.name=ç¢³åŒ–é“Œæ† +item.itemRodLongNiobiumCarbide.name=é•¿ç¢³åŒ–é“Œæ† +item.itemRingNiobiumCarbide.name=碳化铌环 +item.itemScrewNiobiumCarbide.name=ç¢³åŒ–é“Œèžºä¸ +item.itemRotorNiobiumCarbide.name=碳化铌转å +item.itemGearNiobiumCarbide.name=碳化铌齿轮 +item.itemIngotBerylliumFluoride.name=氟化é“é” +item.itemDustBerylliumFluoride.name=氟化é“粉 +item.itemDustTinyBerylliumFluoride.name=å°æ’®æ°ŸåŒ–é“粉 +item.itemDustSmallBerylliumFluoride.name=å°å †æ°ŸåŒ–é“粉 +item.itemNuggetBerylliumFluoride.name=氟化é“ç²’ +item.itemPlateBerylliumFluoride.name=氟化é“æ¿ +item.itemPlateDoubleBerylliumFluoride.name=åŒé‡æ°ŸåŒ–é“æ¿ +item.itemIngotLithiumFluoride.name=æ°ŸåŒ–é”‚é” +item.itemDustLithiumFluoride.name=氟化锂粉 +item.itemDustTinyLithiumFluoride.name=å°æ’®æ°ŸåŒ–锂粉 +item.itemDustSmallLithiumFluoride.name=å°å †æ°ŸåŒ–锂粉 +item.itemNuggetLithiumFluoride.name=氟化锂粒 +item.itemPlateLithiumFluoride.name=æ°ŸåŒ–é”‚æ¿ +item.itemPlateDoubleLithiumFluoride.name=åŒé‡æ°ŸåŒ–é”‚æ¿ +item.itemIngotThoriumTetrafluoride.name=四氟化é’é” +item.itemDustThoriumTetrafluoride.name=四氟化é’粉 +item.itemDustTinyThoriumTetrafluoride.name=å°æ’®å››æ°ŸåŒ–é’粉 +item.itemDustSmallThoriumTetrafluoride.name=å°å †å››æ°ŸåŒ–é’粉 +item.itemNuggetThoriumTetrafluoride.name=四氟化é’ç²’ +item.itemPlateThoriumTetrafluoride.name=四氟化é’æ¿ +item.itemPlateDoubleThoriumTetrafluoride.name=åŒé‡å››æ°ŸåŒ–é’æ¿ +item.itemIngotThoriumHexafluoride.name=å…氟化é’é” +item.itemDustThoriumHexafluoride.name=å…氟化é’粉 +item.itemDustTinyThoriumHexafluoride.name=å°æ’®å…氟化é’粉 +item.itemDustSmallThoriumHexafluoride.name=å°å †å…氟化é’粉 +item.itemNuggetThoriumHexafluoride.name=å…氟化é’ç²’ +item.itemPlateThoriumHexafluoride.name=å…氟化é’æ¿ +item.itemPlateDoubleThoriumHexafluoride.name=åŒé‡å…氟化é’æ¿ +item.itemIngotUraniumTetrafluoride.name=å››æ°ŸåŒ–é“€é” +item.itemDustUraniumTetrafluoride.name=四氟化铀粉 +item.itemDustTinyUraniumTetrafluoride.name=å°æ’®å››æ°ŸåŒ–铀粉 +item.itemDustSmallUraniumTetrafluoride.name=å°å †å››æ°ŸåŒ–铀粉 +item.itemNuggetUraniumTetrafluoride.name=四氟化铀粒 +item.itemPlateUraniumTetrafluoride.name=å››æ°ŸåŒ–é“€æ¿ +item.itemPlateDoubleUraniumTetrafluoride.name=åŒé‡å››æ°ŸåŒ–é“€æ¿ +item.itemIngotUraniumHexafluoride.name=å…æ°ŸåŒ–é“€é” +item.itemDustUraniumHexafluoride.name=å…氟化铀粉 +item.itemDustTinyUraniumHexafluoride.name=å°æ’®å…氟化铀粉 +item.itemDustSmallUraniumHexafluoride.name=å°å †å…氟化铀粉 +item.itemNuggetUraniumHexafluoride.name=å…氟化铀粒 +item.itemPlateUraniumHexafluoride.name=å…æ°ŸåŒ–é“€æ¿ +item.itemPlateDoubleUraniumHexafluoride.name=åŒé‡å…æ°ŸåŒ–é“€æ¿ +item.itemIngotZirconiumTetrafluoride.name=å››æ°ŸåŒ–é”†é” +item.itemDustZirconiumTetrafluoride.name=四氟化锆粉 +item.itemDustTinyZirconiumTetrafluoride.name=å°æ’®å››æ°ŸåŒ–锆粉 +item.itemDustSmallZirconiumTetrafluoride.name=å°å †å››æ°ŸåŒ–锆粉 +item.itemNuggetZirconiumTetrafluoride.name=四氟化锆粒 +item.itemPlateZirconiumTetrafluoride.name=å››æ°ŸåŒ–é”†æ¿ +item.itemPlateDoubleZirconiumTetrafluoride.name=åŒé‡å››æ°ŸåŒ–é”†æ¿ +item.itemIngotNeptuniumHexafluoride.name=å…æ°ŸåŒ–é•Žé” +item.itemDustNeptuniumHexafluoride.name=å…氟化镎粉 +item.itemDustTinyNeptuniumHexafluoride.name=å°æ’®å…氟化镎粉 +item.itemDustSmallNeptuniumHexafluoride.name=å°å †å…氟化镎粉 +item.itemNuggetNeptuniumHexafluoride.name=å…氟化镎粒 +item.itemPlateNeptuniumHexafluoride.name=å…æ°ŸåŒ–é•Žæ¿ +item.itemPlateDoubleNeptuniumHexafluoride.name=åŒé‡å…æ°ŸåŒ–é•Žæ¿ +item.itemIngotTechnetiumHexafluoride.name=å…氟化é”é” +item.itemDustTechnetiumHexafluoride.name=å…氟化é”粉 +item.itemDustTinyTechnetiumHexafluoride.name=å°æ’®å…氟化é”粉 +item.itemDustSmallTechnetiumHexafluoride.name=å°å †å…氟化é”粉 +item.itemNuggetTechnetiumHexafluoride.name=å…氟化é”ç²’ +item.itemPlateTechnetiumHexafluoride.name=å…氟化é”æ¿ +item.itemPlateDoubleTechnetiumHexafluoride.name=åŒé‡å…氟化é”æ¿ +item.itemIngotSeleniumHexafluoride.name=å…æ°ŸåŒ–ç¡’é” +item.itemDustSeleniumHexafluoride.name=å…氟化硒粉 +item.itemDustTinySeleniumHexafluoride.name=å°æ’®å…氟化硒粉 +item.itemDustSmallSeleniumHexafluoride.name=å°å †å…氟化硒粉 +item.itemNuggetSeleniumHexafluoride.name=å…氟化硒粒 +item.itemPlateSeleniumHexafluoride.name=å…æ°ŸåŒ–ç¡’æ¿ +item.itemPlateDoubleSeleniumHexafluoride.name=åŒé‡å…æ°ŸåŒ–ç¡’æ¿ +item.itemIngotLiFBeF2ZrF4U235.name=é“€235å¤åˆæ°ŸåŒ–ç‰©é” +item.itemDustLiFBeF2ZrF4U235.name=é“€235å¤åˆæ°ŸåŒ–物粉 +item.itemDustTinyLiFBeF2ZrF4U235.name=å°æ’®é“€235å¤åˆæ°ŸåŒ–物粉 +item.itemDustSmallLiFBeF2ZrF4U235.name=å°å †é“€235å¤åˆæ°ŸåŒ–物粉 +item.itemNuggetLiFBeF2ZrF4U235.name=é“€235å¤åˆæ°ŸåŒ–物粒 +item.itemPlateLiFBeF2ZrF4U235.name=é“€235å¤åˆæ°ŸåŒ–ç‰©æ¿ +item.itemPlateDoubleLiFBeF2ZrF4U235.name=åŒé‡é“€235å¤åˆæ°ŸåŒ–ç‰©æ¿ +item.itemIngotLiFBeF2ZrF4UF4.name=铀锆å¤åˆæ°ŸåŒ–ç‰©é” +item.itemDustLiFBeF2ZrF4UF4.name=铀锆å¤åˆæ°ŸåŒ–物粉 +item.itemDustTinyLiFBeF2ZrF4UF4.name=å°æ’®é“€é”†å¤åˆæ°ŸåŒ–物粉 +item.itemDustSmallLiFBeF2ZrF4UF4.name=å°å †é“€é”†å¤åˆæ°ŸåŒ–物粉 +item.itemNuggetLiFBeF2ZrF4UF4.name=铀锆å¤åˆæ°ŸåŒ–物粒 +item.itemPlateLiFBeF2ZrF4UF4.name=铀锆å¤åˆæ°ŸåŒ–ç‰©æ¿ +item.itemPlateDoubleLiFBeF2ZrF4UF4.name=åŒé‡é“€é”†å¤åˆæ°ŸåŒ–ç‰©æ¿ +item.itemIngotLiFBeF2ThF4UF4.name=é“€é’å¤åˆæ°ŸåŒ–ç‰©é” +item.itemDustLiFBeF2ThF4UF4.name=é“€é’å¤åˆæ°ŸåŒ–物粉 +item.itemDustTinyLiFBeF2ThF4UF4.name=å°æ’®é“€é’å¤åˆæ°ŸåŒ–物粉 +item.itemDustSmallLiFBeF2ThF4UF4.name=å°å †é“€é’å¤åˆæ°ŸåŒ–物粉 +item.itemNuggetLiFBeF2ThF4UF4.name=é“€é’å¤åˆæ°ŸåŒ–物粒 +item.itemPlateLiFBeF2ThF4UF4.name=é“€é’å¤åˆæ°ŸåŒ–ç‰©æ¿ +item.itemPlateDoubleLiFBeF2ThF4UF4.name=åŒé‡é“€é’å¤åˆæ°ŸåŒ–ç‰©æ¿ +item.itemIngotEnergyCrystal.name=能é‡æ°´æ™¶é” +item.itemHotIngotEnergyCrystal.name=çƒèƒ½é‡æ°´æ™¶é” +item.itemDustEnergyCrystal.name=能é‡æ°´æ™¶ç²‰ +item.itemDustTinyEnergyCrystal.name=å°æ’®èƒ½é‡æ°´æ™¶ç²‰ +item.itemDustSmallEnergyCrystal.name=å°å †èƒ½é‡æ°´æ™¶ç²‰ +item.itemNuggetEnergyCrystal.name=能é‡æ°´æ™¶ç²’ +item.itemPlateEnergyCrystal.name=能é‡æ°´æ™¶æ¿ +item.itemPlateDoubleEnergyCrystal.name=åŒé‡èƒ½é‡æ°´æ™¶æ¿ +item.itemBoltEnergyCrystal.name=能é‡æ°´æ™¶èžºæ “ +item.itemRodEnergyCrystal.name=能é‡æ°´æ™¶æ† +item.itemRodLongEnergyCrystal.name=长能é‡æ°´æ™¶æ† +item.itemRingEnergyCrystal.name=能é‡æ°´æ™¶çŽ¯ +item.itemScrewEnergyCrystal.name=能é‡æ°´æ™¶èžºä¸ +item.itemRotorEnergyCrystal.name=能é‡æ°´æ™¶è½¬å +item.itemGearEnergyCrystal.name=能é‡æ°´æ™¶é½¿è½® +item.itemIngotBloodSteel.name=è¡€é’¢é” +item.itemDustBloodSteel.name=血钢粉 +item.itemDustTinyBloodSteel.name=å°æ’®è¡€é’¢ç²‰ +item.itemDustSmallBloodSteel.name=å°å †è¡€é’¢ç²‰ +item.itemNuggetBloodSteel.name=血钢粒 +item.itemPlateBloodSteel.name=è¡€é’¢æ¿ +item.itemPlateDoubleBloodSteel.name=åŒé‡è¡€é’¢æ¿ +item.itemBoltBloodSteel.name=è¡€é’¢èžºæ “ +item.itemRodBloodSteel.name=è¡€é’¢æ† +item.itemRodLongBloodSteel.name=é•¿è¡€é’¢æ† +item.itemRingBloodSteel.name=血钢环 +item.itemScrewBloodSteel.name=è¡€é’¢èžºä¸ +item.itemRotorBloodSteel.name=血钢转å +item.itemGearBloodSteel.name=血钢齿轮 +item.itemIngotZeron100.name=å¡žé¾™-100é” +item.itemHotIngotZeron100.name=çƒå¡žé¾™-100é” +item.itemDustZeron100.name=å¡žé¾™-100粉 +item.itemDustTinyZeron100.name=å°æ’®å¡žé¾™-100粉 +item.itemDustSmallZeron100.name=å°å †å¡žé¾™-100粉 +item.itemNuggetZeron100.name=å¡žé¾™-100ç²’ +item.itemPlateZeron100.name=å¡žé¾™-100æ¿ +item.itemPlateDoubleZeron100.name=åŒé‡å¡žé¾™-100æ¿ +item.itemBoltZeron100.name=å¡žé¾™-100èžºæ “ +item.itemRodZeron100.name=å¡žé¾™-100æ† +item.itemRodLongZeron100.name=é•¿å¡žé¾™100æ† +item.itemRingZeron100.name=å¡žé¾™-100环 +item.itemScrewZeron100.name=å¡žé¾™-100èžºä¸ +item.itemRotorZeron100.name=å¡žé¾™-100转å +item.itemGearZeron100.name=å¡žé¾™-100齿轮 +item.itemIngotTumbaga.name=铜金åˆé‡‘é” +item.itemDustTumbaga.name=铜金åˆé‡‘粉 +item.itemDustTinyTumbaga.name=å°æ’®é“œé‡‘åˆé‡‘粉 +item.itemDustSmallTumbaga.name=å°å †é“œé‡‘åˆé‡‘粉 +item.itemNuggetTumbaga.name=铜金åˆé‡‘ç²’ +item.itemPlateTumbaga.name=铜金åˆé‡‘æ¿ +item.itemPlateDoubleTumbaga.name=åŒé‡é“œé‡‘åˆé‡‘æ¿ +item.itemBoltTumbaga.name=铜金åˆé‡‘èžºæ “ +item.itemRodTumbaga.name=铜金åˆé‡‘æ† +item.itemRodLongTumbaga.name=长铜金åˆé‡‘æ† +item.itemRingTumbaga.name=铜金åˆé‡‘环 +item.itemScrewTumbaga.name=铜金åˆé‡‘èžºä¸ +item.itemRotorTumbaga.name=铜金åˆé‡‘转å +item.itemGearTumbaga.name=铜金åˆé‡‘齿轮 +item.itemIngotPotin.name=ç²—é’é“œåˆé‡‘é” +item.itemDustPotin.name=ç²—é’é“œåˆé‡‘粉 +item.itemDustTinyPotin.name=å°æ’®ç²—é’é“œåˆé‡‘粉 +item.itemDustSmallPotin.name=å°å †ç²—é’é“œåˆé‡‘粉 +item.itemNuggetPotin.name=ç²—é’é“œåˆé‡‘ç²’ +item.itemPlatePotin.name=ç²—é’é“œåˆé‡‘æ¿ +item.itemPlateDoublePotin.name=åŒé‡ç²—é’é“œåˆé‡‘æ¿ +item.itemBoltPotin.name=ç²—é’é“œåˆé‡‘èžºæ “ +item.itemRodPotin.name=ç²—é’é“œåˆé‡‘æ† +item.itemRodLongPotin.name=é•¿ç²—é’é“œåˆé‡‘æ† +item.itemRingPotin.name=ç²—é’é“œåˆé‡‘环 +item.itemScrewPotin.name=ç²—é’é“œåˆé‡‘èžºä¸ +item.itemRotorPotin.name=ç²—é’é“œåˆé‡‘转å +item.itemGearPotin.name=ç²—é’é“œåˆé‡‘齿轮 +item.itemIngotStaballoy.name=è´«é“€åˆé‡‘é” +item.itemHotIngotStaballoy.name=çƒè´«é“€åˆé‡‘é” +item.itemDustStaballoy.name=è´«é“€åˆé‡‘粉 +item.itemDustTinyStaballoy.name=å°æ’®è´«é“€åˆé‡‘粉 +item.itemDustSmallStaballoy.name=å°å †è´«é“€åˆé‡‘粉 +item.itemNuggetStaballoy.name=è´«é“€åˆé‡‘ç²’ +item.itemPlateStaballoy.name=è´«é“€åˆé‡‘æ¿ +item.itemPlateDoubleStaballoy.name=åŒé‡è´«é“€åˆé‡‘æ¿ +item.itemBoltStaballoy.name=è´«é“€åˆé‡‘èžºæ “ +item.itemRodStaballoy.name=è´«é“€åˆé‡‘æ† +item.itemRodLongStaballoy.name=é•¿è´«é“€åˆé‡‘æ† +item.itemRingStaballoy.name=è´«é“€åˆé‡‘环 +item.itemScrewStaballoy.name=è´«é“€åˆé‡‘èžºä¸ +item.itemRotorStaballoy.name=è´«é“€åˆé‡‘转å +item.itemGearStaballoy.name=è´«é“€åˆé‡‘齿轮 +item.itemIngotTantalloy60.name=钽钨åˆé‡‘-60é” +item.itemHotIngotTantalloy60.name=çƒé’½é’¨åˆé‡‘-60é” +item.itemDustTantalloy60.name=钽钨åˆé‡‘-60粉 +item.itemDustTinyTantalloy60.name=å°æ’®é’½é’¨åˆé‡‘-60粉 +item.itemDustSmallTantalloy60.name=å°å †é’½é’¨åˆé‡‘-60粉 +item.itemNuggetTantalloy60.name=钽钨åˆé‡‘-60ç²’ +item.itemPlateTantalloy60.name=钽钨åˆé‡‘-60æ¿ +item.itemPlateDoubleTantalloy60.name=åŒé‡é’½é’¨åˆé‡‘-60æ¿ +item.itemBoltTantalloy60.name=钽钨åˆé‡‘-60èžºæ “ +item.itemRodTantalloy60.name=钽钨åˆé‡‘-60æ† +item.itemRodLongTantalloy60.name=长钽钨åˆé‡‘-60æ† +item.itemRingTantalloy60.name=钽钨åˆé‡‘-60环 +item.itemScrewTantalloy60.name=钽钨åˆé‡‘-60èžºä¸ +item.itemRotorTantalloy60.name=钽钨åˆé‡‘-60转å +item.itemGearTantalloy60.name=钽钨åˆé‡‘-60齿轮 +item.itemIngotTantalloy61.name=钽钨åˆé‡‘-61é” +item.itemHotIngotTantalloy61.name=çƒé’½é’¨åˆé‡‘-61é” +item.itemDustTantalloy61.name=钽钨åˆé‡‘-61粉 +item.itemDustTinyTantalloy61.name=å°æ’®é’½é’¨åˆé‡‘-61粉 +item.itemDustSmallTantalloy61.name=å°å †é’½é’¨åˆé‡‘-61粉 +item.itemNuggetTantalloy61.name=钽钨åˆé‡‘-61ç²’ +item.itemPlateTantalloy61.name=钽钨åˆé‡‘-61æ¿ +item.itemPlateDoubleTantalloy61.name=åŒé‡é’½é’¨åˆé‡‘-61æ¿ +item.itemBoltTantalloy61.name=钽钨åˆé‡‘-61èžºæ “ +item.itemRodTantalloy61.name=钽钨åˆé‡‘-61æ† +item.itemRodLongTantalloy61.name=长钽钨åˆé‡‘-61æ† +item.itemRingTantalloy61.name=钽钨åˆé‡‘-61环 +item.itemScrewTantalloy61.name=钽钨åˆé‡‘-61èžºä¸ +item.itemRotorTantalloy61.name=钽钨åˆé‡‘-61转å +item.itemGearTantalloy61.name=钽钨åˆé‡‘-61齿轮 +item.itemIngotInconel625.name=é•é“¬åŸºåˆé‡‘-625é” +item.itemHotIngotInconel625.name=çƒé•é“¬åŸºåˆé‡‘-625é” +item.itemDustInconel625.name=é•é“¬åŸºåˆé‡‘-625粉 +item.itemDustTinyInconel625.name=å°æ’®é•é“¬åŸºåˆé‡‘-625粉 +item.itemDustSmallInconel625.name=å°å †é•é“¬åŸºåˆé‡‘-625粉 +item.itemNuggetInconel625.name=é•é“¬åŸºåˆé‡‘-625ç²’ +item.itemPlateInconel625.name=é•é“¬åŸºåˆé‡‘-625æ¿ +item.itemPlateDoubleInconel625.name=åŒé‡é•é“¬åŸºåˆé‡‘-625æ¿ +item.itemBoltInconel625.name=é•é“¬åŸºåˆé‡‘-625èžºæ “ +item.itemRodInconel625.name=é•é“¬åŸºåˆé‡‘-625æ† +item.itemRodLongInconel625.name=é•¿é•é“¬åŸºåˆé‡‘-625æ† +item.itemRingInconel625.name=é•é“¬åŸºåˆé‡‘-625环 +item.itemScrewInconel625.name=é•é“¬åŸºåˆé‡‘-625èžºä¸ +item.itemRotorInconel625.name=é•é“¬åŸºåˆé‡‘-625转å +item.itemGearInconel625.name=é•é“¬åŸºåˆé‡‘-625齿轮 +item.itemIngotInconel690.name=é•é“¬åŸºåˆé‡‘-690é” +item.itemHotIngotInconel690.name=çƒé•é“¬åŸºåˆé‡‘-690é” +item.itemDustInconel690.name=é•é“¬åŸºåˆé‡‘-690粉 +item.itemDustTinyInconel690.name=å°æ’®é•é“¬åŸºåˆé‡‘-690粉 +item.itemDustSmallInconel690.name=å°å †é•é“¬åŸºåˆé‡‘-690粉 +item.itemNuggetInconel690.name=é•é“¬åŸºåˆé‡‘-690ç²’ +item.itemPlateInconel690.name=é•é“¬åŸºåˆé‡‘-690æ¿ +item.itemPlateDoubleInconel690.name=åŒé‡é•é“¬åŸºåˆé‡‘-690æ¿ +item.itemBoltInconel690.name=é•é“¬åŸºåˆé‡‘-690èžºæ “ +item.itemRodInconel690.name=é•é“¬åŸºåˆé‡‘-690æ† +item.itemRodLongInconel690.name=é•¿é•é“¬åŸºåˆé‡‘-690æ† +item.itemRingInconel690.name=é•é“¬åŸºåˆé‡‘-690环 +item.itemScrewInconel690.name=é•é“¬åŸºåˆé‡‘-690èžºä¸ +item.itemRotorInconel690.name=é•é“¬åŸºåˆé‡‘-690转å +item.itemGearInconel690.name=é•é“¬åŸºåˆé‡‘-690齿轮 +item.itemIngotInconel792.name=é•é“¬åŸºåˆé‡‘-792é” +item.itemHotIngotInconel792.name=çƒé•é“¬åŸºåˆé‡‘-792é” +item.itemDustInconel792.name=é•é“¬åŸºåˆé‡‘-792粉 +item.itemDustTinyInconel792.name=å°æ’®é•é“¬åŸºåˆé‡‘-792粉 +item.itemDustSmallInconel792.name=å°å †é•é“¬åŸºåˆé‡‘-792粉 +item.itemNuggetInconel792.name=é•é“¬åŸºåˆé‡‘-792ç²’ +item.itemPlateInconel792.name=é•é“¬åŸºåˆé‡‘-792æ¿ +item.itemPlateDoubleInconel792.name=åŒé‡é•é“¬åŸºåˆé‡‘-792æ¿ +item.itemBoltInconel792.name=é•é“¬åŸºåˆé‡‘-792èžºæ “ +item.itemRodInconel792.name=é•é“¬åŸºåˆé‡‘-792æ† +item.itemRodLongInconel792.name=é•¿é•é“¬åŸºåˆé‡‘-792æ† +item.itemRingInconel792.name=é•é“¬åŸºåˆé‡‘-792环 +item.itemScrewInconel792.name=é•é“¬åŸºåˆé‡‘-792èžºä¸ +item.itemRotorInconel792.name=é•é“¬åŸºåˆé‡‘-792转å +item.itemGearInconel792.name=é•é“¬åŸºåˆé‡‘-792齿轮 +item.itemDustEglinSteelBaseCompound.name=åŸƒæ ¼æž—é’¢åŸºç¡€åŒ–åˆç‰©ç²‰ +item.itemDustTinyEglinSteelBaseCompound.name=å°æ’®åŸƒæ ¼æž—钢基础化åˆç‰©ç²‰ +item.itemDustSmallEglinSteelBaseCompound.name=å°å †åŸƒæ ¼æž—钢基础化åˆç‰©ç²‰ +item.itemIngotEglinSteel.name=åŸƒæ ¼æž—é’¢é” +item.itemDustEglinSteel.name=åŸƒæ ¼æž—é’¢ç²‰ +item.itemDustTinyEglinSteel.name=å°æ’®åŸƒæ ¼æž—钢粉 +item.itemDustSmallEglinSteel.name=å°å †åŸƒæ ¼æž—钢粉 +item.itemNuggetEglinSteel.name=åŸƒæ ¼æž—é’¢ç²’ +item.itemPlateEglinSteel.name=åŸƒæ ¼æž—é’¢æ¿ +item.itemPlateDoubleEglinSteel.name=åŒé‡åŸƒæ ¼æž—é’¢æ¿ +item.itemBoltEglinSteel.name=åŸƒæ ¼æž—é’¢èžºæ “ +item.itemRodEglinSteel.name=åŸƒæ ¼æž—é’¢æ† +item.itemRodLongEglinSteel.name=é•¿åŸƒæ ¼æž—é’¢æ† +item.itemRingEglinSteel.name=åŸƒæ ¼æž—é’¢çŽ¯ +item.itemScrewEglinSteel.name=åŸƒæ ¼æž—é’¢èžºä¸ +item.itemRotorEglinSteel.name=åŸƒæ ¼æž—é’¢è½¬å +item.itemGearEglinSteel.name=åŸƒæ ¼æž—é’¢é½¿è½® +item.itemIngotMaragingSteel250.name=马æ°ä½“时效钢250é” +item.itemHotIngotMaragingSteel250.name=çƒé©¬æ°ä½“时效钢250é” +item.itemDustMaragingSteel250.name=马æ°ä½“时效钢250粉 +item.itemDustTinyMaragingSteel250.name=å°æ’®é©¬æ°ä½“时效钢250粉 +item.itemDustSmallMaragingSteel250.name=å°å †é©¬æ°ä½“时效钢250粉 +item.itemNuggetMaragingSteel250.name=马æ°ä½“时效钢250ç²’ +item.itemPlateMaragingSteel250.name=马æ°ä½“时效钢250æ¿ +item.itemPlateDoubleMaragingSteel250.name=åŒé‡é©¬æ°ä½“时效钢250æ¿ +item.itemBoltMaragingSteel250.name=马æ°ä½“时效钢250èžºæ “ +item.itemRodMaragingSteel250.name=马æ°ä½“时效钢250æ† +item.itemRodLongMaragingSteel250.name=长马æ°ä½“时效钢250æ† +item.itemRingMaragingSteel250.name=马æ°ä½“时效钢250环 +item.itemScrewMaragingSteel250.name=马æ°ä½“时效钢250èžºä¸ +item.itemRotorMaragingSteel250.name=马æ°ä½“时效钢250转å +item.itemGearMaragingSteel250.name=马æ°ä½“时效钢250齿轮 +item.itemIngotMaragingSteel300.name=马æ°ä½“时效钢300é” +item.itemHotIngotMaragingSteel300.name=çƒé©¬æ°ä½“时效钢300é” +item.itemDustMaragingSteel300.name=马æ°ä½“时效钢300粉 +item.itemDustTinyMaragingSteel300.name=å°æ’®é©¬æ°ä½“时效钢300粉 +item.itemDustSmallMaragingSteel300.name=å°å †é©¬æ°ä½“时效钢300粉 +item.itemNuggetMaragingSteel300.name=马æ°ä½“时效钢300ç²’ +item.itemPlateMaragingSteel300.name=马æ°ä½“时效钢300æ¿ +item.itemPlateDoubleMaragingSteel300.name=åŒé‡é©¬æ°ä½“时效钢300æ¿ +item.itemBoltMaragingSteel300.name=马æ°ä½“时效钢300èžºæ “ +item.itemRodMaragingSteel300.name=马æ°ä½“时效钢300æ† +item.itemRodLongMaragingSteel300.name=长马æ°ä½“时效钢300æ† +item.itemRingMaragingSteel300.name=马æ°ä½“时效钢300环 +item.itemScrewMaragingSteel300.name=马æ°ä½“时效钢300èžºä¸ +item.itemRotorMaragingSteel300.name=马æ°ä½“时效钢300转å +item.itemGearMaragingSteel300.name=马æ°ä½“时效钢300齿轮 +item.itemIngotMaragingSteel350.name=马æ°ä½“时效钢350é” +item.itemHotIngotMaragingSteel350.name=çƒé©¬æ°ä½“时效钢350é” +item.itemDustMaragingSteel350.name=马æ°ä½“时效钢350粉 +item.itemDustTinyMaragingSteel350.name=å°æ’®é©¬æ°ä½“时效钢350粉 +item.itemDustSmallMaragingSteel350.name=å°å †é©¬æ°ä½“时效钢350粉 +item.itemNuggetMaragingSteel350.name=马æ°ä½“时效钢350ç²’ +item.itemPlateMaragingSteel350.name=马æ°ä½“时效钢350æ¿ +item.itemPlateDoubleMaragingSteel350.name=åŒé‡é©¬æ°ä½“时效钢350æ¿ +item.itemBoltMaragingSteel350.name=马æ°ä½“时效钢350èžºæ “ +item.itemRodMaragingSteel350.name=马æ°ä½“时效钢350æ† +item.itemRodLongMaragingSteel350.name=长马æ°ä½“时效钢350æ† +item.itemRingMaragingSteel350.name=马æ°ä½“时效钢350环 +item.itemScrewMaragingSteel350.name=马æ°ä½“时效钢350èžºä¸ +item.itemRotorMaragingSteel350.name=马æ°ä½“时效钢350转å +item.itemGearMaragingSteel350.name=马æ°ä½“时效钢350齿轮 +item.itemIngotStellite.name=铬钴锰钛åˆé‡‘é” +item.itemHotIngotStellite.name=çƒé“¬é’´é”°é’›åˆé‡‘é” +item.itemDustStellite.name=铬钴锰钛åˆé‡‘粉 +item.itemDustTinyStellite.name=å°æ’®é“¬é’´é”°é’›åˆé‡‘粉 +item.itemDustSmallStellite.name=å°å †é“¬é’´é”°é’›åˆé‡‘粉 +item.itemNuggetStellite.name=铬钴锰钛åˆé‡‘ç²’ +item.itemPlateStellite.name=铬钴锰钛åˆé‡‘æ¿ +item.itemPlateDoubleStellite.name=åŒé‡é“¬é’´é”°é’›åˆé‡‘æ¿ +item.itemBoltStellite.name=铬钴锰钛åˆé‡‘èžºæ “ +item.itemRodStellite.name=铬钴锰钛åˆé‡‘æ† +item.itemRodLongStellite.name=长铬钴锰钛åˆé‡‘æ† +item.itemRingStellite.name=铬钴锰钛åˆé‡‘环 +item.itemScrewStellite.name=铬钴锰钛åˆé‡‘èžºä¸ +item.itemRotorStellite.name=铬钴锰钛åˆé‡‘转å +item.itemGearStellite.name=铬钴锰钛åˆé‡‘齿轮 +item.itemIngotTalonite.name=铬钴磷酸ç›åˆé‡‘é” +item.itemDustTalonite.name=铬钴磷酸ç›åˆé‡‘粉 +item.itemDustTinyTalonite.name=å°æ’®é“¬é’´ç£·é…¸ç›åˆé‡‘粉 +item.itemDustSmallTalonite.name=å°å †é“¬é’´ç£·é…¸ç›åˆé‡‘粉 +item.itemNuggetTalonite.name=铬钴磷酸ç›åˆé‡‘ç²’ +item.itemPlateTalonite.name=铬钴磷酸ç›åˆé‡‘æ¿ +item.itemPlateDoubleTalonite.name=åŒé‡é“¬é’´ç£·é…¸ç›åˆé‡‘æ¿ +item.itemBoltTalonite.name=铬钴磷酸ç›åˆé‡‘èžºæ “ +item.itemRodTalonite.name=铬钴磷酸ç›åˆé‡‘æ† +item.itemRodLongTalonite.name=长铬钴磷酸ç›åˆé‡‘æ† +item.itemRingTalonite.name=铬钴磷酸ç›åˆé‡‘环 +item.itemScrewTalonite.name=铬钴磷酸ç›åˆé‡‘èžºä¸ +item.itemRotorTalonite.name=铬钴磷酸ç›åˆé‡‘转å +item.itemGearTalonite.name=铬钴磷酸ç›åˆé‡‘齿轮 +item.itemIngotHastelloyW.name=哈斯特洛ä¾åˆé‡‘-Wé” +item.itemDustHastelloyW.name=哈斯特洛ä¾åˆé‡‘-W粉 +item.itemDustTinyHastelloyW.name=å°æ’®å“ˆæ–¯ç‰¹æ´›ä¾åˆé‡‘-W粉 +item.itemDustSmallHastelloyW.name=å°å †å“ˆæ–¯ç‰¹æ´›ä¾åˆé‡‘-W粉 +item.itemNuggetHastelloyW.name=哈斯特洛ä¾åˆé‡‘-Wç²’ +item.itemPlateHastelloyW.name=哈斯特洛ä¾åˆé‡‘-Wæ¿ +item.itemPlateDoubleHastelloyW.name=åŒé‡å“ˆæ–¯ç‰¹æ´›ä¾åˆé‡‘-Wæ¿ +item.itemBoltHastelloyW.name=哈斯特洛ä¾åˆé‡‘-Wèžºæ “ +item.itemRodHastelloyW.name=哈斯特洛ä¾åˆé‡‘-Wæ† +item.itemRodLongHastelloyW.name=长哈斯特洛ä¾åˆé‡‘-Wæ† +item.itemRingHastelloyW.name=哈斯特洛ä¾åˆé‡‘-W环 +item.itemScrewHastelloyW.name=哈斯特洛ä¾åˆé‡‘-Wèžºä¸ +item.itemRotorHastelloyW.name=哈斯特洛ä¾åˆé‡‘-W转å +item.itemGearHastelloyW.name=哈斯特洛ä¾åˆé‡‘-W齿轮 +item.itemIngotHastelloyX.name=哈斯特洛ä¾åˆé‡‘-Xé” +item.itemDustHastelloyX.name=哈斯特洛ä¾åˆé‡‘-X粉 +item.itemDustTinyHastelloyX.name=å°æ’®å“ˆæ–¯ç‰¹æ´›ä¾åˆé‡‘-X粉 +item.itemDustSmallHastelloyX.name=å°å †å“ˆæ–¯ç‰¹æ´›ä¾åˆé‡‘-X粉 +item.itemNuggetHastelloyX.name=哈斯特洛ä¾åˆé‡‘-Xç²’ +item.itemPlateHastelloyX.name=哈斯特洛ä¾åˆé‡‘-Xæ¿ +item.itemPlateDoubleHastelloyX.name=åŒé‡å“ˆæ–¯ç‰¹æ´›ä¾åˆé‡‘-Xæ¿ +item.itemBoltHastelloyX.name=哈斯特洛ä¾åˆé‡‘-Xèžºæ “ +item.itemRodHastelloyX.name=哈斯特洛ä¾åˆé‡‘-Xæ† +item.itemRodLongHastelloyX.name=长哈斯特洛ä¾åˆé‡‘-Xæ† +item.itemRingHastelloyX.name=哈斯特洛ä¾åˆé‡‘-X环 +item.itemScrewHastelloyX.name=哈斯特洛ä¾åˆé‡‘-Xèžºä¸ +item.itemRotorHastelloyX.name=哈斯特洛ä¾åˆé‡‘-X转å +item.itemGearHastelloyX.name=哈斯特洛ä¾åˆé‡‘-X齿轮 +item.itemIngotHastelloyC276.name=哈斯特洛ä¾åˆé‡‘-C276é” +item.itemHotIngotHastelloyC276.name=çƒå“ˆæ–¯ç‰¹æ´›ä¾åˆé‡‘-C276é” +item.itemDustHastelloyC276.name=哈斯特洛ä¾åˆé‡‘-C276粉 +item.itemDustTinyHastelloyC276.name=å°æ’®å“ˆæ–¯ç‰¹æ´›ä¾åˆé‡‘-C276粉 +item.itemDustSmallHastelloyC276.name=å°å †å“ˆæ–¯ç‰¹æ´›ä¾åˆé‡‘-C276粉 +item.itemNuggetHastelloyC276.name=哈斯特洛ä¾åˆé‡‘-C276ç²’ +item.itemPlateHastelloyC276.name=哈斯特洛ä¾åˆé‡‘-C276æ¿ +item.itemPlateDoubleHastelloyC276.name=åŒé‡å“ˆæ–¯ç‰¹æ´›ä¾åˆé‡‘-C276æ¿ +item.itemBoltHastelloyC276.name=哈斯特洛ä¾åˆé‡‘-C276èžºæ “ +item.itemRodHastelloyC276.name=哈斯特洛ä¾åˆé‡‘-C276æ† +item.itemRodLongHastelloyC276.name=长哈斯特洛ä¾åˆé‡‘-C276æ† +item.itemRingHastelloyC276.name=哈斯特洛ä¾åˆé‡‘-C276环 +item.itemScrewHastelloyC276.name=哈斯特洛ä¾åˆé‡‘-C276èžºä¸ +item.itemRotorHastelloyC276.name=哈斯特洛ä¾åˆé‡‘-C276转å +item.itemGearHastelloyC276.name=哈斯特洛ä¾åˆé‡‘-C276齿轮 +item.itemIngotHastelloyN.name=哈斯特洛ä¾åˆé‡‘-Né” +item.itemHotIngotHastelloyN.name=çƒå“ˆæ–¯ç‰¹æ´›ä¾åˆé‡‘-Né” +item.itemDustHastelloyN.name=哈斯特洛ä¾åˆé‡‘-N粉 +item.itemDustTinyHastelloyN.name=å°æ’®å“ˆæ–¯ç‰¹æ´›ä¾åˆé‡‘-N粉 +item.itemDustSmallHastelloyN.name=å°å †å“ˆæ–¯ç‰¹æ´›ä¾åˆé‡‘-N粉 +item.itemNuggetHastelloyN.name=哈斯特洛ä¾åˆé‡‘-Nç²’ +item.itemPlateHastelloyN.name=哈斯特洛ä¾åˆé‡‘-Næ¿ +item.itemPlateDoubleHastelloyN.name=åŒé‡å“ˆæ–¯ç‰¹æ´›ä¾åˆé‡‘-Næ¿ +item.itemBoltHastelloyN.name=哈斯特洛ä¾åˆé‡‘-Nèžºæ “ +item.itemRodHastelloyN.name=哈斯特洛ä¾åˆé‡‘-Næ† +item.itemRodLongHastelloyN.name=长哈斯特洛ä¾åˆé‡‘-Næ† +item.itemRingHastelloyN.name=哈斯特洛ä¾åˆé‡‘-N环 +item.itemScrewHastelloyN.name=哈斯特洛ä¾åˆé‡‘-Nèžºä¸ +item.itemRotorHastelloyN.name=哈斯特洛ä¾åˆé‡‘-N转å +item.itemGearHastelloyN.name=哈斯特洛ä¾åˆé‡‘-N齿轮 +item.itemIngotIncoloy020.name=è€çƒè€çƒé“¬é“åˆé‡‘-020é” +item.itemDustIncoloy020.name=è€çƒè€çƒé“¬é“åˆé‡‘-020粉 +item.itemDustTinyIncoloy020.name=å°æ’®è€çƒè€çƒé“¬é“åˆé‡‘-020粉 +item.itemDustSmallIncoloy020.name=å°å †è€çƒè€çƒé“¬é“åˆé‡‘-020粉 +item.itemNuggetIncoloy020.name=è€çƒè€çƒé“¬é“åˆé‡‘-020ç²’ +item.itemPlateIncoloy020.name=è€çƒè€çƒé“¬é“åˆé‡‘-020æ¿ +item.itemPlateDoubleIncoloy020.name=åŒé‡è€çƒè€çƒé“¬é“åˆé‡‘-020æ¿ +item.itemBoltIncoloy020.name=è€çƒè€çƒé“¬é“åˆé‡‘-020èžºæ “ +item.itemRodIncoloy020.name=è€çƒè€çƒé“¬é“åˆé‡‘-020æ† +item.itemRodLongIncoloy020.name=é•¿è€çƒè€çƒé“¬é“åˆé‡‘-020æ† +item.itemRingIncoloy020.name=è€çƒè€çƒé“¬é“åˆé‡‘-020环 +item.itemScrewIncoloy020.name=è€çƒè€çƒé“¬é“åˆé‡‘-020èžºä¸ +item.itemRotorIncoloy020.name=è€çƒè€çƒé“¬é“åˆé‡‘-020转å +item.itemGearIncoloy020.name=è€çƒè€çƒé“¬é“åˆé‡‘-020齿轮 +item.itemIngotIncoloyDS.name=è€çƒé“¬é“åˆé‡‘-DSé” +item.itemDustIncoloyDS.name=è€çƒé“¬é“åˆé‡‘-DS粉 +item.itemDustTinyIncoloyDS.name=å°æ’®è€çƒé“¬é“åˆé‡‘-DS粉 +item.itemDustSmallIncoloyDS.name=å°å †è€çƒé“¬é“åˆé‡‘-DS粉 +item.itemNuggetIncoloyDS.name=è€çƒé“¬é“åˆé‡‘-DSç²’ +item.itemPlateIncoloyDS.name=è€çƒé“¬é“åˆé‡‘-DSæ¿ +item.itemPlateDoubleIncoloyDS.name=åŒé‡è€çƒé“¬é“åˆé‡‘-DSæ¿ +item.itemBoltIncoloyDS.name=è€çƒé“¬é“åˆé‡‘-DSèžºæ “ +item.itemRodIncoloyDS.name=è€çƒé“¬é“åˆé‡‘-DSæ† +item.itemRodLongIncoloyDS.name=é•¿è€çƒé“¬é“åˆé‡‘-DSæ† +item.itemRingIncoloyDS.name=è€çƒé“¬é“åˆé‡‘-DS环 +item.itemScrewIncoloyDS.name=è€çƒé“¬é“åˆé‡‘-DSèžºä¸ +item.itemRotorIncoloyDS.name=è€çƒé“¬é“åˆé‡‘-DS转å +item.itemGearIncoloyDS.name=è€çƒé“¬é“åˆé‡‘-DS齿轮 +item.itemIngotIncoloyMA956.name=è€çƒé“¬é“åˆé‡‘-MA956é” +item.itemHotIngotIncoloyMA956.name=çƒè€çƒé“¬é“åˆé‡‘-MA956é” +item.itemDustIncoloyMA956.name=è€çƒé“¬é“åˆé‡‘-MA956粉 +item.itemDustTinyIncoloyMA956.name=å°æ’®è€çƒé“¬é“åˆé‡‘-MA956粉 +item.itemDustSmallIncoloyMA956.name=å°å †è€çƒé“¬é“åˆé‡‘-MA956粉 +item.itemNuggetIncoloyMA956.name=è€çƒé“¬é“åˆé‡‘-MA956ç²’ +item.itemPlateIncoloyMA956.name=è€çƒé“¬é“åˆé‡‘-MA956æ¿ +item.itemPlateDoubleIncoloyMA956.name=åŒé‡è€çƒé“¬é“åˆé‡‘-MA956æ¿ +item.itemBoltIncoloyMA956.name=è€çƒé“¬é“åˆé‡‘-MA956èžºæ “ +item.itemRodIncoloyMA956.name=è€çƒé“¬é“åˆé‡‘-MA956æ† +item.itemRodLongIncoloyMA956.name=é•¿è€çƒé“¬é“åˆé‡‘-MA956æ† +item.itemRingIncoloyMA956.name=è€çƒé“¬é“åˆé‡‘-MA956环 +item.itemScrewIncoloyMA956.name=è€çƒé“¬é“åˆé‡‘-MA956èžºä¸ +item.itemRotorIncoloyMA956.name=è€çƒé“¬é“åˆé‡‘-MA956转å +item.itemGearIncoloyMA956.name=è€çƒé“¬é“åˆé‡‘-MA956齿轮 +item.itemIngotGrisium.name=ç°é’›åˆé‡‘é” +item.itemHotIngotGrisium.name=çƒç°é’›åˆé‡‘é” +item.itemDustGrisium.name=ç°é’›åˆé‡‘粉 +item.itemDustTinyGrisium.name=å°æ’®ç°é’›åˆé‡‘粉 +item.itemDustSmallGrisium.name=å°å †ç°é’›åˆé‡‘粉 +item.itemNuggetGrisium.name=ç°é’›åˆé‡‘ç²’ +item.itemPlateGrisium.name=ç°é’›åˆé‡‘æ¿ +item.itemPlateDoubleGrisium.name=åŒé‡ç°é’›åˆé‡‘æ¿ +item.itemBoltGrisium.name=ç°é’›åˆé‡‘èžºæ “ +item.itemRodGrisium.name=ç°é’›åˆé‡‘æ† +item.itemRodLongGrisium.name=é•¿ç°é’›åˆé‡‘æ† +item.itemRingGrisium.name=ç°é’›åˆé‡‘环 +item.itemScrewGrisium.name=ç°é’›åˆé‡‘èžºä¸ +item.itemRotorGrisium.name=ç°é’›åˆé‡‘转å +item.itemGearGrisium.name=ç°é’›åˆé‡‘齿轮 +item.itemIngotHG1223.name=HG-1223é” +item.itemDustHG1223.name=HG-1223粉 +item.itemDustTinyHG1223.name=å°æ’®HG-1223粉 +item.itemDustSmallHG1223.name=å°å †HG-1223粉 +item.itemNuggetHG1223.name=HG-1223ç²’ +item.itemPlateHG1223.name=HG-1223æ¿ +item.itemPlateDoubleHG1223.name=åŒé‡HG-1223æ¿ +item.itemIngotTrinium.name=ä¸‰å…ƒé‡‘å±žé” +item.itemDustTrinium.name=三元金属粉 +item.itemDustTinyTrinium.name=å°æ’®ä¸‰å…ƒé‡‘属粉 +item.itemDustSmallTrinium.name=å°å †ä¸‰å…ƒé‡‘属粉 +item.itemNuggetTrinium.name=三元金属粒 +item.itemPlateTrinium.name=ä¸‰å…ƒé‡‘å±žæ¿ +item.itemPlateDoubleTrinium.name=åŒé‡ä¸‰å…ƒé‡‘å±žæ¿ +item.itemIngotRefinedTrinium.name=ç²¾åˆ¶ä¸‰å…ƒé‡‘å±žé” +item.itemDustRefinedTrinium.name=精制三元金属粉 +item.itemDustTinyRefinedTrinium.name=å°æ’®ç²¾åˆ¶ä¸‰å…ƒé‡‘属粉 +item.itemDustSmallRefinedTrinium.name=å°å †ç²¾åˆ¶ä¸‰å…ƒé‡‘属粉 +item.itemNuggetRefinedTrinium.name=精制三元金属粒 +item.itemPlateRefinedTrinium.name=ç²¾åˆ¶ä¸‰å…ƒé‡‘å±žæ¿ +item.itemPlateDoubleRefinedTrinium.name=åŒé‡ç²¾åˆ¶ä¸‰å…ƒé‡‘å±žæ¿ +item.itemIngotTriniumTitaniumAlloy.name=三元钛åˆé‡‘é” +item.itemHotIngotTriniumTitaniumAlloy.name=çƒä¸‰å…ƒé’›åˆé‡‘é” +item.itemDustTriniumTitaniumAlloy.name=三元钛åˆé‡‘粉 +item.itemDustTinyTriniumTitaniumAlloy.name=å°æ’®ä¸‰å…ƒé’›åˆé‡‘粉 +item.itemDustSmallTriniumTitaniumAlloy.name=å°å †ä¸‰å…ƒé’›åˆé‡‘粉 +item.itemNuggetTriniumTitaniumAlloy.name=三元钛åˆé‡‘ç²’ +item.itemPlateTriniumTitaniumAlloy.name=三元钛åˆé‡‘æ¿ +item.itemPlateDoubleTriniumTitaniumAlloy.name=åŒé‡ä¸‰å…ƒé’›åˆé‡‘æ¿ +item.itemBoltTriniumTitaniumAlloy.name=三元钛åˆé‡‘èžºæ “ +item.itemRodTriniumTitaniumAlloy.name=三元钛åˆé‡‘æ† +item.itemRodLongTriniumTitaniumAlloy.name=长三元钛åˆé‡‘æ† +item.itemRingTriniumTitaniumAlloy.name=三元钛åˆé‡‘环 +item.itemScrewTriniumTitaniumAlloy.name=三元钛åˆé‡‘èžºä¸ +item.itemRotorTriniumTitaniumAlloy.name=三元钛åˆé‡‘转å +item.itemGearTriniumTitaniumAlloy.name=三元钛åˆé‡‘齿轮 +item.itemIngotTriniumNaquadahAlloy.name=三元硅岩åˆé‡‘é” +item.itemDustTriniumNaquadahAlloy.name=三元硅岩åˆé‡‘粉 +item.itemDustTinyTriniumNaquadahAlloy.name=å°æ’®ä¸‰å…ƒç¡…岩åˆé‡‘粉 +item.itemDustSmallTriniumNaquadahAlloy.name=å°å †ä¸‰å…ƒç¡…岩åˆé‡‘粉 +item.itemNuggetTriniumNaquadahAlloy.name=三元硅岩åˆé‡‘ç²’ +item.itemPlateTriniumNaquadahAlloy.name=三元硅岩åˆé‡‘æ¿ +item.itemPlateDoubleTriniumNaquadahAlloy.name=åŒé‡ä¸‰å…ƒç¡…岩åˆé‡‘æ¿ +item.itemIngotTriniumNaquadahCarbonite.name=碳化三元硅岩åˆé‡‘é” +item.itemHotIngotTriniumNaquadahCarbonite.name=çƒç¢³åŒ–三元硅岩åˆé‡‘é” +item.itemDustTriniumNaquadahCarbonite.name=碳化三元硅岩åˆé‡‘粉 +item.itemDustTinyTriniumNaquadahCarbonite.name=å°æ’®ç¢³åŒ–三元硅岩åˆé‡‘粉 +item.itemDustSmallTriniumNaquadahCarbonite.name=å°å †ç¢³åŒ–三元硅岩åˆé‡‘粉 +item.itemNuggetTriniumNaquadahCarbonite.name=碳化三元硅岩åˆé‡‘ç²’ +item.itemPlateTriniumNaquadahCarbonite.name=碳化三元硅岩åˆé‡‘æ¿ +item.itemPlateDoubleTriniumNaquadahCarbonite.name=åŒé‡ç¢³åŒ–三元硅岩åˆé‡‘æ¿ +item.itemBoltTriniumNaquadahCarbonite.name=碳化三元硅岩åˆé‡‘èžºæ “ +item.itemRodTriniumNaquadahCarbonite.name=碳化三元硅岩åˆé‡‘æ† +item.itemRodLongTriniumNaquadahCarbonite.name=长碳化三元硅岩åˆé‡‘æ† +item.itemRingTriniumNaquadahCarbonite.name=碳化三元硅岩åˆé‡‘环 +item.itemScrewTriniumNaquadahCarbonite.name=碳化三元硅岩åˆé‡‘èžºä¸ +item.itemRotorTriniumNaquadahCarbonite.name=碳化三元硅岩åˆé‡‘转å +item.itemGearTriniumNaquadahCarbonite.name=碳化三元硅岩åˆé‡‘齿轮 +item.itemIngotQuantum.name=é‡ååˆé‡‘é” +item.itemHotIngotQuantum.name=çƒé‡ååˆé‡‘é” +item.itemDustQuantum.name=é‡ååˆé‡‘粉 +item.itemDustTinyQuantum.name=å°æ’®é‡ååˆé‡‘粉 +item.itemDustSmallQuantum.name=å°å †é‡ååˆé‡‘粉 +item.itemNuggetQuantum.name=é‡ååˆé‡‘ç²’ +item.itemPlateQuantum.name=é‡ååˆé‡‘æ¿ +item.itemPlateDoubleQuantum.name=åŒé‡é‡ååˆé‡‘æ¿ +item.itemBoltQuantum.name=é‡ååˆé‡‘èžºæ “ +item.itemRodQuantum.name=é‡ååˆé‡‘æ† +item.itemRodLongQuantum.name=é•¿é‡ååˆé‡‘æ† +item.itemRingQuantum.name=é‡ååˆé‡‘环 +item.itemScrewQuantum.name=é‡ååˆé‡‘èžºä¸ +item.itemRotorQuantum.name=é‡ååˆé‡‘转å +item.itemGearQuantum.name=é‡ååˆé‡‘齿轮 +item.itemDustFluorite.name=氟石粉 +item.itemDustTinyFluorite.name=å°æ’®æ°ŸçŸ³ç²‰ +item.itemDustSmallFluorite.name=å°å †æ°ŸçŸ³ç²‰ +item.crushedFluorite.name=粉碎的氟石矿石 +item.crushedCentrifugedFluorite.name=离心氟石矿石 +item.crushedPurifiedFluorite.name=洗净的氟石矿石 +item.dustImpureFluorite.name=å«æ‚氟石粉 +item.dustPureFluorite.name=æ´å‡€æ°ŸçŸ³ç²‰ +item.itemDustCrocoite.name=赤铅矿粉 +item.itemDustTinyCrocoite.name=å°æ’®èµ¤é“…矿粉 +item.itemDustSmallCrocoite.name=å°å †èµ¤é“…矿粉 +item.crushedCrocoite.name=粉碎的赤铅矿矿石 +item.crushedCentrifugedCrocoite.name=离心赤铅矿矿石 +item.crushedPurifiedCrocoite.name=洗净的赤铅矿矿石 +item.dustImpureCrocoite.name=å«æ‚赤铅矿粉 +item.dustPureCrocoite.name=æ´å‡€èµ¤é“…矿粉 +item.itemDustGeikielite.name=é•é’›çŸ¿ç²‰ +item.itemDustTinyGeikielite.name=å°æ’®é•é’›çŸ¿ç²‰ +item.itemDustSmallGeikielite.name=å°å †é•é’›çŸ¿ç²‰ +item.crushedGeikielite.name=粉碎的é•é’›çŸ¿çŸ¿çŸ³ +item.crushedCentrifugedGeikielite.name=离心é•é’›çŸ¿çŸ¿çŸ³ +item.crushedPurifiedGeikielite.name=洗净的é•é’›çŸ¿çŸ¿çŸ³ +item.dustImpureGeikielite.name=å«æ‚é•é’›çŸ¿ç²‰ +item.dustPureGeikielite.name=æ´å‡€é•é’›çŸ¿ç²‰ +item.itemDustNichromite.name=é•é“¬çŸ¿ç²‰ +item.itemDustTinyNichromite.name=å°æ’®é•é“¬çŸ¿ç²‰ +item.itemDustSmallNichromite.name=å°å †é•é“¬çŸ¿ç²‰ +item.crushedNichromite.name=粉碎的é•é“¬çŸ¿çŸ¿çŸ³ +item.crushedCentrifugedNichromite.name=离心é•é“¬çŸ¿çŸ¿çŸ³ +item.crushedPurifiedNichromite.name=洗净的é•é“¬çŸ¿çŸ¿çŸ³ +item.dustImpureNichromite.name=å«æ‚é•é“¬çŸ¿ç²‰ +item.dustPureNichromite.name=æ´å‡€é•é“¬çŸ¿ç²‰ +item.itemDustTitanite.name=æ¦çŸ³ç²‰ +item.itemDustTinyTitanite.name=å°æ’®æ¦çŸ³ç²‰ +item.itemDustSmallTitanite.name=å°å †æ¦çŸ³ç²‰ +item.crushedTitanite.name=粉碎的æ¦çŸ³çŸ¿çŸ³ +item.crushedCentrifugedTitanite.name=离心æ¦çŸ³çŸ¿çŸ³ +item.crushedPurifiedTitanite.name=洗净的æ¦çŸ³çŸ¿çŸ³ +item.dustImpureTitanite.name=å«æ‚æ¦çŸ³ç²‰ +item.dustPureTitanite.name=æ´å‡€æ¦çŸ³ç²‰ +item.itemDustZimbabweite.name=é’›é“Œé“…é’ çŸ³ç²‰ +item.itemDustTinyZimbabweite.name=å°æ’®é’›é“Œé“…é’ çŸ³ç²‰ +item.itemDustSmallZimbabweite.name=å°å †é’›é“Œé“…é’ çŸ³ç²‰ +item.crushedZimbabweite.name=ç²‰ç¢Žçš„é’›é“Œé“…é’ çŸ³çŸ¿çŸ³ +item.crushedCentrifugedZimbabweite.name=ç¦»å¿ƒé’›é“Œé“…é’ çŸ³çŸ¿çŸ³ +item.crushedPurifiedZimbabweite.name=æ´—å‡€çš„é’›é“Œé“…é’ çŸ³çŸ¿çŸ³ +item.dustImpureZimbabweite.name=å«æ‚é’›é“Œé“…é’ çŸ³ç²‰ +item.dustPureZimbabweite.name=æ´å‡€é’›é“Œé“…é’ çŸ³ç²‰ +item.itemDustZirconolite.name=钛锆é’矿粉 +item.itemDustTinyZirconolite.name=å°æ’®é’›é”†é’矿粉 +item.itemDustSmallZirconolite.name=å°å †é’›é”†é’矿粉 +item.crushedZirconolite.name=粉碎的钛锆é’矿矿石 +item.crushedCentrifugedZirconolite.name=离心钛锆é’矿矿石 +item.crushedPurifiedZirconolite.name=洗净的钛锆é’矿矿石 +item.dustImpureZirconolite.name=å«æ‚钛锆é’矿粉 +item.dustPureZirconolite.name=æ´å‡€é’›é”†é’矿粉 +item.itemDustGadoliniteCe.name=ç¡…é“钇矿(Ce)粉 +item.itemDustTinyGadoliniteCe.name=å°æ’®ç¡…é“钇矿(Ce)粉 +item.itemDustSmallGadoliniteCe.name=å°å †ç¡…é“钇矿(Ce)粉 +item.crushedGadoliniteCe.name=粉碎的硅é“钇矿(Ce)矿石 +item.crushedCentrifugedGadoliniteCe.name=离心硅é“钇矿(Ce)矿石 +item.crushedPurifiedGadoliniteCe.name=洗净的硅é“钇矿(Ce)矿石 +item.dustImpureGadoliniteCe.name=å«æ‚ç¡…é“钇矿(Ce)粉 +item.dustPureGadoliniteCe.name=æ´å‡€ç¡…é“钇矿(Ce)粉 +item.itemDustGadoliniteY.name=ç¡…é“钇矿(Y)粉 +item.itemDustTinyGadoliniteY.name=å°æ’®ç¡…é“钇矿(Y)粉 +item.itemDustSmallGadoliniteY.name=å°å †ç¡…é“钇矿(Y)粉 +item.crushedGadoliniteY.name=粉碎的硅é“钇矿(Y)矿石 +item.crushedCentrifugedGadoliniteY.name=离心硅é“钇矿(Y)矿石 +item.crushedPurifiedGadoliniteY.name=洗净的硅é“钇矿(Y)矿石 +item.dustImpureGadoliniteY.name=å«æ‚ç¡…é“钇矿(Y)粉 +item.dustPureGadoliniteY.name=æ´å‡€ç¡…é“钇矿(Y)粉 +item.itemDustLepersonnite.name=绿泥石粉 +item.itemDustTinyLepersonnite.name=å°æ’®ç»¿æ³¥çŸ³ç²‰ +item.itemDustSmallLepersonnite.name=å°å †ç»¿æ³¥çŸ³ç²‰ +item.crushedLepersonnite.name=粉碎的绿泥石矿石 +item.crushedCentrifugedLepersonnite.name=离心绿泥石矿石 +item.crushedPurifiedLepersonnite.name=洗净的绿泥石矿石 +item.dustImpureLepersonnite.name=å«æ‚绿泥石粉 +item.dustPureLepersonnite.name=æ´å‡€ç»¿æ³¥çŸ³ç²‰ +item.itemDustSamarskiteY.name=铌钇矿(Y)粉 +item.itemDustTinySamarskiteY.name=å°æ’®é“Œé’‡çŸ¿(Y)粉 +item.itemDustSmallSamarskiteY.name=å°å †é“Œé’‡çŸ¿(Y)粉 +item.crushedSamarskiteY.name=粉碎的铌钇矿(Y)矿石 +item.crushedCentrifugedSamarskiteY.name=离心铌钇矿(Y)矿石 +item.crushedPurifiedSamarskiteY.name=洗净的铌钇矿(Y)矿石 +item.dustImpureSamarskiteY.name=å«æ‚铌钇矿(Y)粉 +item.dustPureSamarskiteY.name=æ´å‡€é“Œé’‡çŸ¿(Y)粉 +item.itemDustSamarskiteYb.name=铌钇矿(Yb)粉 +item.itemDustTinySamarskiteYb.name=å°æ’®é“Œé’‡çŸ¿(Yb)粉 +item.itemDustSmallSamarskiteYb.name=å°å †é“Œé’‡çŸ¿(Yb)粉 +item.crushedSamarskiteYb.name=粉碎的铌钇矿(Yb)矿石 +item.crushedCentrifugedSamarskiteYb.name=离心铌钇矿(Yb)矿石 +item.crushedPurifiedSamarskiteYb.name=洗净的铌钇矿(Yb)矿石 +item.dustImpureSamarskiteYb.name=å«æ‚铌钇矿(Yb)粉 +item.dustPureSamarskiteYb.name=æ´å‡€é“Œé’‡çŸ¿(Yb)粉 +item.itemDustXenotime.name=磷钇矿粉 +item.itemDustTinyXenotime.name=å°æ’®ç£·é’‡çŸ¿ç²‰ +item.itemDustSmallXenotime.name=å°å †ç£·é’‡çŸ¿ç²‰ +item.crushedXenotime.name=粉碎的磷钇矿矿石 +item.crushedCentrifugedXenotime.name=离心磷钇矿矿石 +item.crushedPurifiedXenotime.name=洗净的磷钇矿矿石 +item.dustImpureXenotime.name=å«æ‚磷钇矿粉 +item.dustPureXenotime.name=æ´å‡€ç£·é’‡çŸ¿ç²‰ +item.itemDustYttriaite.name=钇矿粉 +item.itemDustTinyYttriaite.name=å°æ’®é’‡çŸ¿ç²‰ +item.itemDustSmallYttriaite.name=å°å †é’‡çŸ¿ç²‰ +item.crushedYttriaite.name=粉碎的钇矿矿石 +item.crushedCentrifugedYttriaite.name=离心钇矿矿石 +item.crushedPurifiedYttriaite.name=洗净的钇矿矿石 +item.dustImpureYttriaite.name=å«æ‚钇矿粉 +item.dustPureYttriaite.name=æ´å‡€é’‡çŸ¿ç²‰ +item.itemDustYttrialite.name=ç¡…é’钇矿粉 +item.itemDustTinyYttrialite.name=å°æ’®ç¡…é’钇矿粉 +item.itemDustSmallYttrialite.name=å°å †ç¡…é’钇矿粉 +item.crushedYttrialite.name=粉碎的硅é’钇矿矿石 +item.crushedCentrifugedYttrialite.name=离心硅é’钇矿矿石 +item.crushedPurifiedYttrialite.name=洗净的硅é’钇矿矿石 +item.dustImpureYttrialite.name=å«æ‚ç¡…é’钇矿粉 +item.dustPureYttrialite.name=æ´å‡€ç¡…é’钇矿粉 +item.itemDustYttrocerite.name=铈钇矿粉 +item.itemDustTinyYttrocerite.name=å°æ’®é“ˆé’‡çŸ¿ç²‰ +item.itemDustSmallYttrocerite.name=å°å †é“ˆé’‡çŸ¿ç²‰ +item.crushedYttrocerite.name=粉碎的铈钇矿矿石 +item.crushedCentrifugedYttrocerite.name=离心铈钇矿矿石 +item.crushedPurifiedYttrocerite.name=洗净的铈钇矿矿石 +item.dustImpureYttrocerite.name=å«æ‚铈钇矿粉 +item.dustPureYttrocerite.name=æ´å‡€é“ˆé’‡çŸ¿ç²‰ +item.itemDustZircon.name=锆石粉 +item.itemDustTinyZircon.name=å°æ’®é”†çŸ³ç²‰ +item.itemDustSmallZircon.name=å°å †é”†çŸ³ç²‰ +item.crushedZircon.name=粉碎的锆石矿石 +item.crushedCentrifugedZircon.name=离心锆石矿石 +item.crushedPurifiedZircon.name=洗净的锆石矿石 +item.dustImpureZircon.name=å«æ‚锆石粉 +item.dustPureZircon.name=æ´å‡€é”†çŸ³ç²‰ +item.itemDustPolycrase.name=锗铀钇矿粉 +item.itemDustTinyPolycrase.name=å°æ’®é”—铀钇矿粉 +item.itemDustSmallPolycrase.name=å°å †é”—铀钇矿粉 +item.crushedPolycrase.name=粉碎的锗铀钇矿矿石 +item.crushedCentrifugedPolycrase.name=离心锗铀钇矿矿石 +item.crushedPurifiedPolycrase.name=洗净的锗铀钇矿矿石 +item.dustImpurePolycrase.name=å«æ‚锗铀钇矿粉 +item.dustPurePolycrase.name=æ´å‡€é”—铀钇矿粉 +item.itemDustZircophyllite.name=锆星å¶çŸ³ç²‰ +item.itemDustTinyZircophyllite.name=å°æ’®é”†æ˜Ÿå¶çŸ³ç²‰ +item.itemDustSmallZircophyllite.name=å°å †é”†æ˜Ÿå¶çŸ³ç²‰ +item.crushedZircophyllite.name=粉碎的锆星å¶çŸ³çŸ¿çŸ³ +item.crushedCentrifugedZircophyllite.name=离心锆星å¶çŸ³çŸ¿çŸ³ +item.crushedPurifiedZircophyllite.name=洗净的锆星å¶çŸ³çŸ¿çŸ³ +item.dustImpureZircophyllite.name=å«æ‚锆星å¶çŸ³ç²‰ +item.dustPureZircophyllite.name=æ´å‡€é”†æ˜Ÿå¶çŸ³ç²‰ +item.itemDustZirkelite.name=锆英石粉 +item.itemDustTinyZirkelite.name=å°æ’®é”†è‹±çŸ³ç²‰ +item.itemDustSmallZirkelite.name=å°å †é”†è‹±çŸ³ç²‰ +item.crushedZirkelite.name=粉碎的锆英石矿石 +item.crushedCentrifugedZirkelite.name=离心锆英石矿石 +item.crushedPurifiedZirkelite.name=洗净的锆英石矿石 +item.dustImpureZirkelite.name=å«æ‚锆英石粉 +item.dustPureZirkelite.name=æ´å‡€é”†è‹±çŸ³ç²‰ +item.itemDustLanthaniteLa.name=镧石(La)粉 +item.itemDustTinyLanthaniteLa.name=å°æ’®é•§çŸ³(La)粉 +item.itemDustSmallLanthaniteLa.name=å°å †é•§çŸ³(La)粉 +item.crushedLanthaniteLa.name=粉碎的镧石(La)矿石 +item.crushedCentrifugedLanthaniteLa.name=离心镧石(La)矿石 +item.crushedPurifiedLanthaniteLa.name=洗净的镧石(La)矿石 +item.dustImpureLanthaniteLa.name=å«æ‚镧石(La)粉 +item.dustPureLanthaniteLa.name=æ´å‡€é•§çŸ³(La)粉 +item.itemDustLanthaniteCe.name=镧石(Ce)粉 +item.itemDustTinyLanthaniteCe.name=å°æ’®é•§çŸ³(Ce)粉 +item.itemDustSmallLanthaniteCe.name=å°å †é•§çŸ³(Ce)粉 +item.crushedLanthaniteCe.name=粉碎的镧石(Ce)矿石 +item.crushedCentrifugedLanthaniteCe.name=离心镧石(Ce)矿石 +item.crushedPurifiedLanthaniteCe.name=洗净的镧石(Ce)矿石 +item.dustImpureLanthaniteCe.name=å«æ‚镧石(Ce)粉 +item.dustPureLanthaniteCe.name=æ´å‡€é•§çŸ³(Ce)粉 +item.itemDustLanthaniteNd.name=镧石(Nd)粉 +item.itemDustTinyLanthaniteNd.name=å°æ’®é•§çŸ³(Nd)粉 +item.itemDustSmallLanthaniteNd.name=å°å †é•§çŸ³(Nd)粉 +item.crushedLanthaniteNd.name=粉碎的镧石(Nd)矿石 +item.crushedCentrifugedLanthaniteNd.name=离心镧石(Nd)矿石 +item.crushedPurifiedLanthaniteNd.name=洗净的镧石(Nd)矿石 +item.dustImpureLanthaniteNd.name=å«æ‚镧石(Nd)粉 +item.dustPureLanthaniteNd.name=æ´å‡€é•§çŸ³(Nd)粉 +item.itemDustAgarditeY.name=è±é“矿(Y)粉 +item.itemDustTinyAgarditeY.name=å°æ’®è±é“矿(Y)粉 +item.itemDustSmallAgarditeY.name=å°å †è±é“矿(Y)粉 +item.crushedAgarditeY.name=粉碎的è±é“矿(Y)矿石 +item.crushedCentrifugedAgarditeY.name=离心è±é“矿(Y)矿石 +item.crushedPurifiedAgarditeY.name=洗净的è±é“矿(Y)矿石 +item.dustImpureAgarditeY.name=å«æ‚è±é“矿(Y)粉 +item.dustPureAgarditeY.name=æ´å‡€è±é“矿(Y)粉 +item.itemDustAgarditeCd.name=è±é“矿(Cd)粉 +item.itemDustTinyAgarditeCd.name=å°æ’®è±é“矿(Cd)粉 +item.itemDustSmallAgarditeCd.name=å°å †è±é“矿(Cd)粉 +item.crushedAgarditeCd.name=粉碎的è±é“矿(Cd)矿石 +item.crushedCentrifugedAgarditeCd.name=离心è±é“矿(Cd)矿石 +item.crushedPurifiedAgarditeCd.name=洗净的è±é“矿(Cd)矿石 +item.dustImpureAgarditeCd.name=å«æ‚è±é“矿(Cd)粉 +item.dustPureAgarditeCd.name=æ´å‡€è±é“矿(Cd)粉 +item.itemDustAgarditeLa.name=è±é“矿(La)粉 +item.itemDustTinyAgarditeLa.name=å°æ’®è±é“矿(La)粉 +item.itemDustSmallAgarditeLa.name=å°å †è±é“矿(La)粉 +item.crushedAgarditeLa.name=粉碎的è±é“矿(La)矿石 +item.crushedCentrifugedAgarditeLa.name=离心è±é“矿(La)矿石 +item.crushedPurifiedAgarditeLa.name=洗净的è±é“矿(La)矿石 +item.dustImpureAgarditeLa.name=å«æ‚è±é“矿(La)粉 +item.dustPureAgarditeLa.name=æ´å‡€è±é“矿(La)粉 +item.itemDustAgarditeNd.name=è±é“矿(Nd)粉 +item.itemDustTinyAgarditeNd.name=å°æ’®è±é“矿(Nd)粉 +item.itemDustSmallAgarditeNd.name=å°å †è±é“矿(Nd)粉 +item.crushedAgarditeNd.name=粉碎的è±é“矿(Nd)矿石 +item.crushedCentrifugedAgarditeNd.name=离心è±é“矿(Nd)矿石 +item.crushedPurifiedAgarditeNd.name=洗净的è±é“矿(Nd)矿石 +item.dustImpureAgarditeNd.name=å«æ‚è±é“矿(Nd)粉 +item.dustPureAgarditeNd.name=æ´å‡€è±é“矿(Nd)粉 +item.itemDustHibonite.name=黑é“钙石粉 +item.itemDustTinyHibonite.name=å°æ’®é»‘é“钙石粉 +item.itemDustSmallHibonite.name=å°å †é»‘é“钙石粉 +item.crushedHibonite.name=粉碎的黑é“钙石矿石 +item.crushedCentrifugedHibonite.name=离心黑é“钙石矿石 +item.crushedPurifiedHibonite.name=洗净的黑é“钙石矿石 +item.dustImpureHibonite.name=å«æ‚黑é“钙石粉 +item.dustPureHibonite.name=æ´å‡€é»‘é“钙石粉 +item.itemDustCerite.name=铈硅石粉 +item.itemDustTinyCerite.name=å°æ’®é“ˆç¡…石粉 +item.itemDustSmallCerite.name=å°å †é“ˆç¡…石粉 +item.crushedCerite.name=粉碎的铈硅石矿石 +item.crushedCentrifugedCerite.name=离心铈硅石矿石 +item.crushedPurifiedCerite.name=洗净的铈硅石矿石 +item.dustImpureCerite.name=å«æ‚铈硅石粉 +item.dustPureCerite.name=æ´å‡€é“ˆç¡…石粉 +item.itemDustFluorcaphite.name=氟碳铈矿粉 +item.itemDustTinyFluorcaphite.name=å°æ’®æ°Ÿç¢³é“ˆçŸ¿ç²‰ +item.itemDustSmallFluorcaphite.name=å°å †æ°Ÿç¢³é“ˆçŸ¿ç²‰ +item.crushedFluorcaphite.name=粉碎的氟碳铈矿矿石 +item.crushedCentrifugedFluorcaphite.name=离心氟碳铈矿矿石 +item.crushedPurifiedFluorcaphite.name=洗净的氟碳铈矿矿石 +item.dustImpureFluorcaphite.name=å«æ‚氟碳铈矿粉 +item.dustPureFluorcaphite.name=æ´å‡€æ°Ÿç¢³é“ˆçŸ¿ç²‰ +item.itemDustFlorencite.name=磷é“铈矿粉 +item.itemDustTinyFlorencite.name=å°æ’®ç£·é“铈矿粉 +item.itemDustSmallFlorencite.name=å°å †ç£·é“铈矿粉 +item.crushedFlorencite.name=粉碎的磷é“铈矿矿石 +item.crushedCentrifugedFlorencite.name=离心磷é“铈矿矿石 +item.crushedPurifiedFlorencite.name=洗净的磷é“铈矿矿石 +item.dustImpureFlorencite.name=å«æ‚磷é“铈矿粉 +item.dustPureFlorencite.name=æ´å‡€ç£·é“铈矿粉 +item.itemDustCryolite.name=冰晶石粉 +item.itemDustTinyCryolite.name=å°æ’®å†°æ™¶çŸ³ç²‰ +item.itemDustSmallCryolite.name=å°å †å†°æ™¶çŸ³ç²‰ +item.crushedCryolite.name=粉碎的冰晶石矿石 +item.crushedCentrifugedCryolite.name=离心冰晶石矿石 +item.crushedPurifiedCryolite.name=洗净的冰晶石矿石 +item.dustImpureCryolite.name=å«æ‚冰晶石粉 +item.dustPureCryolite.name=æ´å‡€å†°æ™¶çŸ³ç²‰ +item.itemDustTinyYellorium.name=å°æ’®é»„铀矿粉 +item.itemDustSmallYellorium.name=å°å †é»„铀矿粉 +item.crushedYellorium.name=粉碎的黄铀矿矿石 +item.crushedCentrifugedYellorium.name=离心黄铀矿矿石 +item.crushedPurifiedYellorium.name=洗净的黄铀矿矿石 +item.dustImpureYellorium.name=å«æ‚黄铀矿粉 +item.dustPureYellorium.name=æ´å‡€é»„铀矿粉 + +//Shards +item.itemDrained.name=枯ç«ç¢Žç‰‡ +item.itemDustInfusedAir.name=风之é”晶粉 +item.itemDustInfusedFire.name=ç«ä¹‹é”晶粉 +item.itemDustInfusedEarth.name=地之é”晶粉 +item.itemDustInfusedWater.name=水之é”晶粉 + + +//Misc Material Items +item.itemDustLithiumCarbonate.name=碳酸锂粉 +item.itemDustSmallLithiumCarbonate.name=å°å †ç¢³é…¸é”‚粉 +item.itemDustTinyLithiumCarbonate.name=å°æ’®ç¢³é…¸é”‚粉 +item.itemDustLithiumPeroxide.name=过氧化锂粉 +item.itemDustSmallLithiumPeroxide.name=å°å †è¿‡æ°§åŒ–锂粉 +item.itemDustTinyLithiumPeroxide.name=å°æ’®è¿‡æ°§åŒ–锂粉 +item.itemDustLithiumHydroxide.name=氢氧化锂粉 +item.itemDustSmallLithiumHydroxide.name=å°å †æ°¢æ°§åŒ–锂粉 +item.itemDustTinyLithiumHydroxide.name=å°æ’®æ°¢æ°§åŒ–锂粉 +item.itemDustCalciumHydroxide.name=氢氧化钙粉 +item.itemDustSmallCalciumHydroxide.name=å°å †æ°¢æ°§åŒ–钙粉 +item.itemDustTinyCalciumHydroxide.name=å°æ’®æ°¢æ°§åŒ–钙粉 +item.itemDustCalciumCarbonate.name=碳酸钙粉 +item.itemDustSmallCalciumCarbonate.name=å°å †ç¢³é…¸é’™ç²‰ +item.itemDustTinyCalciumCarbonate.name=å°æ’®ç¢³é…¸é’™ç²‰ +item.itemDustGypsum.name=硫酸钙(石è†)粉 +item.itemDustSmallGypsum.name=å°å †ç¡«é…¸é’™(石è†)粉 +item.itemDustTinyGypsum.name=å°æ’®ç¡«é…¸é’™(石è†)粉 +item.itemDustLi2CO3CaOH2.name=碳酸锂+氢氧化钙å¤åˆç‰©ç²‰ +item.itemDustSmallLi2CO3CaOH2.name=å°å †ç¢³é…¸é”‚+氢氧化钙å¤åˆç‰©ç²‰ +item.itemDustTinyLi2CO3CaOH2.name=å°æ’®ç¢³é…¸é”‚+氢氧化钙å¤åˆç‰©ç²‰ +item.itemDustLi2BeF4.name=Li2BeF4 燃料å¤åˆç‰©ç²‰ +item.itemDustSmallLi2BeF4.name=å°å †Li2BeF4燃料å¤åˆç‰©ç²‰ +item.itemDustTinyLi2BeF4.name=å°æ’®Li2BeF4燃料å¤åˆç‰©ç²‰ +item.Li2BeF4.name=Li2BeF4å•å…ƒ +item.itemCircuitLFTR.name=§a§a控制电路 +item.itemZirconiumPellet.name=锆颗粒[氯化锆] +item.itemDustZrCl4.name=氯化锆粉 +item.itemDustSmallZrCl4.name=å°å †æ°¯åŒ–锆粉 +item.itemDustTinyZrCl4.name=å°æ’®æ°¯åŒ–锆粉 +item.itemDustCookedZrCl4.name=焙烧过的氯化锆粉 +item.itemDustSmallCookedZrCl4.name=å°å †ç„™çƒ§è¿‡çš„氯化锆粉 +item.itemDustTinyCookedZrCl4.name=å°æ’®ç„™çƒ§è¿‡çš„氯化锆粉 +item.itemDustUN18Fertiliser.name=æµä½“肥料UN-18粉 +item.itemDustSmallUN18Fertiliser.name=å°å †æµä½“肥料UN-18粉 +item.itemDustTinyUN18Fertiliser.name=å°æ’®æµä½“肥料un-18粉 +item.itemDustUN32Fertiliser.name=æµä½“肥料UN-32粉 +item.itemDustSmallUN32Fertiliser.name=å°å †æµä½“肥料UN-32粉 +item.itemDustTinyUN32Fertiliser.name=å°æ’®æµä½“肥料UN-32粉 +item.itemNuggetPlutonium239.name=é’š 239ç²’ +item.itemCellPlutonium239.name=é’š 239å•å…ƒ +item.itemIngotPlutonium239.name=é’š 239é” +item.itemPlatePlutonium239.name=é’š 239æ¿ +item.itemPlateDoublePlutonium239.name=åŒé‡é’š 239æ¿ +item.itemDustPlutonium239.name=é’š 239粉 +item.itemDustSmallPlutonium239.name=å°å †é’š 239粉 +item.itemDustTinyPlutonium239.name=å°æ’®é’š 239粉 + + +//Multitools +item.AluminiumMultipick.name=é“å¤åˆç¨¿ +item.AluminiumMultispade.name=é“å¤åˆé“² +item.BerylliumMultispade.name=é“å¤åˆé“² +item.BismuthMultispade.name=é“‹å¤åˆé“² +item.CarbonMultispade.name=碳å¤åˆé“² +item.ChromeMultipick.name=铬å¤åˆç¨¿ +item.ChromeMultispade.name=铬å¤åˆé“² +item.CobaltMultipick.name=é’´å¤åˆç¨¿ +item.CobaltMultispade.name=é’´å¤åˆé“² +item.GoldMultispade.name=金å¤åˆé“² +item.IridiumMultipick.name=铱å¤åˆç¨¿ +item.IridiumMultispade.name=铱å¤åˆé“² +item.IronMultipick.name=é“å¤åˆç¨¿ +item.IronMultispade.name=é“å¤åˆé“² +item.LeadMultispade.name=é“…å¤åˆé“² +item.ManganeseMultipick.name=é”°å¤åˆç¨¿ +item.ManganeseMultispade.name=é”°å¤åˆé“² +item.MolybdenumMultipick.name=é’¼å¤åˆç¨¿ +item.MolybdenumMultispade.name=é’¼å¤åˆé“² +item.NeodymiumMultipick.name=é’•å¤åˆé• +item.NeodymiumMultispade.name=é’•å¤åˆé“² +item.NeutroniumMultipick.name=ä¸åç´ å¤åˆé• +item.NeutroniumMultispade.name=ä¸åç´ å¤åˆé“² +item.NickelMultispade.name=é•å¤åˆé“² +item.OsmiumMultipick.name=锇å¤åˆé• +item.OsmiumMultispade.name=锇å¤åˆé“² +item.PalladiumMultipick.name=é’¯å¤åˆé• +item.PalladiumMultispade.name=é’¯å¤åˆé“² +item.PlatinumMultispade.name=é“‚å¤åˆé“² +item.Plutonium241Multipick.name=é’š 241å¤åˆé• +item.Plutonium241Multispade.name=é’š 241å¤åˆé“² +item.SilverMultispade.name=银å¤åˆé“² +item.ThoriumMultipick.name=é’å¤åˆé• +item.ThoriumMultispade.name=é’å¤åˆé“² +item.TitaniumMultipick.name=é’›å¤åˆé• +item.TitaniumMultispade.name=é’›å¤åˆé“² +item.TungstenMultipick.name=é’¨å¤åˆé• +item.TungstenMultispade.name=é’¨å¤åˆé“² +item.Uranium235Multipick.name=é“€ 235å¤åˆé• +item.Uranium235Multispade.name=é“€ 235å¤åˆé“² +item.DarkSteelMultipick.name=玄钢å¤åˆé• +item.DarkSteelMultispade.name=玄钢å¤åˆé“² +item.DuraniumMultipick.name=é“¿é“€å¤åˆé• +item.DuraniumMultispade.name=é“¿é“€å¤åˆé“² +item.InfusedGoldMultispade.name=注é”金å¤åˆé“² +item.NaquadahMultipick.name=硅岩å¤åˆé• +item.NaquadahMultispade.name=硅岩å¤åˆé“² +item.NaquadahAlloyMultipick.name=硅岩åˆé‡‘å¤åˆé• +item.NaquadahAlloyMultispade.name=硅岩åˆé‡‘å¤åˆé“² +item.NaquadriaMultipick.name=超能硅岩å¤åˆé• +item.NaquadriaMultispade.name=超能硅岩å¤åˆé“² +item.TritaniumMultipick.name=三钛å¤åˆé• +item.TritaniumMultispade.name=三钛å¤åˆé“² +item.OsmiridiumMultipick.name=铱锇åˆé‡‘å¤åˆé• +item.OsmiridiumMultispade.name=铱锇åˆé‡‘å¤åˆé“² +item.BrassMultispade.name=黄铜å¤åˆé“² +item.BronzeMultipick.name=é’é“œå¤åˆé• +item.BronzeMultispade.name=é’é“œå¤åˆé“² +item.CupronickelMultispade.name=白铜å¤åˆé“² +item.ElectrumMultispade.name=ç¥ç€é‡‘å¤åˆé“² +item.InvarMultipick.name=æ®·é’¢å¤åˆé• +item.InvarMultispade.name=æ®·é’¢å¤åˆé“² +item.KanthalMultispade.name=åŽå¡”å°”åˆé‡‘å¤åˆé“² +item.MagnaliumMultipick.name=é•é“åˆé‡‘å¤åˆé• +item.MagnaliumMultispade.name=é•é“åˆé‡‘å¤åˆé“² +item.NichromeMultispade.name=é•é“¬åˆé‡‘å¤åˆé“² +item.PigIronMultipick.name=生é“å¤åˆé• +item.PigIronMultispade.name=生é“å¤åˆé“² +item.PolycaprolactamMultispade.name=èšå·±å†…酰胺å¤åˆé“² +item.PolytetrafluoroethyleneMultispade.name=èšå››æ°Ÿä¹™çƒ¯å¤åˆé“² +item.NickelZincFerriteMultispade.name=é•é”Œé“氧体å¤åˆé“² +item.PolyphenyleneSulfideMultispade.name=èšè‹¯ç¡«é†šå¤åˆé“² +item.StainlessSteelMultipick.name=ä¸é”ˆé’¢å¤åˆé• +item.StainlessSteelMultispade.name=ä¸é”ˆé’¢å¤åˆé“² +item.SteelMultipick.name=é’¢å¤åˆé• +item.SteelMultispade.name=é’¢å¤åˆé“² +item.TinAlloyMultispade.name=锡é“åˆé‡‘å¤åˆé“² +item.UltimetMultipick.name=哈æ°åˆé‡‘å¤åˆé• +item.UltimetMultispade.name=哈æ°åˆé‡‘å¤åˆé“² +item.WroughtIronMultipick.name=é”»é“å¤åˆé• +item.WroughtIronMultispade.name=é”»é“å¤åˆé“² +item.SterlingSilverMultipick.name=æ ‡å‡†çº¯é“¶å¤åˆé• +item.SterlingSilverMultispade.name=æ ‡å‡†çº¯é“¶å¤åˆé“² +item.RoseGoldMultipick.name=玫瑰金å¤åˆé• +item.RoseGoldMultispade.name=玫瑰金å¤åˆé“² +item.BlackBronzeMultipick.name=黑é’é“œå¤åˆé• +item.BlackBronzeMultispade.name=黑é’é“œå¤åˆé“² +item.BismuthBronzeMultipick.name=é“‹é’é“œå¤åˆé• +item.BismuthBronzeMultispade.name=é“‹é’é“œå¤åˆé“² +item.BlackSteelMultipick.name=黑钢å¤åˆé• +item.BlackSteelMultispade.name=黑钢å¤åˆé“² +item.RedSteelMultipick.name=红钢å¤åˆé• +item.RedSteelMultispade.name=红钢å¤åˆé“² +item.BlueSteelMultipick.name=è“é’¢å¤åˆé• +item.BlueSteelMultispade.name=è“é’¢å¤åˆé“² +item.DamascusSteelMultipick.name=大马士é©é’¢å¤åˆé• +item.DamascusSteelMultispade.name=大马士é©é’¢å¤åˆé“² +item.MithrilMultispade.name=秘银å¤åˆé“² +item.CobaltBrassMultipick.name=钴黄铜å¤åˆé• +item.CobaltBrassMultispade.name=钴黄铜å¤åˆé“² +item.ThaumiumMultipick.name=神秘é”å¤åˆé• +item.ThaumiumMultispade.name=神秘é”å¤åˆé“² +item.HSSGMultipick.name=高速钢-Gå¤åˆé• +item.HSSGMultispade.name=高速钢-Gå¤åˆé“² +item.HSSEMultipick.name=高速钢-Eå¤åˆé• +item.HSSEMultispade.name=高速钢-Eå¤åˆé“² +item.HSSSMultipick.name=高速钢-Så¤åˆé• +item.HSSSMultispade.name=高速钢-Så¤åˆé“² +item.HastelloyC276Multipick.name=哈斯特洛ä¾åˆé‡‘-C276å¤åˆé• +item.HastelloyC276Multispade.name=哈斯特洛ä¾åˆé‡‘-C276å¤åˆé“² +item.HastelloyNMultipick.name=哈斯特洛ä¾åˆé‡‘-Nå¤åˆé• +item.HastelloyNMultispade.name=哈斯特洛ä¾åˆé‡‘-Nå¤åˆé“² +item.HastelloyWMultipick.name=哈斯特洛ä¾åˆé‡‘-Wå¤åˆé• +item.HastelloyWMultispade.name=哈斯特洛ä¾åˆé‡‘-Wå¤åˆé“² +item.HastelloyXMultipick.name=哈斯特洛ä¾åˆé‡‘-Xå¤åˆé• +item.HastelloyXMultispade.name=哈斯特洛ä¾åˆé‡‘-Xå¤åˆé“² +item.Incoloy020Multipick.name=è€çƒé“¬é“åˆé‡‘-020å¤åˆé• +item.Incoloy020Multispade.name=è€çƒé“¬é“åˆé‡‘-020å¤åˆé“² +item.IncoloyDSMultipick.name=è€çƒé“¬é“åˆé‡‘-DSå¤åˆé• +item.IncoloyDSMultispade.name=è€çƒé“¬é“åˆé‡‘-DSå¤åˆé“² +item.IncoloyMA956Multipick.name=è€çƒé“¬é“åˆé‡‘-MA956å¤åˆé• +item.IncoloyMA956Multispade.name=è€çƒé“¬é“åˆé‡‘-MA956å¤åˆé“² +item.Inconel625Multipick.name=é•é“¬åŸºåˆé‡‘-625å¤åˆé• +item.Inconel625Multispade.name=é•é“¬åŸºåˆé‡‘-625å¤åˆé“² +item.Inconel690Multipick.name=é•é“¬åŸºåˆé‡‘-690å¤åˆé• +item.Inconel690Multispade.name=é•é“¬åŸºåˆé‡‘-690å¤åˆé“² +item.Inconel792Multipick.name=é•é“¬åŸºåˆé‡‘-792å¤åˆé• +item.Inconel792Multispade.name=é•é“¬åŸºåˆé‡‘-792å¤åˆé“² +item.GrisiumMultipick.name=ç°é’›åˆé‡‘å¤åˆé• +item.GrisiumMultispade.name=ç°é’›åˆé‡‘å¤åˆé“² +item.Tantalloy60Multipick.name=钽钨åˆé‡‘-60å¤åˆé• +item.Tantalloy60Multispade.name=钽钨åˆé‡‘-60å¤åˆé“² +item.Tantalloy61Multipick.name=钽钨åˆé‡‘-61å¤åˆé• +item.Tantalloy61Multispade.name=钽钨åˆé‡‘-61å¤åˆé“² +item.StaballoyMultipick.name=è´«é“€åˆé‡‘å¤åˆé• +item.StaballoyMultispade.name=è´«é“€åˆé‡‘å¤åˆé“² +item.QuantumMultipick.name=é‡ååˆé‡‘å¤åˆé• +item.QuantumMultispade.name=é‡ååˆé‡‘å¤åˆé“² +item.PotinMultipick.name=ç²—é’é“œåˆé‡‘å¤åˆé• +item.PotinMultispade.name=ç²—é’é“œåˆé‡‘å¤åˆé“² +item.TumbagaMultipick.name=铜金åˆé‡‘å¤åˆé• +item.TumbagaMultispade.name=铜金åˆé‡‘å¤åˆé“² +item.TaloniteMultipick.name=铬钴磷酸ç›åˆé‡‘å¤åˆé• +item.TaloniteMultispade.name=铬钴磷酸ç›åˆé‡‘å¤åˆé“² +item.StelliteMultipick.name=铬钴锰钛åˆé‡‘å¤åˆé• +item.StelliteMultispade.name=铬钴锰钛åˆé‡‘å¤åˆé“² +item.TungstenCarbideMultipick.name=碳化钨å¤åˆé• +item.TungstenCarbideMultispade.name=碳化钨å¤åˆé“² +item.TantalumCarbideMultipick.name=碳化钽å¤åˆé• +item.TantalumCarbideMultispade.name=碳化钽å¤åˆé“² + + +//Items that Don't fit into another category + +//Plates +item.itemPlateClay.name=ç²˜åœŸæ¿ +item.itemPlateDoubleClay.name=åŒé‡ç²˜åœŸæ¿ +item.itemPlateLithium.name=é”‚æ¿ +item.itemPlateDoubleEuropium.name=åŒé‡é“•æ¿ + +//Gears +item.itemSmallGearWroughtIron.name=å°åž‹é”»é“齿轮 + +//Misc +item.itemFoilUranium235.name=é“€235ç®” + +item.itemBoilerChassis_0.name=高级锅炉外壳[1级] +item.itemDehydratorCoilWire_0.name=ç¼ ç»•å¯¼çº¿ [EV] +item.itemDehydratorCoil_0.name=脱水线圈 [EV] +item.itemAirFilter_0.name=空气过滤器 +item.itemAirFilter_1.name=空气过滤器 +item.itemLavaFilter.name=岩浆过滤器 +item.itemGrindleTablet.name=Git +item.itemDragonJar.name=é¾™æ•èŽ·ä¹‹å£¶ +item.CoalGas.name=煤气å•å…ƒ +item.Ethylbenzene.name=乙苯å•å…ƒ +item.Anthracene.name=è’½å•å…ƒ +item.Toluene.name=甲苯å•å…ƒ +item.CoalTar.name=煤焦油å•å…ƒ +item.CoalTarOil.name=煤焦油å•å…ƒ +item.SulfuricCoalTarOil.name=硫酸煤焦油å•å…ƒ +item.Naphthalene.name=è˜å•å…ƒ +item.PhthalicAcid.name=邻苯二甲酸å•å…ƒ +item.itemDustPhthalicAnhydride.name=邻苯二甲酸é…粉 +item.itemDustSmallPhthalicAnhydride.name=å°å †é‚»è‹¯äºŒç”²é…¸é…粉 +item.itemDustTinyPhthalicAnhydride.name=å°æ’®é‚»è‹¯äºŒç”²é…¸é…粉 +item.2Ethylanthraquinone.name=2-乙基蒽醌å•å…ƒ +item.2Ethylanthrahydroquinone.name=2-乙基氢蒽醌å•å…ƒ +item.HydrogenPeroxide.name=过氧化氢å•å…ƒ +item.itemDustLithiumHydroperoxide.name=过氧化氢锂粉 +item.itemDustSmallLithiumHydroperoxide.name=å°å †è¿‡æ°§åŒ–氢锂粉 +item.itemDustTinyLithiumHydroperoxide.name=å°æ’®è¿‡æ°§åŒ–氢锂粉 +item.LithiumPeroxide.name=过氧化锂å•å…ƒ +item.itemPotionChilly.name=冰凉è¯æ°´ +item.itemKeyBig4000DC's.name=4000DC的大钥匙 +item.itemGemDull.name=沉闷å®çŸ³ +item.itemMushroomForest.name=æ£®æž—è˜‘è‡ +item.itemPlateVanadium.name=é’’é’¢æ¿ +item.thekeytothecity.name=通往城市的钥匙 +item.modularbauble.name=模å—åŒ–é¥°å“ +item.itemDustSoularium.name=é‚金粉 +item.itemDustSmallSoularium.name=å°å †é‚金粉 +item.itemDustTinySoularium.name=å°æ’®é‚金粉 +item.itemDustRedstoneAlloy.name=红石åˆé‡‘粉 +item.itemDustSmallRedstoneAlloy.name=å°å †çº¢çŸ³åˆé‡‘粉 +item.itemDustTinyRedstoneAlloy.name=å°æ’®çº¢çŸ³åˆé‡‘粉 +item.itemDustElectricalSteel.name=ç£é’¢ç²‰ +item.itemDustSmallElectricalSteel.name=å°å †ç£é’¢ç²‰ +item.itemDustTinyElectricalSteel.name=å°æ’®ç£é’¢ç²‰ +item.itemDustPulsatingIron.name=脉冲é“粉 +item.itemDustSmallPulsatingIron.name=å°å †è„‰å†²é“粉 +item.itemDustTinyPulsatingIron.name=å°æ’®è„‰å†²é“粉 +item.itemDustEnergeticAlloy.name=充能åˆé‡‘粉 +item.itemDustSmallEnergeticAlloy.name=å°å †å……能åˆé‡‘粉 +item.itemDustTinyEnergeticAlloy.name=å°æ’®å……能åˆé‡‘粉 +item.itemDustVibrantAlloy.name=脉冲åˆé‡‘粉 +item.itemDustSmallVibrantAlloy.name=å°å †è„‰å†²åˆé‡‘粉 +item.itemDustTinyVibrantAlloy.name=å°æ’®è„‰å†²åˆé‡‘粉 +item.itemDustConductiveIron.name=导电é“粉 +item.itemDustSmallConductiveIron.name=å°å †å¯¼ç”µé“粉 +item.itemDustTinyConductiveIron.name=å°æ’®å¯¼ç”µé“粉 +item.itemPlateSoularium.name=é‚é‡‘æ¿ +item.itemPlateRedstoneAlloy.name=红石åˆé‡‘æ¿ +item.itemPlateElectricalSteel.name=ç£é’¢æ¿ +item.itemPlatePhasedIron.name=脉冲é“æ¿ +item.itemPlateEnergeticAlloy.name=充能åˆé‡‘æ¿ +item.itemPlateVibrantAlloy.name=脉冲åˆé‡‘æ¿ +item.itemPlateConductiveIron.name=导电é“æ¿ +item.itemPlateBlutonium.name=è“é’šæ¿ +item.itemPlateCyanite.name=è“æ™¶çŸ³æ¿ +item.itemPlateLudicrite.name=çº¯é•¥æ¿ +item.itemPlateVoid.name=è™šç©ºæ¿ +item.itemPlateDimensionShard.name=ç»´åº¦ç¢Žç‰‡æ¿ +item.rfEUBattery.name=é€šç”¨å……ç”µç”µæ± +item.personalCloakingDevice.name=§9§9个人éšå½¢è£…置§7 +item.personalHealingDevice.name=§9§9ä¸ªäººçº³ç±³æ²»ç–—åŠ é€Ÿå™¨Â§r +item.SlowBuildingRing.name=§e§e缓建指环§7 +item.itemStaballoyPickaxe.name=隧é“挖掘者 +item.itemStaballoyAxe.name=æ ‘æž—ç ä¼è€… +item.itemSandstoneHammer.name=圆石粉碎者 +item.itemBufferCore1.name=能é‡æ ¸å¿ƒ [ULV] +item.itemBufferCore2.name=能é‡æ ¸å¿ƒ [LV] +item.itemBufferCore3.name=能é‡æ ¸å¿ƒ [MV] +item.itemBufferCore4.name=能é‡æ ¸å¿ƒ [HV] +item.itemBufferCore5.name=能é‡æ ¸å¿ƒ [EV] +item.itemBufferCore6.name=能é‡æ ¸å¿ƒ [IV] +item.itemBufferCore7.name=能é‡æ ¸å¿ƒ [LuV] +item.itemBufferCore8.name=能é‡æ ¸å¿ƒ [ZPM] +item.itemBufferCore9.name=能é‡æ ¸å¿ƒ [UV] +item.itemBufferCore10.name=能é‡æ ¸å¿ƒ [MAX] +item.itemPLACEHOLDER_Circuit.name=夸克æ“纵者 (UV) +item.itembookgt.name=§o§oçƒåŠ›é”…炉手册 + +// Everglade Items +item.everglades.trigger.name=§6§6Alkalus圆盘[§c激活§6] + + + + + + + +//Blocks +tile.blockRainforestOakLog.name=雨林橡木 +tile.blockRainforestOakLeaves.name=æ©¡æ ‘æ ‘å¶ +tile.blockRainforestOakSapling.name=é›¨æž—æ©¡æ ‘æ ‘è‹— + +//TC Stuff +tile.blockFastAlchemyFurnace.0.name=æŸå +tile.blockFastArcaneAlembic.1.name=æŸå + +//Frame Boxes +tile.Block of Selenium.name=ç¡’å— +tile.Selenium Frame Box.name=硒框架 +tile.Block of Bromine.name=æº´å— +tile.Block of Strontium.name=é”¶å— +tile.Strontium Frame Box.name=锶框架 +tile.Block of Zirconium.name=é”†å— +tile.Zirconium Frame Box.name=锆框架 +tile.Block of Ruthenium.name=é’Œå— +tile.Ruthenium Frame Box.name=钌框架 +tile.Block of Iodine.name=ç¢˜å— +tile.Iodine Frame Box.name=碘框架 +tile.Block of Hafnium.name=é“ªå— +tile.Hafnium Frame Box.name=铪框架 +tile.Block of Dysprosium.name=é•å— +tile.Dysprosium Frame Box.name=é•æ¡†æž¶ +tile.Block of Tellurium.name=ç¢²å— +tile.Tellurium Frame Box.name=碲框架 +tile.Block of Rhodium.name=é“‘å— +tile.Rhodium Frame Box.name=铑框架 +tile.Block of Rhenium.name=é“¼å— +tile.Rhenium Frame Box.name=铼框架 +tile.Block of Thallium.name=é“Šå— +tile.Thallium Frame Box.name=铊框架 +tile.Block of Technetium.name=é”å— +tile.Block of Polonium.name=é’‹å— +tile.Block of Astatine.name=ç ¹å— +tile.Block of Francium.name=é’«å— +tile.Block of Radium.name=é•å— +tile.Block of Actinium.name=é”•å— +tile.Block of Protactinium.name=é•¤å— +tile.Block of Neptunium.name=é•Žå— +tile.Block of Curium.name=é””å— +tile.Block of Berkelium.name=é”«å— +tile.Block of Californium.name=é”Žå— +tile.Block of Einsteinium.name=é”¿å— +tile.Block of Fermium.name=é•„å— +tile.Block of Thorium 232.name=é’-232å— +tile.Block of Uranium 232.name=é“€-232å— +tile.Block of Uranium 233.name=é“€-233å— +tile.Block of Plutonium-238.name=é’š-238å— +tile.Block of Strontium-90.name=锶-90å— +tile.Block of Polonium-210.name=é’‹-210å— +tile.Block of Americium-241.name=é•…-241å— +tile.Block of Silicon Carbide.name=ç¢³åŒ–ç¡…å— +tile.Silicon Carbide Frame Box.name=碳化硅框架 +tile.Block of Zirconium Carbide.name=ç¢³åŒ–é”†å— +tile.Zirconium Carbide Frame Box.name=碳化锆框架 +tile.Block of Tantalum Carbide.name=ç¢³åŒ–é’½å— +tile.Tantalum Carbide Frame Box.name=碳化钽框架 +tile.Block of Niobium Carbide.name=ç¢³åŒ–é“Œå— +tile.Niobium Carbide Frame Box.name=碳化铌框架 +tile.Block of Beryllium Fluoride.name=氟化é“å— +tile.Block of Lithium Fluoride.name=æ°ŸåŒ–é”‚å— +tile.Block of Thorium Tetrafluoride.name=四氟化é’å— +tile.Block of Thorium Hexafluoride.name=å…氟化é’å— +tile.Block of Uranium Tetrafluoride.name=å››æ°ŸåŒ–é“€å— +tile.Block of Uranium Hexafluoride.name=å…æ°ŸåŒ–é“€å— +tile.Block of Zirconium Tetrafluoride.name=å››æ°ŸåŒ–é”†å— +tile.Block of Neptunium Hexafluoride.name=å…æ°ŸåŒ–é•Žå— +tile.Block of Technetium Hexafluoride.name=å…氟化é”å— +tile.Block of Selenium Hexafluoride.name=å…æ°ŸåŒ–ç¡’å— +tile.Block of LiFBeF2ZrF4U235.name=é“€235å¤åˆæ°ŸåŒ–ç‰©å— +tile.Block of LiFBeF2ZrF4UF4.name=铀锆å¤åˆæ°ŸåŒ–ç‰©å— +tile.Block of LiFBeF2ThF4UF4.name=é“€é’å¤åˆæ°ŸåŒ–ç‰©å— +tile.Block of Energy Crystal.name=能é‡æ°´æ™¶å— +tile.Energy Crystal Frame Box.name=能é‡æ°´æ™¶æ¡†æž¶ +tile.Block of Blood Steel.name=è¡€é’¢å— +tile.Blood Steel Frame Box.name=血钢框架 +tile.Block of Zeron-100.name=å¡žé¾™-100å— +tile.Zeron-100 Frame Box.name=å¡žé¾™-100框架 +tile.Block of Tumbaga.name=铜金åˆé‡‘å— +tile.Tumbaga Frame Box.name=铜金åˆé‡‘框架 +tile.Block of Potin.name=ç²—é’é“œåˆé‡‘å— +tile.Potin Frame Box.name=ç²—é’é“œåˆé‡‘框架 +tile.Block of Staballoy.name=è´«é“€åˆé‡‘å— +tile.Staballoy Frame Box.name=è´«é“€åˆé‡‘框架 +tile.Block of Tantalloy-60.name=钽钨åˆé‡‘-60å— +tile.Tantalloy-60 Frame Box.name=钽钨åˆé‡‘-60框架 +tile.Block of Tantalloy-61.name=钽钨åˆé‡‘-61å— +tile.Tantalloy-61 Frame Box.name=钽钨åˆé‡‘-61框架 +tile.Block of Inconel-625.name=é•é“¬åŸºåˆé‡‘-625å— +tile.Inconel-625 Frame Box.name=é•é“¬åŸºåˆé‡‘-625框架 +tile.Block of Inconel-690.name=é•é“¬åŸºåˆé‡‘-690å— +tile.Inconel-690 Frame Box.name=é•é“¬åŸºåˆé‡‘-690框架 +tile.Block of Inconel-792.name=é•é“¬åŸºåˆé‡‘-792å— +tile.Inconel-792 Frame Box.name=é•é“¬åŸºåˆé‡‘-792框架 +tile.Block of Eglin Steel.name=åŸƒæ ¼æž—é’¢å— +tile.Eglin Steel Frame Box.name=åŸƒæ ¼æž—é’¢æ¡†æž¶ +tile.Block of Maraging Steel 250.name=马æ°ä½“时效钢250å— +tile.Maraging Steel 250 Frame Box.name=马æ°ä½“时效钢250框架 +tile.Block of Maraging Steel 300.name=马æ°ä½“时效钢300å— +tile.Maraging Steel 300 Frame Box.name=马æ°ä½“时效钢300框架 +tile.Block of Maraging Steel 350.name=马æ°ä½“时效钢350å— +tile.Maraging Steel 350 Frame Box.name=马æ°ä½“时效钢350框架 +tile.Block of Stellite.name=铬钴锰钛åˆé‡‘å— +tile.Stellite Frame Box.name=铬钴锰钛åˆé‡‘框架 +tile.Block of Talonite.name=铬钴磷酸ç›åˆé‡‘å— +tile.Talonite Frame Box.name=铬钴磷酸ç›åˆé‡‘框架 +tile.Block of Hastelloy-W.name=哈斯特洛ä¾åˆé‡‘-Wå— +tile.Hastelloy-W Frame Box.name=哈斯特洛ä¾åˆé‡‘-W框架 +tile.Block of Hastelloy-X.name=哈斯特洛ä¾åˆé‡‘-Xå— +tile.Hastelloy-X Frame Box.name=哈斯特洛ä¾åˆé‡‘-X框架 +tile.Block of Hastelloy-C276.name=哈斯特洛ä¾åˆé‡‘-C276å— +tile.Hastelloy-C276 Frame Box.name=哈斯特洛ä¾åˆé‡‘-C276框架 +tile.Block of Hastelloy-N.name=哈斯特洛ä¾åˆé‡‘-Nå— +tile.Hastelloy-N Frame Box.name=哈斯特洛ä¾åˆé‡‘-N框架 +tile.Block of Incoloy-020.name=è€çƒé“¬é“åˆé‡‘-020å— +tile.Incoloy-020 Frame Box.name=è€çƒé“¬é“åˆé‡‘-020框架 +tile.Block of Incoloy-DS.name=è€çƒé“¬é“åˆé‡‘-DSå— +tile.Incoloy-DS Frame Box.name=è€çƒé“¬é“åˆé‡‘-DS框架 +tile.Block of Incoloy-MA956.name=è€çƒé“¬é“åˆé‡‘-MA956å— +tile.Incoloy-MA956 Frame Box.name=è€çƒé“¬é“åˆé‡‘-MA956框架 +tile.Block of Grisium.name=ç°é’›åˆé‡‘å— +tile.Grisium Frame Box.name=ç°é’›åˆé‡‘框架 +tile.Block of Trinium.name=ä¸‰å…ƒé‡‘å±žå— +tile.Block of Refined Trinium.name=ç²¾åˆ¶ä¸‰å…ƒé‡‘å±žå— +tile.Block of Trinium Titanium Alloy.name=三元钛åˆé‡‘å— +tile.Trinium Titanium Alloy Frame Box.name=三元钛åˆé‡‘框架 +tile.Block of Trinium Naquadah Alloy.name=三元硅岩åˆé‡‘å— +tile.Block of Trinium Naquadah Carbonite.name=碳化三元硅岩åˆé‡‘å— +tile.Trinium Naquadah Carbonite Frame Box.name=碳化三元硅岩åˆé‡‘框架 +tile.Block of Quantum.name=é‡ååˆé‡‘å— +tile.Quantum Frame Box.name=é‡ååˆé‡‘框架 + +//Ores +tile.OreFluorite.name=氟石矿石 +tile.OreCrocoite.name=赤铅矿矿石 +tile.OreGeikielite.name=é•é’›çŸ¿çŸ¿çŸ³ +tile.OreNichromite.name=é•é“¬çŸ¿çŸ¿çŸ³ +tile.OreTitanite.name=æ¦çŸ³çŸ¿çŸ³ +tile.OreZimbabweite.name=é’›é“Œé“…é’ çŸ³çŸ¿çŸ³ +tile.OreZirconolite.name=钛锆é’矿矿石 +tile.OreGadoliniteCe.name=ç¡…é“钇矿(Ce)矿石 +tile.OreGadoliniteY.name=ç¡…é“钇矿(Y)矿石 +tile.OreLepersonnite.name=绿泥石矿石 +tile.OreSamarskiteY.name=铌钇矿(Y)矿石 +tile.OreSamarskiteYb.name=铌钇矿(Yb)矿石 +tile.OreXenotime.name=磷钇矿矿石 +tile.OreYttriaite.name=钇矿矿石 +tile.OreYttrialite.name=ç¡…é’钇矿矿石 +tile.OreYttrocerite.name=铈钇矿矿石 +tile.OreZircon.name=锆石矿石 +tile.OrePolycrase.name=锗铀钇矿矿石 +tile.OreZircophyllite.name=锆星å¶çŸ³çŸ¿çŸ³ +tile.OreZirkelite.name=锆英石矿石 +tile.OreLanthaniteLa.name=镧石(La)矿石 +tile.OreLanthaniteCe.name=镧石(Ce)矿石 +tile.OreLanthaniteNd.name=镧石(Nd)矿石 +tile.OreAgarditeY.name=è±é“矿(Y)矿石 +tile.OreAgarditeCd.name=è±é“矿(Cd)矿石 +tile.OreAgarditeLa.name=è±é“矿(La)矿石 +tile.OreAgarditeNd.name=è±é“矿(Nd)矿石 +tile.OreHibonite.name=黑é“钙石矿石 +tile.OreCerite.name=铈硅石矿石 +tile.OreFluorcaphite.name=氟碳铈矿矿石 +tile.OreFlorencite.name=磷é“铈矿矿石 +tile.OreCryolite.name=冰晶石矿石 + +//Misc +tile.blockMFEffect.name=特殊 +tile.fluidBlockSludge.name=污泥 +tile.blockWorkbenchGT.name=å·¥ä½œå° +tile.blockWorkbenchGTAdvanced.name=é«˜çº§å·¥ä½œå° +tile.blockHeliumGenerator.name=æ°¦å‘生器 +tile.blockFirePit.name=ç«å‘ +tile.blockFishTrap.name=æ•é±¼è€… +tile.blockInfiniteFluidTank.name=æ— é™æµä½“å‚¨ç½ +tile.blockMiningExplosives.name=çŸ¿ç”¨ç‚¸è¯ +tile.blockHellFire.name=åœ°ç‹±ä¹‹ç« +tile.blockProjectBench.name=å·¥ç¨‹å° +tile.blockTradeBench.name=è´¸æ˜“å° +tile.blockModularity.name=模å—åŒ–å·¥ä½œå° +tile.blockBlackGate.name=凋零笼å +tile.blockTankXpConverter.name=ç»éªŒè½¬æ¢å™¨ + +//Everglades Blocks +tile.fluidSludge.0.name=ä¸æµåŠ¨çš„废水 +tile.blockDarkWorldPortal.name=未æ¥çš„æŽ å½± +tile.blockDarkWorldGround.name=ä¸ç¨³å®šçš„土壤 +tile.blockDarkWorldGround2.name=污染的土壤 +tile.blockDarkWorldGround2.2.name=高度污染的土壤 +tile.blockDarkWorldPortalFrame.name=é制框架 + + +//Added 1/4/18 +tile.Block of Plutonium-239.name=é’š-239å— +tile.Fluorite Ore [Old].name=氟石矿[ä¸å¯ç”¨çš„] +tile.blockMiningPipeFake.name=强化钢ç‹æŒ–æŽ˜ç®¡é“ +tile.blockMiningHeadFake.name=基岩钻头 +item.itemCellLiFBeF2ThF4UF4.name=熔ç›å•å…ƒ[é“€é’å¤åˆæ°ŸåŒ–物] +item.itemCellLiFBeF2ZrF4UF4.name=熔ç›å•å…ƒ[铀锆å¤åˆæ°ŸåŒ–物] +item.itemCellLiFBeF2ZrF4U235.name=熔ç›å•å…ƒ[é“€235å¤åˆæ°ŸåŒ–物] +item.itemPlateMeatRaw.name=ç”Ÿè‚‰æ¿ +tile.Block of MeatRaw.name=ç”Ÿè‚‰å— + +//Added 26/5/18 +item.BurntLiFBeF2ThF4UF4.name=枯ç«ç†”ç›å•å…ƒ[é“€é’å¤åˆæ°ŸåŒ–物] +item.BurntLiFBeF2ZrF4UF4.name=枯ç«ç†”ç›å•å…ƒ[铀锆å¤åˆæ°ŸåŒ–物] +item.BurntLiFBeF2ZrF4U235.name=枯ç«ç†”ç›å•å…ƒ[é“€235å¤åˆæ°ŸåŒ–物] +item.itemBigEgg.name= 盎å¸çš„大鸡蛋 +item.itemPlateSodium.name=é’ æ¿ + +item.itemNuggetPromethium.name=é’·ç²’ +item.itemIngotPromethium.name=é’·é” +item.itemDustSmallPromethium.name=å°å †é’·ç²‰ +item.itemDustTinyPromethium.name=å°æ’®é’·ç²‰ +item.itemDustPromethium.name=钷粉 +tile.Block of Promethium.name=é’·å— + +item.itemCellAmericium241.name=é•…-241å•å…ƒ +item.itemCellPolonium210.name=é’‹-210å•å…ƒ +item.itemCellStrontium90.name=锶-90å•å…ƒ +item.itemCellPlutonium238.name=é’š-238å•å…ƒ + +entity.MiningCharge.name=采矿费用 +entity.throwablePotionSulfuric.name=硫酸烧瓶 +entity.throwablePotionHydrofluoric.name=氢氟酸烧瓶 +entity.toxinBall.name=æ¯’ç´ å°çƒ +entity.plasmaBolt.name=ç‰ç¦»å体 +entity.bigChickenFriendly.name=巨大的鸡 + +//Added 26/6/18 +tile.OreTrinium.name=三元金属矿石 +item.crushedTrinium.name=粉碎三元金属矿石 +item.crushedCentrifugedTrinium.name=离心三元金属矿石 +item.crushedPurifiedTrinium.name=洗净的三元金属矿石 +item.dustImpureTrinium.name=å«æ‚三元金属粉 +item.dustPureTrinium.name=洗净的三元金属粉 + +//Added 1/7/18 +entity.WiseVillager.name=èªæ˜Žçš„æ‘æ°‘ +tile.blockMobSpawnerEx.0.name=刷怪笼 +tile.blockMobSpawnerEx.1.name=刷怪笼 +tile.blockMobSpawnerEx.2.name=刷怪笼 +tile.blockMobSpawnerEx.3.name=刷怪笼 +tile.blockMobSpawnerEx.4.name=刷怪笼 +tile.blockMobSpawnerEx.5.name=刷怪笼 +tile.blockMobSpawnerEx.6.name=刷怪笼 +tile.blockMobSpawnerEx.7.name=刷怪笼 +tile.blockMobSpawnerEx.8.name=刷怪笼 +tile.blockMobSpawnerEx.9.name=刷怪笼 +tile.blockMobSpawnerEx.10.name=刷怪笼 +tile.blockMobSpawnerEx.11.name=刷怪笼 +tile.blockMobSpawnerEx.12.name=刷怪笼 +tile.blockMobSpawnerEx.13.name=刷怪笼 +tile.blockMobSpawnerEx.14.name=刷怪笼 +tile.blockMobSpawnerEx.15.name=刷怪笼 +description.villager.profession.miscutils.banker=银行家 +description.villager.profession.miscutils.technician=GT技术员 +description.villager.profession.miscutils.trader=矿石交易员 +description.villager.profession.miscutils.aboriginal=澳大利亚土著 + +//Added 23/8/18 +item.itemHatTinFoil.name=锡薄帽 + +//Added 13/9/18 +entity.WiseVillager.name=èªæ˜Žçš„æ‘æ°‘ +entity.Aboriginal.name=澳大利亚土著 +entity.miscutils.constructStaballoy.name=è´«é“€åˆé‡‘结构 +entity.miscutils.sickBlaze.name=被感染的狂çƒè€… + +//Added 15/9/18 +item.ZirconiumTetrafluoride.name=四氟化锆å•å…ƒ +item.Formaldehyde.name=甲醛å•å…ƒ +item.RocketFuelMixA.name=H8N4C2O4ç«ç®ç‡ƒæ–™å•å…ƒ +item.RocketFuelMixB.name=RP-1ç«ç®ç‡ƒæ–™å•å…ƒ +item.RocketFuelMixC.name=CN3H7O3ç«ç®ç‡ƒæ–™å•å…ƒ +item.RocketFuelMixD.name=密集肼ç«ç®ç‡ƒæ–™å•å…ƒ +item.RP1Fuel.name=RP-1燃料å•å…ƒ +item.Monomethylhydrazine.name=甲基肼å•å…ƒ +item.Hydrazine.name=肼å•å…ƒ +item.NitrogenTetroxide.name=四氧化二氮å•å…ƒ +item.NitrousOxide.name=一氧化二氮å•å…ƒ +item.AmmoniumNitrateSlurry.name=ç¡é…¸é“µæµ†æ¶²å•å…ƒ +item.Kerosene.name=煤油å•å…ƒ +item.LiquidOxygen.name=液化氧å•å…ƒ[LOX] + +//Added 8/1/19 + +//Ores + +tile.OreIrarsite.name=ç¡«ç ·é“±çŸ¿çŸ³ +item.crushedIrarsite.name=ç²‰ç¢Žç¡«ç ·é“±çŸ¿çŸ³ +item.crushedCentrifugedIrarsite.name=ç¦»å¿ƒç²‰ç¢Žç¡«ç ·é“±çŸ¿çŸ³ +item.crushedPurifiedIrarsite.name=çº¯å‡€ç²‰ç¢Žç¡«ç ·é“±çŸ¿çŸ³ +item.dustImpureIrarsite.name=å«æ‚ç¡«ç ·é“±ç²‰ +item.dustPureIrarsite.name=çº¯å‡€ç¡«ç ·é“±ç²‰ +item.itemDustIrarsite.name=ç¡«ç ·é“±ç²‰ +item.itemDustTinyIrarsite.name=å°æ’®ç¡«ç ·é“±ç²‰ +item.itemDustSmallIrarsite.name=å°å †ç¡«ç ·é“±ç²‰ + +tile.OreMiessiite.name=ç¡…ç°çŸ³çŸ¿çŸ³ +item.crushedMiessiite.name=粉碎硅ç°çŸ³çŸ¿çŸ³ +item.crushedCentrifugedMiessiite.name=离心粉碎硅ç°çŸ³çŸ¿çŸ³ +item.crushedPurifiedMiessiite.name=纯净硅ç°çŸ³çŸ¿çŸ³ +item.dustImpureMiessiite.name=å«æ‚ç¡…ç°çŸ³ç²‰ +item.dustPureMiessiite.name=纯净硅ç°çŸ³ç²‰ +item.itemDustMiessiite.name=ç¡…ç°çŸ³ç²‰ +item.itemDustTinyMiessiite.name=å°æ’®ç¡…ç°çŸ³ç²‰ +item.itemDustSmallMiessiite.name=å°å †ç¡…ç°çŸ³ç²‰ + +tile.OreComancheite.name=溴汞石矿石 +item.crushedComancheite.name=粉碎溴汞石矿石 +item.crushedCentrifugedComancheite.name=离心粉碎溴汞石矿石 +item.crushedPurifiedComancheite.name=纯净粉碎溴汞石矿石 +item.dustImpureComancheite.name=å«æ‚溴汞石矿石 +item.dustPureComancheite.name=纯净溴汞石粉 +item.itemDustComancheite.name=溴汞石粉 +item.itemDustTinyComancheite.name=å°æ’®æº´æ±žçŸ³ç²‰ +item.itemDustSmallComancheite.name=å°å †æº´æ±žçŸ³ç²‰ + +tile.OreKoboldite.name=妖金矿石 +item.crushedKoboldite.name=粉碎妖金矿石 +item.crushedCentrifugedKoboldite.name=离心粉碎妖金矿石 +item.crushedPurifiedKoboldite.name=纯净粉碎妖金矿石 +item.dustImpureKoboldite.name=å«æ‚妖金粉 +item.dustPureKoboldite.name=纯净妖金粉 +item.itemDustKoboldite.name=妖金粉 +item.itemDustTinyKoboldite.name=å°æ’®å¦–金粉 +item.itemDustSmallKoboldite.name=å°å †å¦–金粉 + +tile.OrePerroudite.name=溴硫银汞矿石 +item.crushedPerroudite.name=粉碎溴硫银汞矿石 +item.crushedCentrifugedPerroudite.name=离心溴硫银汞矿石 +item.crushedPurifiedPerroudite.name=纯净溴硫银汞矿石 +item.dustImpurePerroudite.name=å«æ‚溴硫银汞粉 +item.dustPurePerroudite.name=纯净溴硫银汞粉 +item.itemDustPerroudite.name=溴硫银汞粉 +item.itemDustTinyPerroudite.name=å°æ’®æº´ç¡«é“¶æ±žç²‰ +item.itemDustSmallPerroudite.name=å°å †æº´ç¡«é“¶æ±žç²‰ + +tile.OreDemicheleite.name=é‡é—ªçŸ³çŸ¿çŸ³ +item.crushedDemicheleite.name=粉碎é‡é—ªçŸ³çŸ¿çŸ³ +item.crushedCentrifugedDemicheleite.name=离心粉碎é‡é—ªçŸ³çŸ¿çŸ³ +item.crushedPurifiedDemicheleite.name=纯净粉碎é‡é—ªçŸ³çŸ¿çŸ³ +item.dustImpureDemicheleite.name=å«æ‚é‡é—ªçŸ³ç²‰ +item.dustPureDemicheleite.name=纯净é‡é—ªçŸ³ç²‰ +item.itemDustDemicheleite.name=é‡é—ªçŸ³ç²‰ +item.itemDustTinyDemicheleite.name=å°æ’®é‡é—ªçŸ³ç²‰ +item.itemDustSmallDemicheleite.name=å°å †é‡é—ªçŸ³ç²‰ + +tile.OreAlburnite.name=é“尖晶石矿石 +item.crushedAlburnite.name=粉碎é“尖晶石矿石 +item.crushedCentrifugedAlburnite.name=离心粉碎é“尖晶石矿石 +item.crushedPurifiedAlburnite.name=纯净粉碎é“尖晶石矿石 +item.dustImpureAlburnite.name=å«æ‚é“尖晶石粉 +item.dustPureAlburnite.name=纯净é“尖晶石粉 +item.itemDustAlburnite.name=é“尖晶石粉 +item.itemDustTinyAlburnite.name=å°æ’®é“尖晶石粉 +item.itemDustSmallAlburnite.name=å°å †é“尖晶石粉 + +tile.OreLautarite.name=碘钙石矿石 +item.crushedLautarite.name=粉碎碘钙石矿石 +item.crushedCentrifugedLautarite.name=离心粉碎碘钙石矿石 +item.crushedPurifiedLautarite.name=纯净粉碎碘钙石矿石 +item.dustImpureLautarite.name=å«æ‚碘钙石粉 +item.dustPureLautarite.name=纯净碘钙石粉 +item.itemDustLautarite.name=碘钙石粉 +item.itemDustTinyLautarite.name=å°æ’®ç¢˜é’™çŸ³ç²‰ +item.itemDustSmallLautarite.name=å°å †ç¢˜é’™çŸ³ç²‰ + +tile.OreBariteRd.name=é‡æ™¶çŸ³(Rd)矿石 +item.crushedBariteRd.name=粉碎é‡æ™¶çŸ³(Rd)矿石 +item.crushedCentrifugedBariteRd.name=离心粉碎 é‡æ™¶çŸ³(Rd)矿石 +item.crushedPurifiedBariteRd.name=纯净粉碎é‡æ™¶çŸ³(Rd)矿石 +item.dustImpureBariteRd.name=å«æ‚ é‡æ™¶çŸ³(Rd)粉 +item.dustPureBariteRd.name=纯净 é‡æ™¶çŸ³(Rd)粉 +item.itemDustBariteRd.name=é‡æ™¶çŸ³(Rd)粉 +item.itemDustTinyBariteRd.name=å°æ’®é‡æ™¶çŸ³(Rd)粉 +item.itemDustSmallBariteRd.name=å°å †é‡æ™¶çŸ³(Rd)粉 + +tile.OreHoneaite.name=碲化金铊矿石 +item.crushedHoneaite.name=粉碎碲化金铊矿石 +item.crushedCentrifugedHoneaite.name=离心粉碎碲化金铊矿石 +item.crushedPurifiedHoneaite.name=纯净粉碎碲化金铊矿石 +item.dustImpureHoneaite.name=å«æ‚碲化金铊粉 +item.dustPureHoneaite.name=纯净碲化金铊粉 +item.itemDustHoneaite.name=碲化金铊粉 +item.itemDustTinyHoneaite.name=å°æ’®ç¢²åŒ–金铊粉 +item.itemDustSmallHoneaite.name=å°å †ç¢²åŒ–金铊粉 + +tile.OreLafossaite.name=é“Šç›çŸ¿çŸ³ +item.crushedLafossaite.name=粉碎铊ç›çŸ¿çŸ³ +item.crushedCentrifugedLafossaite.name=离心粉碎铊ç›çŸ¿çŸ³ +item.crushedPurifiedLafossaite.name=纯净粉碎铊ç›çŸ¿çŸ³ +item.dustImpureLafossaite.name=å«æ‚é“Šç›ç²‰ +item.dustPureLafossaite.name=纯净铊ç›ç²‰ +item.itemDustLafossaite.name=é“Šç›ç²‰ +item.itemDustTinyLafossaite.name=å°æ’®é“Šç›ç²‰ +item.itemDustSmallLafossaite.name=å°å †é“Šç›ç²‰ + +tile.OreKashinite.name=硫铑钛铜矿石 +item.crushedKashinite.name=粉碎硫铑钛铜矿石 +item.crushedCentrifugedKashinite.name=离心粉碎硫铑钛铜矿石 +item.crushedPurifiedKashinite.name=纯净粉碎硫铑钛铜矿石 +item.dustImpureKashinite.name=å«æ‚硫铑钛铜粉 +item.dustPureKashinite.name=纯净硫铑钛铜粉 +item.itemDustKashinite.name=硫铑钛铜粉 +item.itemDustTinyKashinite.name=å°æ’®ç¡«é“‘钛铜粉 +item.itemDustSmallKashinite.name=å°å †ç¡«é“‘钛铜粉 + +tile.OreRadioactiveMineralMix.name=奇异矿石 +item.crushedRadioactiveMineralMix.name=粉碎奇异矿石 +item.crushedCentrifugedRadioactiveMineralMix.name=离心粉碎奇异矿石 +item.crushedPurifiedRadioactiveMineralMix.name=纯净粉碎奇异矿石 +item.dustImpureRadioactiveMineralMix.name=å«æ‚奇异粉 +item.dustPureRadioactiveMineralMix.name=纯净奇异粉 +item.itemDustRadioactiveMineralMix.name=奇异粉 +item.itemDustTinyRadioactiveMineralMix.name=å°æ’®å¥‡å¼‚粉 +item.itemDustSmallRadioactiveMineralMix.name=å°å †å¥‡å¼‚粉 + +tile.OreDemicheleiteBr.name=é‡é—ªçŸ³(Br)矿石 +item.crushedDemicheleiteBr.name=粉碎é‡é—ªçŸ³(Br)矿石 +item.crushedCentrifugedDemicheleiteBr.name=离心粉碎é‡é—ªçŸ³(Br)矿石 +item.crushedPurifiedDemicheleiteBr.name=纯净粉碎é‡é—ªçŸ³(Br)矿石 +item.dustImpureDemicheleiteBr.name=å«æ‚é‡é—ªçŸ³(Br)粉 +item.dustPureDemicheleiteBr.name=纯净é‡é—ªçŸ³(Br)粉 +item.itemDustDemicheleiteBr.name=é‡é—ªçŸ³(Br)粉 + + +//Materials + +item.itemIngotTitansteel.name=æ³°å¦ç²¾é’¢ +item.itemHotIngotTitansteel.name=çƒæ³°å¦ç²¾é’¢ +item.itemDustTitansteel.name=æ³°å¦ç²¾é’¢ç²‰ +item.itemDustTinyTitansteel.name=å°æ’®æ³°å¦ç²¾é’¢ç²‰ +item.itemDustSmallTitansteel.name=å°å †æ³°å¦ç²¾é’¢ç²‰ +item.itemNuggetTitansteel.name=æ³°å¦ç²¾é’¢ç²’ +item.itemPlateTitansteel.name=æ³°å¦ç²¾é’¢æ¿ +item.itemPlateDoubleTitansteel.name=åŒé‡æ³°å¦ç²¾é’¢æ¿ +item.itemBoltTitansteel.name=æ³°å¦ç²¾é’¢èžºæ “ +item.itemRodTitansteel.name=æ³°å¦ç²¾é’¢æ† +item.itemRodLongTitansteel.name=é•¿æ³°å¦ç²¾é’¢æ† +item.itemRingTitansteel.name=æ³°å¦ç²¾é’¢çŽ¯ +item.itemScrewTitansteel.name=æ³°å¦ç²¾é’¢èžºä¸ +item.itemRotorTitansteel.name=æ³°å¦ç²¾é’¢è½¬å +item.itemGearTitansteel.name=æ³°å¦ç²¾é’¢é½¿è½® +item.itemCellTitansteel.name=æ³°å¦ç²¾é’¢å•å…ƒ +tile.Block of Titansteel.name=æ³°å¦ç²¾é’¢å— +tile.Titansteel Frame Box.name=æ³°å¦ç²¾é’¢æ¡†æž¶ + +item.itemIngotOctiron.name=八角é“é” +item.itemHotIngotOctiron.name=çƒå…«è§’é“é” +item.itemDustOctiron.name=八角é“粉 +item.itemDustTinyOctiron.name=å°æ’®å…«è§’é“粉 +item.itemDustSmallOctiron.name=å°å †å…«è§’é“粉 +item.itemNuggetOctiron.name=八角é“ç²’ +item.itemPlateOctiron.name=八角é“æ¿ +item.itemPlateDoubleOctiron.name=åŒé‡å…«è§’é“æ¿ +item.itemBoltOctiron.name=八角é“èžºæ “ +item.itemRodOctiron.name=八角é“æ† +item.itemRodLongOctiron.name=长八角é“æ† +item.itemRingOctiron.name=八角é“环 +item.itemScrewOctiron.name=八角é“èžºä¸ +item.itemRotorOctiron.name=八角é“转å +item.itemGearOctiron.name=八角é“齿轮 +item.itemCellOctiron.name=八角é“å•å…ƒ +tile.Block of Octiron.name=八角é“å— +tile.Octiron Frame Box.name=八角é“框架 + +item.itemIngotWatertightSteel.name=é˜²æ°´é’¢é” +item.itemHotIngotWatertightSteel.name=çƒé˜²æ°´é’¢é” +item.itemDustWatertightSteel.name=防水钢粉 +item.itemDustTinyWatertightSteel.name=å°æ’®é˜²æ°´é’¢ç²‰ +item.itemDustSmallWatertightSteel.name=å°å †é˜²æ°´é’¢ç²‰ +item.itemNuggetWatertightSteel.name=防水钢粒 +item.itemPlateWatertightSteel.name=é˜²æ°´é’¢æ¿ +item.itemPlateDoubleWatertightSteel.name=åŒé‡é˜²æ°´é’¢æ¿ +item.itemBoltWatertightSteel.name=é˜²æ°´é’¢èžºæ “ +item.itemRodWatertightSteel.name=é˜²æ°´é’¢æ† +item.itemRodLongWatertightSteel.name=é•¿é˜²æ°´é’¢æ† +item.itemRingWatertightSteel.name=防水钢环 +item.itemScrewWatertightSteel.name=é˜²æ°´é’¢èžºä¸ +item.itemRotorWatertightSteel.name=防水钢转å +item.itemGearWatertightSteel.name=防水钢齿轮 +item.itemCellWatertightSteel.name=防水钢å•å…ƒ +tile.Block of Watertight Steel.name=é˜²æ°´é’¢å— +tile.Watertight Steel Frame Box.name=防水钢框架 + +item.itemIngotCelestialTungsten.name=å¤©ä½“é’¨é” +item.itemHotIngotCelestialTungsten.name=çƒå¤©ä½“é’¨é” +item.itemDustCelestialTungsten.name=天体钨粉 +item.itemDustTinyCelestialTungsten.name=å°æ’®å¤©ä½“钨粉 +item.itemDustSmallCelestialTungsten.name=å°å †å¤©ä½“钨粉 +item.itemNuggetCelestialTungsten.name=天体钨粒 +item.itemPlateCelestialTungsten.name=å¤©ä½“é’¨æ¿ +item.itemPlateDoubleCelestialTungsten.name=åŒé‡å¤©ä½“é’¨æ¿ +item.itemBoltCelestialTungsten.name=å¤©ä½“é’¨èžºæ “ +item.itemRodCelestialTungsten.name=å¤©ä½“é’¨æ† +item.itemRodLongCelestialTungsten.name=é•¿å¤©ä½“é’¨æ† +item.itemRingCelestialTungsten.name=天体钨环 +item.itemScrewCelestialTungsten.name=å¤©ä½“é’¨èžºä¸ +item.itemRotorCelestialTungsten.name=天体钨转å +item.itemGearCelestialTungsten.name=天体钨齿轮 +item.itemCellCelestialTungsten.name=天体钨å•å…ƒ +tile.Block of Celestial Tungsten.name=å¤©ä½“é’¨å— +tile.Celestial Tungsten Frame Box.name=天体钨框架 + +item.itemIngotHypogen.name=æµ·ç€çé” +item.itemHotIngotHypogen.name=çƒæµ·ç€çé” +item.itemDustHypogen.name=æµ·ç€ç粉 +item.itemDustTinyHypogen.name=å°æ’®æµ·ç€ç粉 +item.itemDustSmallHypogen.name=å°å †æµ·ç€ç粉 +item.itemNuggetHypogen.name=æµ·ç€çç²’ +item.itemPlateHypogen.name=æµ·ç€çæ¿ +item.itemPlateDoubleHypogen.name=åŒé‡æµ·ç€çæ¿ +item.itemBoltHypogen.name=æµ·ç€çèžºæ “ +item.itemRodHypogen.name=æµ·ç€çæ† +item.itemRodLongHypogen.name=é•¿æµ·ç€çæ† +item.itemRingHypogen.name=æµ·ç€ç环 +item.itemScrewHypogen.name=æµ·ç€çèžºä¸ +item.itemRotorHypogen.name=æµ·ç€ç转å +item.itemGearHypogen.name=æµ·ç€ç齿轮 +item.itemCellHypogen.name=æµ·ç€çå•å…ƒ +tile.Block of Hypogen.name=æµ·ç€çå— +tile.Hypogen Frame Box.name=æµ·ç€ç框架 + +item.itemIngotArceusAlloy2B.name=阿塞俄斯åˆé‡‘2Bé” +item.itemHotIngotArceusAlloy2B.name=çƒé˜¿å¡žä¿„æ–¯åˆé‡‘2Bé” +item.itemDustArceusAlloy2B.name=阿塞俄斯åˆé‡‘2B粉 +item.itemDustTinyArceusAlloy2B.name=å°æ’®é˜¿å¡žä¿„æ–¯åˆé‡‘2B粉 +item.itemDustSmallArceusAlloy2B.name=å°å †é˜¿å¡žä¿„æ–¯åˆé‡‘2B粉 +item.itemNuggetArceusAlloy2B.name=阿塞俄斯åˆé‡‘2Bç²’ +item.itemPlateArceusAlloy2B.name=阿塞俄斯åˆé‡‘2Bæ¿ +item.itemPlateDoubleArceusAlloy2B.name=åŒé‡é˜¿å¡žä¿„æ–¯åˆé‡‘2Bæ¿ +item.itemBoltArceusAlloy2B.name=阿塞俄斯åˆé‡‘2Bèžºæ “ +item.itemRodArceusAlloy2B.name=阿塞俄斯åˆé‡‘2Bæ† +item.itemRodLongArceusAlloy2B.name=长阿塞俄斯åˆé‡‘2Bæ† +item.itemRingArceusAlloy2B.name=阿塞俄斯åˆé‡‘2B环 +item.itemScrewArceusAlloy2B.name=阿塞俄斯åˆé‡‘2Bèžºä¸ +item.itemRotorArceusAlloy2B.name=阿塞俄斯åˆé‡‘2B转å +item.itemGearArceusAlloy2B.name=阿塞俄斯åˆé‡‘2B齿轮 +item.itemCellArceusAlloy2B.name=阿塞俄斯åˆé‡‘2Bå•å…ƒ +tile.Block of Arceus Alloy 2B.name=阿塞俄斯åˆé‡‘2Bå— +tile.Arceus Alloy 2B Frame Box.name=阿塞俄斯åˆé‡‘2B框架 + +item.itemIngotChromaticGlass.name=å½©è‰²çŽ»ç’ƒé” +item.itemHotIngotChromaticGlass.name=çƒå½©è‰²çŽ»ç’ƒé” +item.itemDustChromaticGlass.name=彩色玻璃粉 +item.itemDustTinyChromaticGlass.name=å°æ’®å½©è‰²çŽ»ç’ƒç²‰ +item.itemDustSmallChromaticGlass.name=å°å †å½©è‰²çŽ»ç’ƒç²‰ +item.itemNuggetChromaticGlass.name=彩色玻璃粒 +item.itemPlateChromaticGlass.name=å½©è‰²çŽ»ç’ƒæ¿ +item.itemPlateDoubleChromaticGlass.name=åŒé‡å½©è‰²çŽ»ç’ƒæ¿ +item.itemBoltChromaticGlass.name=å½©è‰²çŽ»ç’ƒèžºæ “ +item.itemRodChromaticGlass.name=å½©è‰²çŽ»ç’ƒæ† +item.itemRodLongChromaticGlass.name=é•¿å½©è‰²çŽ»ç’ƒæ† +item.itemRingChromaticGlass.name=彩色玻璃环 +item.itemScrewChromaticGlass.name=å½©è‰²çŽ»ç’ƒèžºä¸ +item.itemRotorChromaticGlass.name=彩色玻璃转å +item.itemGearChromaticGlass.name=彩色玻璃齿轮 +item.itemCellChromaticGlass.name=彩色玻璃å•å…ƒ +tile.Block of Chromatic Glass.name=å½©è‰²çŽ»ç’ƒå— +tile.Chromatic Glass Frame Box.name=彩色玻璃框架 + +item.itemIngotAstralTitanium.name=æ˜Ÿä½“é’›é” +item.itemHotIngotAstralTitanium.name=çƒæ˜Ÿä½“é’›é” +item.itemDustAstralTitanium.name=星体钛粉 +item.itemDustTinyAstralTitanium.name=å°æ’®æ˜Ÿä½“钛粉 +item.itemDustSmallAstralTitanium.name=å°å †æ˜Ÿä½“钛粉 +item.itemNuggetAstralTitanium.name=星体钛粒 +item.itemPlateAstralTitanium.name=æ˜Ÿä½“é’›æ¿ +item.itemPlateDoubleAstralTitanium.name=åŒé‡æ˜Ÿä½“é’›æ¿ +item.itemBoltAstralTitanium.name=æ˜Ÿä½“é’›èžºæ “ +item.itemRodAstralTitanium.name=æ˜Ÿä½“é’›æ† +item.itemRodLongAstralTitanium.name=é•¿æ˜Ÿä½“é’›æ† +item.itemRingAstralTitanium.name=星体钛环 +item.itemScrewAstralTitanium.name=æ˜Ÿä½“é’›èžºä¸ +item.itemRotorAstralTitanium.name=星体钛转å +item.itemGearAstralTitanium.name=星体钛齿轮 +item.itemCellAstralTitanium.name=星体钛å•å…ƒ +tile.Block of Astral Titanium.name=æ˜Ÿä½“é’›å— +tile.Astral Titanium Frame Box.name=星体钛框架 + +item.itemIngotTungstenTitaniumCarbide.name=碳化钨钛åˆé‡‘é” +item.itemHotIngotTungstenTitaniumCarbide.name=çƒç¢³åŒ–钨钛åˆé‡‘é” +item.itemDustTungstenTitaniumCarbide.name=碳化钨钛åˆé‡‘粉 +item.itemDustTinyTungstenTitaniumCarbide.name=å°æ’®ç¢³åŒ–钨钛åˆé‡‘粉 +item.itemDustSmallTungstenTitaniumCarbide.name=å°å †ç¢³åŒ–钨钛åˆé‡‘粉 +item.itemNuggetTungstenTitaniumCarbide.name=碳化钨钛åˆé‡‘ç²’ +item.itemPlateTungstenTitaniumCarbide.name=碳化钨钛åˆé‡‘æ¿ +item.itemPlateDoubleTungstenTitaniumCarbide.name=åŒé‡ç¢³åŒ–钨钛åˆé‡‘æ¿ +item.itemBoltTungstenTitaniumCarbide.name=碳化钨钛åˆé‡‘èžºæ “ +item.itemRodTungstenTitaniumCarbide.name=碳化钨钛åˆé‡‘æ† +item.itemRodLongTungstenTitaniumCarbide.name=长碳化钨钛åˆé‡‘æ† +item.itemRingTungstenTitaniumCarbide.name=碳化钨钛åˆé‡‘环 +item.itemScrewTungstenTitaniumCarbide.name=碳化钨钛åˆé‡‘èžºä¸ +item.itemRotorTungstenTitaniumCarbide.name=碳化钨钛åˆé‡‘转å +item.itemGearTungstenTitaniumCarbide.name=碳化钨钛åˆé‡‘齿轮 +item.itemCellTungstenTitaniumCarbide.name=碳化钨钛åˆé‡‘å•å…ƒ +tile.Block of Tungsten Titanium Carbide.name=碳化钨钛åˆé‡‘å— +tile.Tungsten Titanium Carbide Frame Box.name=碳化钨钛åˆé‡‘框架 + +item.itemIngotNitinol60.name=é•é’›è¯º60é” +item.itemHotIngotNitinol60.name=çƒé•é’›è¯º60é” +item.itemDustNitinol60.name=é•é’›è¯º60粉 +item.itemDustTinyNitinol60.name=å°æ’®é•é’›è¯º60粉 +item.itemDustSmallNitinol60.name=å°å †é•é’›è¯º60粉 +item.itemNuggetNitinol60.name=é•é’›è¯º60ç²’ +item.itemPlateNitinol60.name=é•é’›è¯º60æ¿ +item.itemPlateDoubleNitinol60.name=åŒé‡é•é’›è¯º60æ¿ +item.itemBoltNitinol60.name=é•é’›è¯º60èžºæ “ +item.itemRodNitinol60.name=é•é’›è¯º60æ† +item.itemRodLongNitinol60.name=é•¿é•é’›è¯º60æ† +item.itemRingNitinol60.name=é•é’›è¯º60环 +item.itemScrewNitinol60.name=é•é’›è¯º60èžºä¸ +item.itemRotorNitinol60.name=é•é’›è¯º60转å +item.itemGearNitinol60.name=é•é’›è¯º60齿轮 +item.itemCellNitinol60.name=é•é’›è¯º60å•å…ƒ +tile.Block of Nitinol 60.name=é•é’›è¯º60å— +tile.Nitinol 60 Frame Box.name=é•é’›è¯º60框架 + +item.itemIngotAdvancedNitinol.name=高级é•é’›è¯ºé” +item.itemHotIngotAdvancedNitinol.name=çƒé«˜çº§é•é’›è¯ºé” +item.itemDustAdvancedNitinol.name=高级é•é’›è¯ºç²‰ +item.itemDustTinyAdvancedNitinol.name=å°æ’®é«˜çº§é•é’›è¯ºç²‰ +item.itemDustSmallAdvancedNitinol.name=å°å †é«˜çº§é•é’›è¯ºç²‰ +item.itemNuggetAdvancedNitinol.name=高级é•é’›è¯ºç²’ +item.itemPlateAdvancedNitinol.name=高级é•é’›è¯ºæ¿ +item.itemPlateDoubleAdvancedNitinol.name=åŒé‡é«˜çº§é•é’›è¯ºæ¿ +item.itemBoltAdvancedNitinol.name=高级é•é’›è¯ºèžºæ “ +item.itemRodAdvancedNitinol.name=高级é•é’›è¯ºæ† +item.itemRodLongAdvancedNitinol.name=长高级é•é’›è¯ºæ† +item.itemRingAdvancedNitinol.name=高级é•é’›è¯ºçŽ¯ +item.itemScrewAdvancedNitinol.name=高级é•é’›è¯ºèžºä¸ +item.itemRotorAdvancedNitinol.name=高级é•é’›è¯ºè½¬å +item.itemGearAdvancedNitinol.name=高级é•é’›è¯ºé½¿è½® +item.itemCellAdvancedNitinol.name=高级é•é’›è¯ºå•å…ƒ +tile.Block of Advanced Nitinol.name=高级é•é’›è¯ºå— +tile.Advanced Nitinol Frame Box.name=高级é•é’›è¯ºæ¡†æž¶ + +item.itemIngotArcanite.name=å¥¥é‡‘é” +item.itemHotIngotArcanite.name=çƒå¥¥é‡‘é” +item.itemDustArcanite.name=奥金粉 +item.itemDustTinyArcanite.name=å°æ’®å¥¥é‡‘粉 +item.itemDustSmallArcanite.name=å°å †å¥¥é‡‘粉 +item.itemNuggetArcanite.name=奥金粒 +item.itemPlateArcanite.name=å¥¥é‡‘æ¿ +item.itemPlateDoubleArcanite.name=åŒé‡å¥¥é‡‘æ¿ +item.itemBoltArcanite.name=å¥¥é‡‘èžºæ “ +item.itemRodArcanite.name=å¥¥é‡‘æ† +item.itemRodLongArcanite.name=é•¿å¥¥é‡‘æ† +item.itemRingArcanite.name=奥金环 +item.itemScrewArcanite.name=å¥¥é‡‘èžºä¸ +item.itemRotorArcanite.name=奥金转å +item.itemGearArcanite.name=奥金齿轮 +item.itemCellArcanite.name=奥金å•å…ƒ +tile.Block of Arcanite.name=å¥¥é‡‘å— +tile.Arcanite Frame Box.name=奥金框架 + +item.itemIngotPikyonium64B.name=çš®å¡ä¼˜åˆé‡‘64Bé” +item.itemHotIngotPikyonium64B.name=çƒçš®å¡ä¼˜åˆé‡‘64Bé” +item.itemDustPikyonium64B.name=çš®å¡ä¼˜åˆé‡‘64B粉 +item.itemDustTinyPikyonium64B.name=å°æ’®çš®å¡ä¼˜åˆé‡‘64B粉 +item.itemDustSmallPikyonium64B.name=å°å †çš®å¡ä¼˜åˆé‡‘64B粉 +item.itemNuggetPikyonium64B.name=çš®å¡ä¼˜åˆé‡‘64Bç²’ +item.itemPlatePikyonium64B.name=çš®å¡ä¼˜åˆé‡‘64Bæ¿ +item.itemPlateDoublePikyonium64B.name=åŒé‡çš®å¡ä¼˜åˆé‡‘64Bæ¿ +item.itemBoltPikyonium64B.name=çš®å¡ä¼˜åˆé‡‘64Bèžºæ “ +item.itemRodPikyonium64B.name=çš®å¡ä¼˜åˆé‡‘64Bæ† +item.itemRodLongPikyonium64B.name=é•¿çš®å¡ä¼˜åˆé‡‘64Bæ† +item.itemRingPikyonium64B.name=çš®å¡ä¼˜åˆé‡‘64B环 +item.itemScrewPikyonium64B.name=çš®å¡ä¼˜åˆé‡‘64Bèžºä¸ +item.itemRotorPikyonium64B.name=çš®å¡ä¼˜åˆé‡‘64B转å +item.itemGearPikyonium64B.name=çš®å¡ä¼˜åˆé‡‘64B齿轮 +item.itemCellPikyonium64B.name=çš®å¡ä¼˜åˆé‡‘64Bå•å…ƒ +tile.Block of Pikyonium 64B.name=çš®å¡ä¼˜åˆé‡‘64Bå— +tile.Pikyonium 64B Frame Box.name=çš®å¡ä¼˜åˆé‡‘64B框架 + +item.itemIngotCinobiteA243.name=西诺æŸA243é” +item.itemHotIngotCinobiteA243.name=çƒè¥¿è¯ºæŸA243é” +item.itemDustCinobiteA243.name=西诺æŸA243粉 +item.itemDustTinyCinobiteA243.name=å°æ’®è¥¿è¯ºæŸA243粉 +item.itemDustSmallCinobiteA243.name=å°å †è¥¿è¯ºæŸA243粉 +item.itemNuggetCinobiteA243.name=西诺æŸA243ç²’ +item.itemPlateCinobiteA243.name=西诺æŸA243æ¿ +item.itemPlateDoubleCinobiteA243.name=åŒé‡è¥¿è¯ºæŸA243æ¿ +item.itemBoltCinobiteA243.name=西诺æŸA243èžºæ “ +item.itemRodCinobiteA243.name=西诺æŸA243æ† +item.itemRodLongCinobiteA243.name=长西诺æŸA243æ† +item.itemRingCinobiteA243.name=西诺æŸA243环 +item.itemScrewCinobiteA243.name=西诺æŸA243èžºä¸ +item.itemRotorCinobiteA243.name=西诺æŸA243转å +item.itemGearCinobiteA243.name=西诺æŸA243齿轮 +item.itemCellCinobiteA243.name=西诺æŸA243å•å…ƒ +tile.Block of Cinobite A243.name=西诺æŸA243å— +tile.Cinobite A243 Frame Box.name=西诺æŸA243框架 + +item.itemIngotLafiumCompound.name=è·¯è²æ©åŒ–åˆç‰©é” +item.itemHotIngotLafiumCompound.name=çƒè·¯è²æ©åŒ–åˆç‰©é” +item.itemDustLafiumCompound.name=è·¯è²æ©åŒ–åˆç‰©ç²‰ +item.itemDustTinyLafiumCompound.name=å°æ’®è·¯è²æ©åŒ–åˆç‰©ç²‰ +item.itemDustSmallLafiumCompound.name=å°å †è·¯è²æ©åŒ–åˆç‰©ç²‰ +item.itemNuggetLafiumCompound.name=è·¯è²æ©åŒ–åˆç‰©ç²’ +item.itemPlateLafiumCompound.name=è·¯è²æ©åŒ–åˆç‰©æ¿ +item.itemPlateDoubleLafiumCompound.name=åŒé‡è·¯è²æ©åŒ–åˆç‰©æ¿ +item.itemBoltLafiumCompound.name=è·¯è²æ©åŒ–åˆç‰©èžºæ “ +item.itemRodLafiumCompound.name=è·¯è²æ©åŒ–åˆç‰©æ† +item.itemRodLongLafiumCompound.name=é•¿è·¯è²æ©åŒ–åˆç‰©æ† +item.itemRingLafiumCompound.name=è·¯è²æ©åŒ–åˆç‰©çŽ¯ +item.itemScrewLafiumCompound.name=è·¯è²æ©åŒ–åˆç‰©èžºä¸ +item.itemRotorLafiumCompound.name=è·¯è²æ©åŒ–åˆç‰©è½¬å +item.itemGearLafiumCompound.name=è·¯è²æ©åŒ–åˆç‰©é½¿è½® +item.itemCellLafiumCompound.name=è·¯è²æ©åŒ–åˆç‰©å•å…ƒ +tile.Block of Lafium Compound.name=è·¯è²æ©åŒ–åˆç‰©å— +tile.Lafium Compound Frame Box.name=è·¯è²æ©åŒ–åˆç‰©æ¡†æž¶ + +item.itemIngotKoboldite.name=å¦–é‡‘é” +item.itemHotIngotKoboldite.name=çƒå¦–é‡‘é” +item.itemDustKoboldite.name=妖金粉 +item.itemDustTinyKoboldite.name=å°æ’®å¦–金粉 +item.itemDustSmallKoboldite.name=å°å †å¦–金粉 +item.itemNuggetKoboldite.name=妖金粒 +item.itemPlateKoboldite.name=å¦–é‡‘æ¿ +item.itemPlateDoubleKoboldite.name=åŒé‡å¦–é‡‘æ¿ +item.itemBoltKoboldite.name=å¦–é‡‘èžºæ “ +item.itemRodKoboldite.name=å¦–é‡‘æ† +item.itemRodLongKoboldite.name=é•¿å¦–é‡‘æ† +item.itemRingKoboldite.name=妖金环 +item.itemScrewKoboldite.name=å¦–é‡‘èžºä¸ +item.itemRotorKoboldite.name=妖金转å +item.itemGearKoboldite.name=妖金齿轮 +item.itemCellKoboldite.name=妖金å•å…ƒ +tile.Block of Koboldite.name=å¦–é‡‘å— +tile.Koboldite Frame Box.name=妖金框架 + +item.itemIngotAbyssalAlloy.name=深渊åˆé‡‘é” +item.itemHotIngotAbyssalAlloy.name=çƒæ·±æ¸Šåˆé‡‘é” +item.itemDustAbyssalAlloy.name=深渊åˆé‡‘粉 +item.itemDustTinyAbyssalAlloy.name=å°æ’®æ·±æ¸Šåˆé‡‘粉 +item.itemDustSmallAbyssalAlloy.name=å°å †æ·±æ¸Šåˆé‡‘粉 +item.itemNuggetAbyssalAlloy.name=深渊åˆé‡‘ç²’ +item.itemPlateAbyssalAlloy.name=深渊åˆé‡‘æ¿ +item.itemPlateDoubleAbyssalAlloy.name=åŒé‡æ·±æ¸Šåˆé‡‘æ¿ +item.itemBoltAbyssalAlloy.name=深渊åˆé‡‘èžºæ “ +item.itemRodAbyssalAlloy.name=深渊åˆé‡‘æ† +item.itemRodLongAbyssalAlloy.name=长深渊åˆé‡‘æ† +item.itemRingAbyssalAlloy.name=深渊åˆé‡‘环 +item.itemScrewAbyssalAlloy.name=深渊åˆé‡‘èžºä¸ +item.itemRotorAbyssalAlloy.name=深渊åˆé‡‘转å +item.itemGearAbyssalAlloy.name=深渊åˆé‡‘齿轮 +item.itemCellAbyssalAlloy.name=深渊åˆé‡‘å•å…ƒ +tile.Block of Abyssal Alloy.name=深渊åˆé‡‘å— +tile.Abyssal Alloy Frame Box.name=深渊åˆé‡‘框架 + + + + + + + + + + + + + + + + + + + +//Radioactive +item.dustTechnetium99M.name=é”99M粉 +item.dustTechnetium99.name=é”99粉 +item.dustMolybdenum99.name=é’¼99粉 + +//Bags +item.item.MysticBag.name=神秘袋 +item.item.Eatotron9000.name=埃托特洛尼克9000åž‹ +item.item.ToolBox.name=工人的工具箱 + +//Cells +item.Bromine.name=溴å•å…ƒ +item.Krypton.name=æ°ªå•å…ƒ +item.cryotheum.name=凛冰å•å…ƒ +item.pyrotheum.name=烈焰之炽焱å•å…ƒ +item.GeneticMutagen.name=诱å˜å‰‚å•å…ƒ + +//Ingots +item.itemHotIngotIncoloy020.name=çƒè€çƒé“¬é“åˆé‡‘-020é” +item.itemHotIngotIncoloyDS.name=çƒè€çƒé“¬é“åˆé‡‘-DSé” +item.itemHotIngotTalonite.name=çƒé“¬é’´ç£·é…¸ç›åˆé‡‘é” +item.itemHotIngotHastelloyX.name=çƒå“ˆæ–¯ç‰¹æ´›ä¾åˆé‡‘-Xé” +item.itemHotIngotHastelloyW.name=çƒå“ˆæ–¯ç‰¹æ´›ä¾åˆé‡‘-Wç¢³åŒ–ç‰©é” + +//Railcraft Fix +item.railcraft.part.plate.lead.name=é“…æ¿ + +//Ions +item.particle.ion.Hydrogen.name=氢离å +item.particle.ion.Helium.name=氦离å +item.particle.ion.Lithium.name=锂离å +item.particle.ion.Beryllium.name=é“离å +item.particle.ion.Boron.name=硼离å +item.particle.ion.Carbon.name=碳离å +item.particle.ion.Nitrogen.name=氮离å +item.particle.ion.Oxygen.name=氧离å +item.particle.ion.Fluorine.name=氟离å +item.particle.ion.Neon.name=氖离å +item.particle.ion.Sodium.name=é’ ç¦»å +item.particle.ion.Magnesium.name=é•ç¦»å +item.particle.ion.Aluminum.name=é“离å +item.particle.ion.Silicon.name=硅离å +item.particle.ion.Phosphorus.name=磷离å +item.particle.ion.Sulfur.name=硫离å +item.particle.ion.Chlorine.name=氯离å +item.particle.ion.Argon.name=氩离å +item.particle.ion.Potassium.name=钾离å +item.particle.ion.Calcium.name=钙离å +item.particle.ion.Scandium.name=钪离å +item.particle.ion.Titanium.name=钛离å +item.particle.ion.Vanadium.name=钒离å +item.particle.ion.Chromium.name=铬离å +item.particle.ion.Manganese.name=锰离å +item.particle.ion.Iron.name=é“离å +item.particle.ion.Cobalt.name=钴离å +item.particle.ion.Nickel.name=é•ç¦»å +item.particle.ion.Copper.name=铜离å +item.particle.ion.Zinc.name=锌离å +item.particle.ion.Gallium.name=镓离å +item.particle.ion.Germanium.name=锗离å +item.particle.ion.Arsenic.name=ç ·ç¦»å +item.particle.ion.Selenium.name=硒离å +item.particle.ion.Bromine.name=溴离å +item.particle.ion.Krypton.name=氪离å +item.particle.ion.Rubidium.name=铷离å +item.particle.ion.Strontium.name=锶离å +item.particle.ion.Yttrium.name=钇离å +item.particle.ion.Zirconium.name=锆离å +item.particle.ion.Niobium.name=铌离å +item.particle.ion.Molybdenum.name=钼离å +item.particle.ion.Technetium.name=é”离å +item.particle.ion.Ruthenium.name=钌离å +item.particle.ion.Rhodium.name=铑离å +item.particle.ion.Palladium.name=钯离å +item.particle.ion.Silver.name=银离å +item.particle.ion.Cadmium.name=镉离å +item.particle.ion.Indium.name=铟离å +item.particle.ion.Tin.name=锡离å +item.particle.ion.Antimony.name=锑离å +item.particle.ion.Tellurium.name=碲离å +item.particle.ion.Iodine.name=碘离å +item.particle.ion.Xenon.name=氙离å +item.particle.ion.Cesium.name=铯离å +item.particle.ion.Barium.name=钡离å +item.particle.ion.Lanthanum.name=镧离å +item.particle.ion.Cerium.name=铈离å +item.particle.ion.Praseodymium.name=镨离å +item.particle.ion.Neodymium.name=钕离å +item.particle.ion.Promethium.name=钷离å +item.particle.ion.Samarium.name=é’离å +item.particle.ion.Europium.name=铕离å +item.particle.ion.Gadolinium.name=钆离å +item.particle.ion.Terbium.name=铽离å +item.particle.ion.Dysprosium.name=é•ç¦»å +item.particle.ion.Holmium.name=钬离å +item.particle.ion.Erbium.name=铒离å +item.particle.ion.Thulium.name=铥离å +item.particle.ion.Ytterbium.name=镱离å +item.particle.ion.Lutetium.name=é•ç¦»å +item.particle.ion.Hafnium.name=铪离å +item.particle.ion.Tantalum.name=钽离å +item.particle.ion.Tungsten.name=钨离å +item.particle.ion.Rhenium.name=铼离å +item.particle.ion.Osmium.name=锇离å +item.particle.ion.Iridium.name=铱离å +item.particle.ion.Platinum.name=铂离å +item.particle.ion.Gold.name=金离å +item.particle.ion.Mercury.name=汞离å +item.particle.ion.Thallium.name=铊离å +item.particle.ion.Lead.name=铅离å +item.particle.ion.Bismuth.name=铋离å +item.particle.ion.Polonium.name=钋离å +item.particle.ion.Astatine.name=ç ¹ç¦»å +item.particle.ion.Radon.name=氡离å +item.particle.ion.Francium.name=钫离å +item.particle.ion.Radium.name=é•ç¦»å +item.particle.ion.Actinium.name=锕离å +item.particle.ion.Thorium.name=é’离å +item.particle.ion.Protactinium.name=镤离å +item.particle.ion.Uranium.name=铀离å +item.particle.ion.Neptunium.name=镎离å +item.particle.ion.Plutonium.name=钚离å +item.particle.ion.Americium.name=镅离å +item.particle.ion.Curium.name=锔离å +item.particle.ion.Berkelium.name=锫离å +item.particle.ion.Californium.name=锎离å +item.particle.ion.Einsteinium.name=锿离å +item.particle.ion.Fermium.name=镄离å +item.particle.ion.Mendelevium.name=钔离å +item.particle.ion.Nobelium.name=锘离å +item.particle.ion.Lawrencium.name=铹离å +item.particle.ion.Rutherfordium.name=离å +item.particle.ion.Dubnium.name=î¤ç¦»å +item.particle.ion.Seaborgium.name=离å +item.particle.ion.Bohrium.name=离å +item.particle.ion.Hassium.name=离å +item.particle.ion.Meitnerium.name=é¿ç¦»å +item.particle.ion.Darmstadtium.name=离å +item.particle.ion.Roentgenium.name=离å +item.particle.ion.Copernicium.name=鿔离å +item.particle.ion.Nihonium.name=é¿ç¦»å +item.particle.ion.Flerovium.name=离å +item.particle.ion.Moscovium.name=镆离å +item.particle.ion.Livermorium.name=离å +item.particle.ion.Tennessine.name=鿬离å +item.particle.ion.Oganesson.name=鿫离å + + +item.particle.base.Graviton.name=引力å +item.particle.base.Up.name=u夸克 +item.particle.base.Down.name=b夸克 +item.particle.base.Charm.name=c夸克 +item.particle.base.Strange.name=s夸克 +item.particle.base.Top.name=t夸克 +item.particle.base.Bottom.name=b夸克 +item.particle.base.Electron.name=eå +item.particle.base.Electron Neutrino.name=eåä¸å¾®å +item.particle.base.Muon.name=μå +item.particle.base.Muon Neutrino.name=μåä¸å¾®å +item.particle.base.Tau.name=Ï„å +item.particle.base.Tau Neutrino.name=Ï„åä¸å¾®å +item.particle.base.Gluon.name=胶å +item.particle.base.Photon.name=å…‰å +item.particle.base.Z Boson.name=Z玻色å +item.particle.base.W Boson.name=W玻色å +item.particle.base.Higgs Boson.name=å¸Œæ ¼æ–¯çŽ»è‰²å +item.particle.base.Proton.name=è´¨å +item.particle.base.Neutron.name=ä¸å +item.particle.base.Lambda.name=λ +item.particle.base.Omega.name=Ω +item.particle.base.Pion.name=介å +item.particle.base.ETA Meson.name=η介å +item.particle.base.Unknown.name=未知粒å + +//Added 12/1/19 + +tile.playerDoorGlass.name=玻璃自动门 +tile.playerDoorCactus.name=仙人掌自动门 +tile.playerDoorIce.name=冰自动门 +tile.playerDoorIron.name=é“自动门 +tile.playerDoorWood.name=木自动门 + +//Added 4/2/19 + +item.GTPP.BattPack.06.name=充电工具包[LuV] +item.GTPP.BattPack.07.name=充电工具包[ZPM] +item.GTPP.BattPack.08.name=充电工具包[UV] +item.GTPP.BattPack.09.name=充电工具包[MAX] + + +//Added 13/3/19 +item.gtpp.debug.scanner.name=GT++排错扫æ器 +item.RawWaste.name=动物粪便å•å…ƒ +item.ManureSlurry.name=粪浆å•å…ƒ +item.FertileManureSlurry.name=肥沃的粪浆å•å…ƒ +item.itemDustTinyDemicheleiteBr.name=å°æ’®å¾·ç±³å‡¯èŽ±(Br) +item.itemDustSmallDemicheleiteBr.name=å°å †å¾·ç±³å‡¯èŽ±(Br) +tile.blockPooCollector.name=å†œä¸šä¸‹æ°´é“ +tile.Block of Lithium 7.name=锂7å— + +//Added 14/3/19 +item.blood.name=è¡€å•å…ƒ +item.aniline.name=苯胺å•å…ƒ +item.cadaverine.name=尸胺å•å…ƒ +item.polyurethane.name=èšæ°¨é…¯å•å…ƒ +item.putrescine.name=è…胺å•å…ƒ +item.cyclohexane.name=环己胺å•å…ƒ +item.cyclohexanone.name=环己酮å•å…ƒ +item.nitrobenzene.name=ç¡åŸºè‹¯å•å…ƒ +item.ender.name=液体末影å•å…ƒ +item.xpjuice.name=液体ç»éªŒå•å…ƒ +item.itemBombUnf.name=å¯æŠ•æŽ·ç‚¸å¼¹(未完æˆ) +item.itemBombCasing.name=炸弹框架 +item.gtpp.throwable.bomb.name=å¯æŠ•æŽ·ç‚¸å¼¹ +item.itemDetCable.name=炸弹ä¿é™©ä¸ +tile.blockPooCollector.0.name=å†œä¸šä¸‹æ°´é“ +tile.blockPooCollector.8.name=生物å¤åˆæ”¶é›†å™¨ +item.itemIngotBakelite.name=ç”µæœ¨é” +item.itemDustBakelite.name=电木粉 +item.itemDustTinyBakelite.name=å°æ’®ç”µæœ¨ç²‰ +item.itemDustSmallBakelite.name=å°å †ç”µæœ¨ç²‰ +item.itemNuggetBakelite.name=电木粒 +item.itemPlateBakelite.name=ç”µæœ¨æ¿ +item.itemPlateDoubleBakelite.name=åŒé‡ç”µæœ¨æ¿ +item.itemCellBakelite.name=电木å•å…ƒ +tile.Block of Bakelite.name=ç”µæœ¨å— +item.itemIngotNylon.name=å°¼é¾™é” +item.itemDustNylon.name=尼龙粉 +item.itemDustTinyNylon.name=å°æ’®å°¼é¾™ç²‰ +item.itemDustSmallNylon.name=å°å †å°¼é¾™ç²‰ +item.itemNuggetNylon.name=尼龙粒 +item.itemPlateNylon.name=å°¼é¾™æ¿ +item.itemPlateDoubleNylon.name=åŒé‡å°¼é¾™æ¿ +item.itemCellNylon.name=尼龙å•å…ƒ +tile.Block of Nylon.name=å°¼é¾™å— +item.itemIngotTeflon.name=ç‰¹æ°Ÿé¾™é” +item.itemDustTeflon.name=特氟龙粉 +item.itemDustTinyTeflon.name=å°æ’®ç‰¹æ°Ÿé¾™ç²‰ +item.itemDustSmallTeflon.name=å°å †ç‰¹æ°Ÿé¾™ç²‰ +item.itemNuggetTeflon.name=特氟龙粒 +item.itemPlateTeflon.name=ç‰¹æ°Ÿé¾™æ¿ +item.itemPlateDoubleTeflon.name=åŒé‡ç‰¹æ°Ÿé¾™æ¿ +item.itemCellTeflon.name=特氟龙å•å…ƒ +tile.Block of Teflon.name=ç‰¹æ°Ÿé¾™å— + +//Added 17/4/19 +//Spelling Corrections +item.particle.ion.Aluminium.name=é“离å +item.particle.ion.Caesium.name=铯离å + +item.GTPP.MonsterKiller.Enderman.name=末影人æ€æ‰‹ +item.GTPP.MonsterKiller.Spider.name=蜘蛛æ€æ‰‹ +item.GTPP.MonsterKiller.Skeleton.name=骷髅æ€æ‰‹ +item.GTPP.MonsterKiller.Creeper.name=爬行者æ€æ‰‹ +item.GTPP.MonsterKiller.Zombie.name=僵尸æ€æ‰‹ +item.GTPP.MonsterKiller.Hellish.name=下界生物æ€æ‰‹ + +item.itemIngotRunite.name=虚æ©é” +item.itemDustRunite.name=虚æ©ç²‰ +item.itemDustTinyRunite.name=å°æ’®è™šæ©ç²‰ +item.itemDustSmallRunite.name=å°å †è™šæ©ç²‰ +item.itemNuggetRunite.name=虚æ©é” +item.itemPlateRunite.name=虚æ©æ¿ +item.itemPlateDoubleRunite.name=åŒé‡è™šæ©æ¿ +item.itemCellRunite.name=虚æ©å•å…ƒ +tile.Block of Runite.name=虚æ©å— + +item.itemIngotDragonblood.name=é¾™è¡€é” +item.itemDustDragonblood.name=龙血粉 +item.itemDustTinyDragonblood.name=å°æ’®é¾™è¡€ç²‰ +item.itemDustSmallDragonblood.name=å°å †é¾™è¡€ç²‰ +item.itemNuggetDragonblood.name=龙血粒 +item.itemPlateDragonblood.name=é¾™è¡€æ¿ +item.itemPlateDoubleDragonblood.name=åŒé‡é¾™è¡€æ¿ +item.itemCellDragonblood.name=龙血å•å…ƒ +tile.Block of Dragonblood.name=é¾™è¡€å— + +item.itemIngotBlackTitanium.name=é»‘é’›é” +item.itemDustBlackTitanium.name=黑钛粉 +item.itemDustTinyBlackTitanium.name=å°æ’®é»‘钛粉 +item.itemDustSmallBlackTitanium.name=å°å †é»‘钛粉 +item.itemNuggetBlackTitanium.name=黑钛粒 +item.itemPlateBlackTitanium.name=é»‘é’›æ¿ +item.itemPlateDoubleBlackTitanium.name=åŒé‡é»‘é’›æ¿ +item.itemCellBlackTitanium.name=黑钛å•å…ƒ +tile.Block of Black Titanium.name=é»‘é’›å— + +item.itemIngotAncientGranite.name=å¤èŠ±å²—å²©é” +item.itemHotIngotAncientGranite.name=çƒå¤èŠ±å²—å²©é” +item.itemDustAncientGranite.name=å¤èŠ±å²—岩粉 +item.itemDustTinyAncientGranite.name=å°æ’®å¤èŠ±å²—岩粉 +item.itemDustSmallAncientGranite.name=å°å †å¤èŠ±å²—岩粉 +item.itemNuggetAncientGranite.name=å¤èŠ±å²—岩粒 +item.itemPlateAncientGranite.name=å¤èŠ±å²—å²©æ¿ +item.itemPlateDoubleAncientGranite.name=åŒé‡å¤èŠ±å²—å²©æ¿ +tile.Block of Ancient Granite.name=å¤èŠ±å²—å²©å— + +item.itemIngotBabbitAlloy.name=å·´æ°åˆé‡‘é” +item.itemHotIngotBabbitAlloy.name=çƒå·´æ°åˆé‡‘é” +item.itemDustBabbitAlloy.name=å·´æ°åˆé‡‘粉 +item.itemDustTinyBabbitAlloy.name=å°æ’®å·´æ°åˆé‡‘粉 +item.itemDustSmallBabbitAlloy.name=å°å †å·´æ°åˆé‡‘粉 +item.itemNuggetBabbitAlloy.name=å·´æ°åˆé‡‘ç²’ +item.itemPlateBabbitAlloy.name=å·´æ°åˆé‡‘æ¿ +item.itemPlateDoubleBabbitAlloy.name=åŒé‡å·´æ°åˆé‡‘æ¿ +item.itemCellBabbitAlloy.name=å·´æ°åˆé‡‘å•å…ƒ +tile.Block of Babbit Alloy.name=å·´æ°åˆé‡‘å— + +item.itemIngotBlackMetal.name=é»‘ç‰©è´¨é” +item.itemHotIngotBlackMetal.name=çƒé»‘ç‰©è´¨é” +item.itemDustBlackMetal.name=黑物质粉 +item.itemDustTinyBlackMetal.name=å°æ’®é»‘物质粉 +item.itemDustSmallBlackMetal.name=å°å †é»‘物质粉 +item.itemNuggetBlackMetal.name=黑物质粒 +item.itemPlateBlackMetal.name=é»‘ç‰©è´¨æ¿ +item.itemPlateDoubleBlackMetal.name=åŒé‡é»‘ç‰©è´¨æ¿ +item.itemBoltBlackMetal.name=é»‘ç‰©è´¨èžºæ “ +item.itemRodBlackMetal.name=é»‘ç‰©è´¨æ† +item.itemRodLongBlackMetal.name=é•¿é»‘ç‰©è´¨æ† +item.itemRingBlackMetal.name=黑物质环 +item.itemScrewBlackMetal.name=é»‘ç‰©è´¨èžºä¸ +item.itemRotorBlackMetal.name=黑物质转å +item.itemGearBlackMetal.name=黑物质齿轮 +item.itemCellBlackMetal.name=黑物质å•å…ƒ +tile.Block of Black Metal.name=é»‘ç‰©è´¨å— +tile.Black Metal Frame Box.name=黑物质框架 + +item.itemIngotWhiteMetal.name=ç™½ç‰©è´¨é” +item.itemHotIngotWhiteMetal.name=çƒç™½ç‰©è´¨é” +item.itemDustWhiteMetal.name=白物质粉 +item.itemDustTinyWhiteMetal.name=å°æ’®ç™½ç‰©è´¨ç²‰ +item.itemDustSmallWhiteMetal.name=å°å †ç™½ç‰©è´¨ç²‰ +item.itemNuggetWhiteMetal.name=白物质粒 +item.itemPlateWhiteMetal.name=ç™½ç‰©è´¨æ¿ +item.itemPlateDoubleWhiteMetal.name=åŒé‡ç™½ç‰©è´¨æ¿ +item.itemBoltWhiteMetal.name=ç™½ç‰©è´¨èžºæ “ +item.itemRodWhiteMetal.name=ç™½ç‰©è´¨æ† +item.itemRodLongWhiteMetal.name=é•¿ç™½ç‰©è´¨æ† +item.itemRingWhiteMetal.name=白物质环 +item.itemScrewWhiteMetal.name=ç™½ç‰©è´¨èžºä¸ +item.itemRotorWhiteMetal.name=白物质转å +item.itemGearWhiteMetal.name=白物质齿轮 +item.itemCellWhiteMetal.name=白物质å•å…ƒ +tile.Block of White Metal.name=ç™½ç‰©è´¨å— +tile.White Metal Frame Box.name=白物质框架 + +//Added 29/04/2019 +tile.OreRunite.name=虚æ©çŸ¿ +item.crushedRunite.name=粉碎的虚æ©çŸ¿ +item.crushedCentrifugedRunite.name=离心的粉碎虚æ©çŸ¿ +item.crushedPurifiedRunite.name=洗净的的粉碎虚æ©çŸ¿ +item.dustImpureRunite.name=å«æ‚虚æ©ç²‰ +item.dustPureRunite.name=洗净虚æ©ç²‰ + +tile.OreAncientGranite.name=å¤èŠ±å²—岩矿 +item.crushedAncientGranite.name=粉碎的å¤èŠ±å²—岩矿 +item.crushedCentrifugedAncientGranite.name=离心的粉碎å¤èŠ±å²—岩矿 +item.crushedPurifiedAncientGranite.name=洗净的粉碎å¤èŠ±å²—岩矿 +item.dustImpureAncientGranite.name=å«æ‚å¤èŠ±å²—岩粉 +item.dustPureAncientGranite.name=洗净å¤èŠ±å²—岩粉 + +item.itemIngotRhugnor.name=é²æ ¼è¯ºé” +item.itemDustRhugnor.name=é²æ ¼è¯ºç²‰ +item.itemDustTinyRhugnor.name=å°æ’®é²æ ¼è¯ºç²‰ +item.itemDustSmallRhugnor.name=å°å †é²æ ¼è¯ºç²‰ +item.itemNuggetRhugnor.name=é²æ ¼è¯ºç²’ +item.itemPlateRhugnor.name=é²æ ¼è¯ºæ¿ +item.itemPlateDoubleRhugnor.name=åŒé‡é²æ ¼è¯ºæ¿ +item.itemCellRhugnor.name=é²æ ¼è¯ºå•å…ƒ +tile.Block of Rhugnor.name=é²æ ¼è¯ºå— + + + + +//Added 13/5/19 + +item.GTPP.BattPack.01.name=充电工具包[LV] +item.GTPP.BattPack.02.name=充电工具包[MV] +item.GTPP.BattPack.03.name=充电工具包[HV] +item.GTPP.BattPack.04.name=充电工具包[EV] +item.GTPP.BattPack.05.name=充电工具包[IV] +item.IndustrialDiamondExquisite.name=精致的工业钻石 + +item.itemSpringCelestialTungsten.name=天体钨弹簧 +item.itemSpringWhiteMetal.name=白物质弹簧 +item.itemSpringNitinol60.name=é•é’›è¯º60弹簧 +item.itemSpringWatertightSteel.name=防水钢弹簧 +item.itemSpringEglinSteel.name=åŸƒæ ¼æž—é’¢å¼¹ç°§ + +item.itemSmallSpringMaragingSteel250.name=å°åž‹é©¬æ°ä½“时效钢250弹簧 +item.itemSmallSpringNichrome.name=å°åž‹é•é“¬åˆé‡‘弹簧 +item.itemSmallSpringStaballoy.name=å°åž‹è´«é“€åˆé‡‘弹簧 +item.itemSmallSpringBlackSteel.name=å°åž‹é»‘钢弹簧 +item.itemSmallSpringBlackTitanium.name=å°åž‹é»‘钛弹簧 + +item.itemFineWireWhiteMetal.name=精致白物质导线 +item.itemFineWirePalladium.name=精致钯导线 +item.itemFineWireZirconium.name=精致锆导线 +item.itemFineWireGrisium.name=精致ç°é’›åˆé‡‘导线 +item.itemFineWireBabbitAlloy.name=精致巴æ°åˆé‡‘导线 +item.itemFineWireKoboldite.name=精致妖金导线 +item.itemFineWireHG1223.name=精致HG-1223导线 +item.itemFineWireQuantum.name=精致é‡å导线 + +item.itemHeavyPlatePotin.name=é‡åž‹ç²—é’é“œæ¿ +item.itemHeavyPlateWatertightSteel.name=é‡åž‹é˜²æ°´é’¢æ¿ +item.itemHeavyPlateBronze.name=é‡åž‹é’é“œæ¿ +item.itemHeavyPlateOsmiridium.name=é‡åž‹é“±é”‡åˆé‡‘æ¿ +item.itemHeavyPlateQuantum.name=é‡åž‹é‡åæ¿ +item.itemHeavyPlateBlackSteel.name=é‡åž‹é»‘é’¢æ¿ +item.itemHeavyPlateStainlessSteel.name=é‡åž‹ä¸é”ˆé’¢æ¿ +item.itemHeavyPlateEglinSteel.name=é‡åž‹åŸƒæ ¼æž—é’¢æ¿ +item.itemHeavyPlateMaragingSteel300.name=é‡åž‹é©¬æ°ä½“时效钢300æ¿ +item.itemHeavyPlateTalonite.name=铬钴磷酸ç›åˆé‡‘æ¿ +item.itemHeavyPlateHypogen.name=é‡åž‹æµ·ç€çæ¿ +item.itemHeavyPlateRhugnor.name=é‡åž‹é²æ ¼è¯ºæ¿ +item.itemHeavyPlateAdvancedNitinol.name=é‡åž‹é«˜çº§é•é’›è¯ºæ¿ +item.itemHeavyPlateAstralTitanium.name=é‡åž‹æ˜Ÿä½“é’›æ¿ +item.itemHeavyPlateCelestialTungsten.name=é‡åž‹å¤©ä½“é’¨æ¿ +item.itemHeavyPlateWhiteMetal.name=é‡åž‹ç™½ç‰©è´¨æ¿ +item.itemHeavyPlateBlackMetal.name=é‡åž‹é»‘ç‰©è´¨æ¿ +item.itemHeavyPlateAncientGranite.name=é‡åž‹å¤èŠ±å²—å²©æ¿ + +item.GTPP.bauble.fireprotection.0.name=超级披è¨æ‰‹å¥— + + +//Added 16/5/19 +item.itemCellSeleniumDioxide.name=二氧化硒å•å…ƒ +item.itemCellSeleniousAcid.name=亚硒酸å•å…ƒ + +//Added 25/7/19 +container.pestkiller=害虫æ€æ‰‹ + +//Added 15/8/19 +gtpp.nei.decayables=å¯è¡°å˜ç®±å(é“…å°ç›’) +entity.batKing.name=è™è 之王 +item.itemCellCarbyne.name=直链乙炔碳å•å…ƒ +item.itemCellHydrogenCyanide.name=氢氰酸å•å…ƒ +item.itemCactusCharcoal.name=ä»™äººæŽŒç‚ +item.itemCactusCoke.name=ä»™äººæŽŒç„¦ç‚ +item.itemSugarCharcoal.name=ç³–ç‚ +item.itemSugarCoke.name=ç³–ç„¦ç‚ +item.LiquidHydrogen.name=液氢å•å…ƒ[LOH] + + + +//Added 24/8/19 +//Debug Labels +tile.blockDoorAlloy.name=防爆门 +tile.blockInhibitorObelisk.name=ä¼ é€æŠ‘制方尖碑 +tile.Battlesign.name=战斗牌å +tile.blockMagicBox.name=奥法之盒 +tile.blockManaPod.name=法力èšèŒŽ +tile.buildToolBlock.name=å·¥å…·æ–¹å— +tile.blockRedPlasma.name=红色ç‰ç¦»åä½“æ–¹å— +tile.pipeBlock.name=ç®¡é“ +item.null.name=å‘ALKALUS报告错误 + + +//Added 24/8/19 +tile.OreGreenockite.name=硫镉矿石 +item.crushedGreenockite.name=粉碎的硫镉矿石 +item.crushedCentrifugedGreenockite.name=离心硫镉矿石 +item.crushedPurifiedGreenockite.name=洗净的硫镉矿石 +item.dustImpureGreenockite.name=å«æ‚硫镉矿粉 +item.dustPureGreenockite.name=æ´å‡€ç¡«é•‰çŸ¿ç²‰ +item.itemDustGreenockite.name=硫镉矿粉 +item.itemDustTinyGreenockite.name=å°æ’®ç¡«é•‰çŸ¿ç²‰ +item.itemDustSmallGreenockite.name=å°å †ç¡«é•‰çŸ¿ç²‰ + +tile.OreRareEarthI.name=稀土(I)矿石 +item.crushedRareEarthI.name=粉碎的稀土(I)矿石 +item.crushedCentrifugedRareEarthI.name=离心稀土(I)矿石 +item.crushedPurifiedRareEarthI.name=洗净的稀土(I)矿石 +item.dustImpureRareEarthI.name=å«æ‚稀土(I)粉 +item.dustPureRareEarthI.name=æ´å‡€ç¨€åœŸ(I)粉 +item.itemDustRareEarthI.name=稀土(I)粉 +item.itemDustTinyRareEarthI.name=å°æ’®ç¨€åœŸ(I)粉 +item.itemDustSmallRareEarthI.name=å°å †ç¨€åœŸ(I)粉 + +tile.OreRareEarthII.name=稀土(II)矿石 +item.crushedRareEarthII.name=粉碎的稀土(II)矿石 +item.crushedCentrifugedRareEarthII.name=离心稀土(II)矿石 +item.crushedPurifiedRareEarthII.name=洗净的稀土(II)矿石 +item.dustImpureRareEarthII.name=å«æ‚稀土(II)粉 +item.dustPureRareEarthII.name=æ´å‡€ç¨€åœŸ(II)粉 +item.itemDustRareEarthII.name=稀土(II)粉 +item.itemDustTinyRareEarthII.name=å°æ’®ç¨€åœŸ(II)粉 +item.itemDustSmallRareEarthII.name=å°å †ç¨€åœŸ(II)粉 + +tile.OreRareEarthIII.name=稀土(III)矿石 +item.crushedRareEarthIII.name=粉碎的稀土(III)矿石 +item.crushedCentrifugedRareEarthIII.name=离心稀土(III)矿石 +item.crushedPurifiedRareEarthIII.name=洗净的稀土(III)矿石 +item.dustImpureRareEarthIII.name=å«æ‚稀土(III)粉 +item.dustPureRareEarthIII.name=æ´å‡€ç¨€åœŸ(III)粉 +item.itemDustRareEarthIII.name=稀土(III)粉 +item.itemDustTinyRareEarthIII.name=å°æ’®ç¨€åœŸ(III)粉 +item.itemDustSmallRareEarthIII.name=å°å †ç¨€åœŸ(III)粉 + + + +//Added 13/10/19 +tile.blockRoundRobinator.0.name=自动输出机 I +tile.blockRoundRobinator.1.name=自动输出机 II +tile.blockRoundRobinator.2.name=自动输出机 III +tile.blockRoundRobinator.3.name=自动输出机 IV +tile.blockRoundRobinator.4.name=自动输出机 V + + +//Added 16/10/19 +item.BioRecipeSelector.name=编程生物电路 +item.FermentationBase.name=å‘酵基å•å…ƒ +item.ureamix.name=å°¿ç´ æ··åˆç‰©å•å…ƒ +item.liquidresin.name=液æ€æ ‘è„‚å•å…ƒ +item.propionicacid.name=丙酸å•å…ƒ +item.aceticacid.name=乙酸å•å…ƒ +item.BasicAgrichemItem.0.name=藻类生物质 +item.BasicAgrichemItem.1.name=绿藻生物质 +item.BasicAgrichemItem.2.name=è¤è—»ç”Ÿç‰©è´¨ +item.BasicAgrichemItem.3.name=金è¤è—»ç”Ÿç‰©è´¨ +item.BasicAgrichemItem.4.name=红藻生物质 +item.BasicAgrichemItem.5.name=çº¤ç»´ç´ çº¤ç»´ +item.BasicAgrichemItem.6.name=金è¤çº¤ç»´ç´ 纤维 +item.BasicAgrichemItem.7.name=çº¢è‰²çº¤ç»´ç´ çº¤ç»´ +item.BasicAgrichemItem.8.name=å †è‚¥ +item.BasicAgrichemItem.9.name=木颗粒 +item.BasicAgrichemItem.10.name=æœ¨ç – +item.BasicAgrichemItem.11.name=çº¤ç»´ç´ æµ† +item.BasicAgrichemItem.12.name=ç²—åˆ¶ç”Ÿç‰©æ ‘è„‚ +item.BasicAgrichemItem.13.name=催化剂载体 +item.BasicAgrichemItem.14.name=绿色金属催化剂 +item.BasicAgrichemItem.15.name=藻酸 +item.BasicAgrichemItem.16.name=æ°§åŒ–é“ +item.BasicAgrichemItem.17.name=é“颗粒 +item.BasicAgrichemItem.18.name=é“é…¸é’ +item.BasicAgrichemItem.19.name=æ°¢æ°§åŒ–é’ +item.BasicAgrichemItem.20.name=ç¢³é…¸é’ +item.BasicAgrichemItem.21.name=氯化锂 + +//Added 24/10/19 +item.butanol.name=ä¸é†‡å•å…ƒ + +//Try Fix IC2 Garbage vv +fluidHotWater=çƒæ°´ +fluidHotWater.name=çƒæ°´ +//Try Fix IC2 Garbage ^^ + + +//Added 11/12/19 +item.itemHotIngotTitanium.name=çƒé’›é” +item.OilHeavy.name=é‡æ²¹å•å…ƒ +item.UnsymmetricalDimethylhydrazine.name=å二甲肼å•å…ƒ +item.benzene.name=苯å•å…ƒ +item.Benzene.name=苯å•å…ƒ +item.phenol.name=苯酚å•å…ƒ +item.CarbonDioxide.name=二氧化碳å•å…ƒ +item.itemCellCarbonDioxide.name=二氧化碳å•å…ƒ +item.CarbonMonoxide.name=一氧化碳å•å…ƒ +item.itemCellCarbonMonoxide.name=一氧化碳å•å…ƒ +item.acetone.name=丙酮å•å…ƒ +item.saltwater.name=ç›æ°´å•å…ƒ +item.BasicAgrichemItem.22.name=模具(颗粒) +item.BasicAgrichemItem.23.name=æ´å‡€é“æ··åˆç‰© + +//Added 12/12/19 + +item.BasicGenericChemItem.0.name=红色金属催化剂 +item.BasicGenericChemItem.1.name=黄色金属催化剂 +item.BasicGenericChemItem.2.name=è“色金属催化剂 +item.BasicGenericChemItem.3.name=橙色金属催化剂 +item.BasicGenericChemItem.4.name=紫色金属催化剂 +item.BasicGenericChemItem.5.name=棕色金属催化剂 +item.MudRedSlurry.name=红色泥浆å•å…ƒ +item.liquid_toluene.name=甲苯å•å…ƒ + +item.BasicAlgaeItem.0.name=å¯åŸ¹æ¤è—»ç±»(I) +item.BasicAlgaeItem.1.name=å¯åŸ¹æ¤è—»ç±»(II) +item.BasicAlgaeItem.2.name=å¯åŸ¹æ¤è—»ç±»(III) +item.BasicAlgaeItem.3.name=å¯åŸ¹æ¤è—»ç±»(IV) +item.BasicAlgaeItem.4.name=å¯åŸ¹æ¤è—»ç±»(V) +item.BasicAlgaeItem.5.name=å¯åŸ¹æ¤è—»ç±»(VI) +item.BasicAlgaeItem.6.name=å¯åŸ¹æ¤è—»ç±»(VII) + +//Added 17/01/20 +item.BasicGenericChemItem.6.name=粉色金属催化剂 + +//Added 23/03/20 +item.BasicMetaFood.0.name=生人肉 +item.BasicMetaFood.1.name=熟人肉 +item.BasicMetaFood.2.name=生马肉 +item.BasicMetaFood.3.name=熟马肉 +item.BasicMetaFood.4.name=生狼肉 +item.BasicMetaFood.5.name=熟狼肉 +item.BasicMetaFood.6.name=生猫肉 +item.BasicMetaFood.7.name=熟猫肉 +item.BasicMetaFood.8.name=烈焰人肉 + +item.itemCellNaquadahFuel.name=硅岩燃料å•å…ƒ +item.itemCellEnrichedNaquadahFuel.name=富集硅岩燃料å•å…ƒ +item.itemCellNaquadriaFuel.name=超能硅岩燃料å•å…ƒ +item.boricacid.name=硼酸å•å…ƒ +item.hydrochloricacid.name=ç›é…¸å•å…ƒ + +item.BasicAlgaeItem.name=å¯åŸ¹æ¤è—»ç±» +item.BasicAlgaeItem.0.name=å¯åŸ¹æ¤è—»ç±»(I) +item.BasicAlgaeItem.1.name=å¯åŸ¹æ¤è—»ç±»(II) +item.BasicAlgaeItem.2.name=å¯åŸ¹æ¤è—»ç±»(III) +item.BasicAlgaeItem.3.name=å¯åŸ¹æ¤è—»ç±»(IV) +item.BasicAlgaeItem.4.name=å¯åŸ¹æ¤è—»ç±»(V) +item.BasicAlgaeItem.5.name=å¯åŸ¹æ¤è—»ç±»(VI) +item.BasicAlgaeItem.6.name=å¯åŸ¹æ¤è—»ç±»(VII) + +//Added 30/03/20 +item.milledChalcopyrite.name=ç ”ç£¨é»„é“œçŸ¿ +item.milledSphalerite.name=ç ”ç£¨é—ªé”ŒçŸ¿ +item.milledNickel.name=ç ”ç£¨é•çŸ¿ +item.milledPlatinum.name=ç ”ç£¨é“‚çŸ¿ +item.milledPentlandite.name=ç ”ç£¨é•é»„é“矿 +item.FrothZincflotation.name=闪锌矿浮选泡沫å•å…ƒ +item.FrothCopperflotation.name=黄铜矿浮选泡沫å•å…ƒ +item.FrothNickelflotation.name=é•çŸ¿æµ®é€‰æ³¡æ²«å•å…ƒ +item.FrothPlatinumflotation.name=铂矿浮选泡沫å•å…ƒ +item.FrothPentlanditeflotation.name=é•é»„é“矿浮选泡沫å•å…ƒ +item.BasicGenericChemItem.7.name=é“ç ”ç£¨çƒ +item.BasicGenericChemItem.8.name=çš‚çŸ³ç ”ç£¨çƒ + +//Added 31/03/20 +item.BasicGenericChemItem.9.name=ä¹™é†‡é’ ç²‰ +item.BasicGenericChemItem.10.name=ä¹™åŸºé»„åŽŸé…¸é’ ç²‰ +item.BasicGenericChemItem.11.name=乙基黄原酸钾粉 +item.BasicGenericChemItem.12.name=氢氧化钾粉 +item.CarbonDisulfide.name=二硫化碳å•å…ƒ +item.HydrogenSulfide.name=硫化氢å•å…ƒ +item.BasicAgrichemItem.24.name=æ¾æžœ +item.BasicAgrichemItem.25.name=æ¾æ ‘碎料 +item.pineoil.name=æ¾æ²¹å•å…ƒ + +//Added 11/4/20 +item.milledRedstone.name=ç ”ç£¨çº¢çŸ³çŸ¿ +item.milledSpessartine.name=ç ”ç£¨é”°é“榴石 +item.milledGrossular.name=ç ”ç£¨é’™é“榴石 +item.milledAlmandine.name=ç ”ç£¨é“é“榴石 +item.milledPyrope.name=ç ”ç£¨é•é“榴石 +item.FrothRedstoneflotation.name=红石矿浮选泡沫å•å…ƒ +item.FrothSpessartineflotation.name=é”°é“榴石浮选泡沫å•å…ƒ +item.FrothGrossularflotation.name=é’™é“榴石浮选泡沫å•å…ƒ +item.FrothAlmandineflotation.name=é“é“榴石浮选泡沫å•å…ƒ +item.FrothPyropeflotation.name=é•é“榴石浮选泡沫å•å…ƒ + +//Added 13/04/20 +item.T3RecipeSelector.name=çªç ´ç¼–程电路 + +//Added 03/05/20 +entity.miscutils.batKing.name=å¹½çµè™è +entity.miscutils.bigChickenFriendly.name=巨大的鸡 +entity.miscutils.AusDingo.name=澳洲野狗 +entity.miscutils.AusBoar.name=澳洲野猪 +entity.miscutils.AusSpider.name=森林蜘蛛 +entity.miscutils.AusOctopus.name=æ¾³æ´²ç« é±¼ +container.EggBox=鸡蛋åµåŒ–ç›’ + +//Added 24/05/20 +container.VolumetricFlaskSetter=容é‡ç“¶é…置器 + +//Added 26/05/20 +item.itemIngotLaurenium.name=劳伦姆åˆé‡‘é” +item.itemHotIngotLaurenium.name=çƒåŠ³ä¼¦å§†åˆé‡‘é” +item.itemDustLaurenium.name=劳伦姆åˆé‡‘粉 +item.itemDustTinyLaurenium.name=å°æ’®åŠ³ä¼¦å§†åˆé‡‘粉 +item.itemDustSmallLaurenium.name=å°å †åŠ³ä¼¦å§†åˆé‡‘粉 +item.itemNuggetLaurenium.name=劳伦姆åˆé‡‘ç²’ +item.itemPlateLaurenium.name=劳伦姆åˆé‡‘æ¿ +item.itemPlateDoubleLaurenium.name=åŒé‡åŠ³ä¼¦å§†åˆé‡‘æ¿ +item.itemBoltLaurenium.name=劳伦姆åˆé‡‘èžºæ “ +item.itemRodLaurenium.name=劳伦姆åˆé‡‘æ† +item.itemRodLongLaurenium.name=长劳伦姆åˆé‡‘æ† +item.itemRingLaurenium.name=劳伦姆åˆé‡‘环 +item.itemScrewLaurenium.name=劳伦姆åˆé‡‘èžºä¸ +item.itemRotorLaurenium.name=劳伦姆åˆé‡‘转å +item.itemGearLaurenium.name=劳伦姆åˆé‡‘齿轮 +item.itemCellLaurenium.name=劳伦姆åˆé‡‘å•å…ƒ +tile.Block of Laurenium.name=劳伦姆åˆé‡‘å— +tile.Laurenium Frame Box.name=劳伦姆åˆé‡‘框架 +item.itemIngotBotmium.name=åšç‰¹å§†åˆé‡‘é” +item.itemHotIngotBotmium.name=çƒåšç‰¹å§†åˆé‡‘é” +item.itemDustBotmium.name=åšç‰¹å§†åˆé‡‘粉 +item.itemDustTinyBotmium.name=å°æ’®åšç‰¹å§†åˆé‡‘粉 +item.itemDustSmallBotmium.name=å°å †åšç‰¹å§†åˆé‡‘粉 +item.itemNuggetBotmium.name=åšç‰¹å§†åˆé‡‘ç²’ +item.itemPlateBotmium.name=åšç‰¹å§†åˆé‡‘æ¿ +item.itemPlateDoubleBotmium.name=åŒé‡åšç‰¹å§†åˆé‡‘æ¿ +item.itemBoltBotmium.name=åšç‰¹å§†åˆé‡‘èžºæ “ +item.itemRodBotmium.name=åšç‰¹å§†åˆé‡‘æ† +item.itemRodLongBotmium.name=é•¿åšç‰¹å§†åˆé‡‘æ† +item.itemRingBotmium.name=åšç‰¹å§†åˆé‡‘环 +item.itemScrewBotmium.name=åšç‰¹å§†åˆé‡‘èžºä¸ +item.itemRotorBotmium.name=åšç‰¹å§†åˆé‡‘转å +item.itemGearBotmium.name=åšç‰¹å§†åˆé‡‘齿轮 +item.itemCellBotmium.name=åšç‰¹å§†åˆé‡‘å•å…ƒ +tile.Block of Botmium.name=åšç‰¹å§†åˆé‡‘å— +tile.Botmium Frame Box.name=åšç‰¹å§†åˆé‡‘框架 + +//Added 29/05/20 +item.itemBasicTurbine.name=基础涡轮 +item.itemBasicTurbine_0.name=基础é“涡轮 +item.itemBasicTurbine_1.name=基础é’铜涡轮 + +interaction.voidexcess.enabled=å¯ç”¨è¿‡é‡é”€æ¯ +interaction.voidexcess.disabled=ç¦ç”¨è¿‡é‡é”€æ¯ + +interaction.separateBusses.enabled=独立输入总线 interaction.separateBusses.disabled=è”åˆè¾“入总线
\ No newline at end of file diff --git a/src/resources/assets/miscutils/textures/DevCape.png b/src/main/resources/assets/miscutils/textures/DevCape.png Binary files differindex 15c2b758ce..15c2b758ce 100644 --- a/src/resources/assets/miscutils/textures/DevCape.png +++ b/src/main/resources/assets/miscutils/textures/DevCape.png diff --git a/src/resources/assets/miscutils/textures/DevCapeHD.png b/src/main/resources/assets/miscutils/textures/DevCapeHD.png Binary files differindex f74bd8c9e3..f74bd8c9e3 100644 --- a/src/resources/assets/miscutils/textures/DevCapeHD.png +++ b/src/main/resources/assets/miscutils/textures/DevCapeHD.png diff --git a/src/resources/assets/miscutils/textures/FancyCape.png b/src/main/resources/assets/miscutils/textures/FancyCape.png Binary files differindex ca63a0f335..ca63a0f335 100644 --- a/src/resources/assets/miscutils/textures/FancyCape.png +++ b/src/main/resources/assets/miscutils/textures/FancyCape.png diff --git a/src/resources/assets/miscutils/textures/FancyCapeHD.png b/src/main/resources/assets/miscutils/textures/FancyCapeHD.png Binary files differindex d8da3ba76d..d8da3ba76d 100644 --- a/src/resources/assets/miscutils/textures/FancyCapeHD.png +++ b/src/main/resources/assets/miscutils/textures/FancyCapeHD.png diff --git a/src/resources/assets/miscutils/textures/Orange.png b/src/main/resources/assets/miscutils/textures/Orange.png Binary files differindex 9de164d437..9de164d437 100644 --- a/src/resources/assets/miscutils/textures/Orange.png +++ b/src/main/resources/assets/miscutils/textures/Orange.png diff --git a/src/resources/assets/miscutils/textures/OrangeHD.png b/src/main/resources/assets/miscutils/textures/OrangeHD.png Binary files differindex ea5e8af8cf..ea5e8af8cf 100644 --- a/src/resources/assets/miscutils/textures/OrangeHD.png +++ b/src/main/resources/assets/miscutils/textures/OrangeHD.png diff --git a/src/resources/assets/miscutils/textures/PatreonCapeHD.png b/src/main/resources/assets/miscutils/textures/PatreonCapeHD.png Binary files differindex c4ebef82b2..c4ebef82b2 100644 --- a/src/resources/assets/miscutils/textures/PatreonCapeHD.png +++ b/src/main/resources/assets/miscutils/textures/PatreonCapeHD.png diff --git a/src/resources/assets/miscutils/textures/TesterCape.png b/src/main/resources/assets/miscutils/textures/TesterCape.png Binary files differindex 8504d06049..8504d06049 100644 --- a/src/resources/assets/miscutils/textures/TesterCape.png +++ b/src/main/resources/assets/miscutils/textures/TesterCape.png diff --git a/src/resources/assets/miscutils/textures/TesterCapeHD.png b/src/main/resources/assets/miscutils/textures/TesterCapeHD.png Binary files differindex da3ee2e50f..da3ee2e50f 100644 --- a/src/resources/assets/miscutils/textures/TesterCapeHD.png +++ b/src/main/resources/assets/miscutils/textures/TesterCapeHD.png diff --git a/src/resources/assets/miscutils/textures/aspects/Sagrausten.png b/src/main/resources/assets/miscutils/textures/aspects/Sagrausten.png Binary files differindex a2c461f94e..a2c461f94e 100644 --- a/src/resources/assets/miscutils/textures/aspects/Sagrausten.png +++ b/src/main/resources/assets/miscutils/textures/aspects/Sagrausten.png diff --git a/src/resources/assets/miscutils/textures/aspects/Slusium.png b/src/main/resources/assets/miscutils/textures/aspects/Slusium.png Binary files differindex fd2c42414d..fd2c42414d 100644 --- a/src/resources/assets/miscutils/textures/aspects/Slusium.png +++ b/src/main/resources/assets/miscutils/textures/aspects/Slusium.png diff --git a/src/resources/assets/miscutils/textures/aspects/Xablum.png b/src/main/resources/assets/miscutils/textures/aspects/Xablum.png Binary files differindex a19d64039a..a19d64039a 100644 --- a/src/resources/assets/miscutils/textures/aspects/Xablum.png +++ b/src/main/resources/assets/miscutils/textures/aspects/Xablum.png diff --git a/src/resources/assets/miscutils/textures/aspects/Xenil.png b/src/main/resources/assets/miscutils/textures/aspects/Xenil.png Binary files differindex e3b5ecda82..e3b5ecda82 100644 --- a/src/resources/assets/miscutils/textures/aspects/Xenil.png +++ b/src/main/resources/assets/miscutils/textures/aspects/Xenil.png diff --git a/src/resources/assets/miscutils/textures/aspects/Zetralt.png b/src/main/resources/assets/miscutils/textures/aspects/Zetralt.png Binary files differindex 001edf8ea3..001edf8ea3 100644 --- a/src/resources/assets/miscutils/textures/aspects/Zetralt.png +++ b/src/main/resources/assets/miscutils/textures/aspects/Zetralt.png diff --git a/src/resources/assets/miscutils/textures/blocks/FirePit/Firepit.tcn b/src/main/resources/assets/miscutils/textures/blocks/FirePit/Firepit.tcn Binary files differindex 453b7325c8..453b7325c8 100644 --- a/src/resources/assets/miscutils/textures/blocks/FirePit/Firepit.tcn +++ b/src/main/resources/assets/miscutils/textures/blocks/FirePit/Firepit.tcn diff --git a/src/resources/assets/miscutils/textures/blocks/FirePit/mossyFirepit.png b/src/main/resources/assets/miscutils/textures/blocks/FirePit/mossyFirepit.png Binary files differindex 78e400a5a0..78e400a5a0 100644 --- a/src/resources/assets/miscutils/textures/blocks/FirePit/mossyFirepit.png +++ b/src/main/resources/assets/miscutils/textures/blocks/FirePit/mossyFirepit.png diff --git a/src/resources/assets/miscutils/textures/blocks/SwirlBigBlue.png b/src/main/resources/assets/miscutils/textures/blocks/SwirlBigBlue.png Binary files differindex 42202d8fae..42202d8fae 100644 --- a/src/resources/assets/miscutils/textures/blocks/SwirlBigBlue.png +++ b/src/main/resources/assets/miscutils/textures/blocks/SwirlBigBlue.png diff --git a/src/resources/assets/miscutils/textures/blocks/SwirlBlue.png b/src/main/resources/assets/miscutils/textures/blocks/SwirlBlue.png Binary files differindex e79a08a151..e79a08a151 100644 --- a/src/resources/assets/miscutils/textures/blocks/SwirlBlue.png +++ b/src/main/resources/assets/miscutils/textures/blocks/SwirlBlue.png diff --git a/src/resources/assets/miscutils/textures/blocks/SwirlCyan.png b/src/main/resources/assets/miscutils/textures/blocks/SwirlCyan.png Binary files differindex 45d8feb48b..45d8feb48b 100644 --- a/src/resources/assets/miscutils/textures/blocks/SwirlCyan.png +++ b/src/main/resources/assets/miscutils/textures/blocks/SwirlCyan.png diff --git a/src/resources/assets/miscutils/textures/blocks/SwirlGray.png b/src/main/resources/assets/miscutils/textures/blocks/SwirlGray.png Binary files differindex 337d5fd1bc..337d5fd1bc 100644 --- a/src/resources/assets/miscutils/textures/blocks/SwirlGray.png +++ b/src/main/resources/assets/miscutils/textures/blocks/SwirlGray.png diff --git a/src/resources/assets/miscutils/textures/blocks/SwirlRed.png b/src/main/resources/assets/miscutils/textures/blocks/SwirlRed.png Binary files differindex e13c73be5b..e13c73be5b 100644 --- a/src/resources/assets/miscutils/textures/blocks/SwirlRed.png +++ b/src/main/resources/assets/miscutils/textures/blocks/SwirlRed.png diff --git a/src/resources/assets/miscutils/textures/blocks/SwirlYellow.png b/src/main/resources/assets/miscutils/textures/blocks/SwirlYellow.png Binary files differindex 2b920a8387..2b920a8387 100644 --- a/src/resources/assets/miscutils/textures/blocks/SwirlYellow.png +++ b/src/main/resources/assets/miscutils/textures/blocks/SwirlYellow.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/CASING_AMAZON.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/CASING_AMAZON.png Binary files differindex 88d5cb9c72..88d5cb9c72 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/CASING_AMAZON.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/CASING_AMAZON.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/0.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/0.png Binary files differindex ff1a809196..ff1a809196 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/0.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/0.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/1.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/1.png Binary files differindex 4af5b49f1f..4af5b49f1f 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/1.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/1.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/10.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/10.png Binary files differindex 0ea134fb93..0ea134fb93 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/10.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/10.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/11.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/11.png Binary files differindex 52c1a02d54..52c1a02d54 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/11.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/11.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/12.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/12.png Binary files differindex 0c791d1d7c..0c791d1d7c 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/12.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/12.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/13.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/13.png Binary files differindex 51cefde2a7..51cefde2a7 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/13.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/13.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/14.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/14.png Binary files differindex 6150873b54..6150873b54 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/14.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/14.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/15.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/15.png Binary files differindex 4483072085..4483072085 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/15.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/15.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/16.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/16.png Binary files differindex 137b4231c6..137b4231c6 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/16.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/16.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/17.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/17.png Binary files differindex 0dd1f2ae5f..0dd1f2ae5f 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/17.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/17.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/18.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/18.png Binary files differindex fd7adea957..fd7adea957 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/18.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/18.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/19.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/19.png Binary files differindex a0b7d1544e..a0b7d1544e 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/19.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/19.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/2.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/2.png Binary files differindex 1f395cc891..1f395cc891 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/2.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/2.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/20.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/20.png Binary files differindex 5f36f9e7b5..5f36f9e7b5 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/20.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/20.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/21.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/21.png Binary files differindex 191dd4f5ba..191dd4f5ba 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/21.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/21.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/22.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/22.png Binary files differindex 7df2cbec19..7df2cbec19 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/22.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/22.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/23.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/23.png Binary files differindex 7185cd1be1..7185cd1be1 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/23.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/23.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/24.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/24.png Binary files differindex 09ee5cd360..09ee5cd360 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/24.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/24.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/25.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/25.png Binary files differindex 3e88422126..3e88422126 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/25.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/25.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/26.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/26.png Binary files differindex 3d84925c61..3d84925c61 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/26.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/26.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/27.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/27.png Binary files differindex 6c4c1fb228..6c4c1fb228 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/27.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/27.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/28.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/28.png Binary files differindex f113ac0ab5..f113ac0ab5 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/28.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/28.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/29.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/29.png Binary files differindex d896829cfb..d896829cfb 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/29.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/29.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/3.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/3.png Binary files differindex f1bfc1063d..f1bfc1063d 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/3.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/3.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/30.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/30.png Binary files differindex bbc35cf318..bbc35cf318 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/30.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/30.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/31.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/31.png Binary files differindex e7f0363217..e7f0363217 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/31.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/31.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/4.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/4.png Binary files differindex 2ec68c00ff..2ec68c00ff 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/4.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/4.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/5.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/5.png Binary files differindex 2ffeb029fb..2ffeb029fb 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/5.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/5.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/6.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/6.png Binary files differindex f2c5b72b0c..f2c5b72b0c 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/6.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/6.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/7.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/7.png Binary files differindex 63cbcf0851..63cbcf0851 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/7.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/7.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/8.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/8.png Binary files differindex 69efbeb6de..69efbeb6de 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/8.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/8.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/9.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/9.png Binary files differindex acd54acf07..acd54acf07 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/9.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/9.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/wood_shelf.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/wood_shelf.png Binary files differindex 7a3700a854..7a3700a854 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/wood_shelf.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/wood_shelf.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/wood_shelf_cans.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/wood_shelf_cans.png Binary files differindex 672a513513..672a513513 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/wood_shelf_cans.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/wood_shelf_cans.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/wood_shelf_paper.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/wood_shelf_paper.png Binary files differindex e0ec5ef95a..e0ec5ef95a 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/wood_shelf_paper.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Compartment/wood_shelf_paper.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/DecayablesChest_bottom.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/DecayablesChest_bottom.png Binary files differindex d1a5b4f1b0..d1a5b4f1b0 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/DecayablesChest_bottom.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/DecayablesChest_bottom.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/DecayablesChest_bottom_old.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/DecayablesChest_bottom_old.png Binary files differindex ee332fba19..ee332fba19 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/DecayablesChest_bottom_old.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/DecayablesChest_bottom_old.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/DecayablesChest_full.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/DecayablesChest_full.png Binary files differindex b0c62a7b3d..b0c62a7b3d 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/DecayablesChest_full.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/DecayablesChest_full.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/DecayablesChest_side.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/DecayablesChest_side.png Binary files differindex b61a42b935..b61a42b935 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/DecayablesChest_side.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/DecayablesChest_side.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/DecayablesChest_top.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/DecayablesChest_top.png Binary files differindex 0647c2105f..0647c2105f 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/DecayablesChest_top.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/DecayablesChest_top.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/EggBox_full.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/EggBox_full.png Binary files differindex 787572ea3b..787572ea3b 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/EggBox_full.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/EggBox_full.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/EggBox_side.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/EggBox_side.png Binary files differindex 771fef125a..771fef125a 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/EggBox_side.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/EggBox_side.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/EggBox_top.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/EggBox_top.png Binary files differindex d766cc9f3f..d766cc9f3f 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/EggBox_top.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/EggBox_top.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/FluidReactor/OVERLAY_FRONT.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/FluidReactor/OVERLAY_FRONT.png Binary files differindex e92b9c9ff8..e92b9c9ff8 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/FluidReactor/OVERLAY_FRONT.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/FluidReactor/OVERLAY_FRONT.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/FluidReactor/OVERLAY_FRONT_ACTIVE.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/FluidReactor/OVERLAY_FRONT_ACTIVE.png Binary files differindex 8a47157d2b..8a47157d2b 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/FluidReactor/OVERLAY_FRONT_ACTIVE.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/FluidReactor/OVERLAY_FRONT_ACTIVE.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/FluidReactor/OVERLAY_FRONT_ACTIVE.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/FluidReactor/OVERLAY_FRONT_ACTIVE.png.mcmeta index 1367b80758..1367b80758 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/FluidReactor/OVERLAY_FRONT_ACTIVE.png.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/FluidReactor/OVERLAY_FRONT_ACTIVE.png.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/FluidReactor/OVERLAY_SIDE.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/FluidReactor/OVERLAY_SIDE.png Binary files differindex b926eb1ef2..b926eb1ef2 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/FluidReactor/OVERLAY_SIDE.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/FluidReactor/OVERLAY_SIDE.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/FluidReactor/OVERLAY_SIDE_ACTIVE.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/FluidReactor/OVERLAY_SIDE_ACTIVE.png Binary files differindex ae63da7746..ae63da7746 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/FluidReactor/OVERLAY_SIDE_ACTIVE.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/FluidReactor/OVERLAY_SIDE_ACTIVE.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/FluidReactor/OVERLAY_SIDE_ACTIVE.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/FluidReactor/OVERLAY_SIDE_ACTIVE.png.mcmeta index 8447c98f9a..8447c98f9a 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/FluidReactor/OVERLAY_SIDE_ACTIVE.png.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/FluidReactor/OVERLAY_SIDE_ACTIVE.png.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/FluidReactor/OVERLAY_TOP.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/FluidReactor/OVERLAY_TOP.png Binary files differindex e9b20bd486..e9b20bd486 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/FluidReactor/OVERLAY_TOP.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/FluidReactor/OVERLAY_TOP.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/FluidReactor/OVERLAY_TOP_ACTIVE.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/FluidReactor/OVERLAY_TOP_ACTIVE.png Binary files differindex 25ea33ce3a..25ea33ce3a 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/FluidReactor/OVERLAY_TOP_ACTIVE.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/FluidReactor/OVERLAY_TOP_ACTIVE.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/Generic_Creative_Texture.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Generic_Creative_Texture.png Binary files differindex a9bed9ce0c..a9bed9ce0c 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/Generic_Creative_Texture.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/Generic_Creative_Texture.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_ADVANCED_CRYOGENIC.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_ADVANCED_CRYOGENIC.png Binary files differindex 7222ca77d7..7222ca77d7 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_ADVANCED_CRYOGENIC.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_ADVANCED_CRYOGENIC.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_ADVANCED_VOLCANUS.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_ADVANCED_VOLCANUS.png Binary files differindex eb7affaa01..eb7affaa01 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_ADVANCED_VOLCANUS.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_ADVANCED_VOLCANUS.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_CENTRIFUGE.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_CENTRIFUGE.png Binary files differindex a650d73983..a650d73983 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_CENTRIFUGE.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_CENTRIFUGE.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_FARM_MANAGER_STRUCTURAL.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_FARM_MANAGER_STRUCTURAL.png Binary files differindex 8a0391538b..8a0391538b 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_FARM_MANAGER_STRUCTURAL.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_FARM_MANAGER_STRUCTURAL.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_FIREBOX_STABALLOY.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_FIREBOX_STABALLOY.png Binary files differindex 22c7cd7978..22c7cd7978 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_FIREBOX_STABALLOY.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_FIREBOX_STABALLOY.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_FLOTATION.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_FLOTATION.png Binary files differindex 5965bfce89..5965bfce89 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_FLOTATION.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_FLOTATION.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_FLUID_INCOLOY_DS.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_FLUID_INCOLOY_DS.png Binary files differindex eb8020f1c9..eb8020f1c9 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_FLUID_INCOLOY_DS.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_FLUID_INCOLOY_DS.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_FUSION_FRONT.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_FUSION_FRONT.png Binary files differindex 05c8741fa7..05c8741fa7 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_FUSION_FRONT.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_FUSION_FRONT.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_FUSION_FRONT_ACTIVE.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_FUSION_FRONT_ACTIVE.png Binary files differindex 4f7290c571..4f7290c571 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_FUSION_FRONT_ACTIVE.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_FUSION_FRONT_ACTIVE.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_GEARBOX_T1.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_GEARBOX_T1.png Binary files differindex df4e3a1a41..df4e3a1a41 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_GEARBOX_T1.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_GEARBOX_T1.png diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_GRINDING_FACTORY.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_GRINDING_FACTORY.png Binary files differnew file mode 100644 index 0000000000..b807fc0465 --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_GRINDING_FACTORY.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_LAURENIUM.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_LAURENIUM.png Binary files differindex 02bd653538..02bd653538 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_LAURENIUM.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_LAURENIUM.png diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_PIPE_T1.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_PIPE_T1.png Binary files differnew file mode 100644 index 0000000000..1b942edfc9 --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_PIPE_T1.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_ROCKETDYNE.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_ROCKETDYNE.png Binary files differindex 89fed025b4..89fed025b4 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_ROCKETDYNE.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_ROCKETDYNE.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_GRISIUM.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_GRISIUM.png Binary files differindex 4a8cbd634c..4a8cbd634c 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_GRISIUM.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_GRISIUM.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_HASTELLOY_N.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_HASTELLOY_N.png Binary files differindex fc2b8c5c89..fc2b8c5c89 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_HASTELLOY_N.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_HASTELLOY_N.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_HASTELLOY_X.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_HASTELLOY_X.png Binary files differindex 7753c1920a..7753c1920a 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_HASTELLOY_X.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_HASTELLOY_X.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_INCOLOY_020.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_INCOLOY_020.png Binary files differindex 373cccb65d..373cccb65d 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_INCOLOY_020.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_INCOLOY_020.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_INCOLOY_DS.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_INCOLOY_DS.png Binary files differindex 52e1a73063..52e1a73063 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_INCOLOY_DS.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_INCOLOY_DS.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_INCOLOY_MA956.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_INCOLOY_MA956.png Binary files differindex ab3a76d006..ab3a76d006 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_INCOLOY_MA956.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_INCOLOY_MA956.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_MARAGINGSTEEL.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_MARAGINGSTEEL.png Binary files differindex 75f21218d9..75f21218d9 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_MARAGINGSTEEL.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_MARAGINGSTEEL.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_POTIN.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_POTIN.png Binary files differindex 05f1cc1d42..05f1cc1d42 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_POTIN.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_POTIN.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_RED_STEEL.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_RED_STEEL.png Binary files differindex 066a926278..066a926278 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_RED_STEEL.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_RED_STEEL.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_STELLITE.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_STELLITE.png Binary files differindex 9ba5c0e255..9ba5c0e255 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_STELLITE.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_STELLITE.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_TALONITE.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_TALONITE.png Binary files differindex 4b707d2ca2..4b707d2ca2 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_TALONITE.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_TALONITE.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_TANTALLOY61.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_TANTALLOY61.png Binary files differindex 64b28d0233..64b28d0233 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_TANTALLOY61.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_TANTALLOY61.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_TRINIUM_NAQUADAH.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_TRINIUM_NAQUADAH.png Binary files differindex 91d3660711..91d3660711 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_TRINIUM_NAQUADAH.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_TRINIUM_NAQUADAH.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_TRINIUM_NAQUADAH_CARBON.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_TRINIUM_NAQUADAH_CARBON.png Binary files differindex c82b335f0c..c82b335f0c 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_TRINIUM_NAQUADAH_CARBON.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_TRINIUM_NAQUADAH_CARBON.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_TRINIUM_NAQUADAH_VENT.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_TRINIUM_NAQUADAH_VENT.png Binary files differindex 6a5dba4448..6a5dba4448 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_TRINIUM_NAQUADAH_VENT.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_TRINIUM_NAQUADAH_VENT.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_TRINIUM_TITANIUM.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_TRINIUM_TITANIUM.png Binary files differindex 651c539c5b..651c539c5b 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_TRINIUM_TITANIUM.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_TRINIUM_TITANIUM.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_TUMBAGA.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_TUMBAGA.png Binary files differindex 1d71c95ea4..1d71c95ea4 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_TUMBAGA.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_TUMBAGA.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_ZERON100.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_ZERON100.png Binary files differindex d6cb89d67d..d6cb89d67d 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_ZERON100.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_ZERON100.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_ZIRCONIUM_CARBIDE.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_ZIRCONIUM_CARBIDE.png Binary files differindex 6c45ff313f..6c45ff313f 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_ZIRCONIUM_CARBIDE.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_ZIRCONIUM_CARBIDE.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_PESTKILLER_TOP.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_PESTKILLER_TOP.png Binary files differindex 2602f44af3..2602f44af3 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_PESTKILLER_TOP.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_PESTKILLER_TOP.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/ModularTable_output.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/ModularTable_output.png Binary files differindex 42c1df75cf..42c1df75cf 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/ModularTable_output.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/ModularTable_output.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/ModularTable_side.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/ModularTable_side.png Binary files differindex 57d9cc6f86..57d9cc6f86 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/ModularTable_side.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/ModularTable_side.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/ModularTable_top.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/ModularTable_top.png Binary files differindex 869b06039f..869b06039f 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/ModularTable_top.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/ModularTable_top.png diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorColdTrap/OVERLAY_FRONT.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorColdTrap/OVERLAY_FRONT.png Binary files differnew file mode 100644 index 0000000000..012c63a088 --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorColdTrap/OVERLAY_FRONT.png diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorColdTrap/OVERLAY_FRONT_ACTIVE.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorColdTrap/OVERLAY_FRONT_ACTIVE.png Binary files differnew file mode 100644 index 0000000000..30856a6284 --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorColdTrap/OVERLAY_FRONT_ACTIVE.png diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorColdTrap/OVERLAY_SIDE.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorColdTrap/OVERLAY_SIDE.png Binary files differnew file mode 100644 index 0000000000..d577f0cbb3 --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorColdTrap/OVERLAY_SIDE.png diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorColdTrap/OVERLAY_SIDE_ACTIVE.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorColdTrap/OVERLAY_SIDE_ACTIVE.png Binary files differnew file mode 100644 index 0000000000..e41790f90f --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorColdTrap/OVERLAY_SIDE_ACTIVE.png diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorColdTrap/OVERLAY_SIDE_ACTIVE.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorColdTrap/OVERLAY_SIDE_ACTIVE.png.mcmeta new file mode 100644 index 0000000000..f4cce85820 --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorColdTrap/OVERLAY_SIDE_ACTIVE.png.mcmeta @@ -0,0 +1,6 @@ +{ + "animation":{ + "frametime":5, + "frames": [0, 1, 2, 3, 2, 1] + } +}
\ No newline at end of file diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorColdTrap/OVERLAY_TOP.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorColdTrap/OVERLAY_TOP.png Binary files differnew file mode 100644 index 0000000000..e9b20bd486 --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorColdTrap/OVERLAY_TOP.png diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorColdTrap/OVERLAY_TOP_ACTIVE.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorColdTrap/OVERLAY_TOP_ACTIVE.png Binary files differnew file mode 100644 index 0000000000..4469a809e9 --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorColdTrap/OVERLAY_TOP_ACTIVE.png diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorProcessingUnit/OVERLAY_FRONT.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorProcessingUnit/OVERLAY_FRONT.png Binary files differnew file mode 100644 index 0000000000..b7a77be826 --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorProcessingUnit/OVERLAY_FRONT.png diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorProcessingUnit/OVERLAY_FRONT_ACTIVE.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorProcessingUnit/OVERLAY_FRONT_ACTIVE.png Binary files differnew file mode 100644 index 0000000000..8a47157d2b --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorProcessingUnit/OVERLAY_FRONT_ACTIVE.png diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorProcessingUnit/OVERLAY_FRONT_ACTIVE.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorProcessingUnit/OVERLAY_FRONT_ACTIVE.png.mcmeta new file mode 100644 index 0000000000..1367b80758 --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorProcessingUnit/OVERLAY_FRONT_ACTIVE.png.mcmeta @@ -0,0 +1,6 @@ +{ + "animation":{ + "frametime":2, + "frames": [0, 0, 1, 1, 2, 2, 3, 3, 3, 2, 2, 1, 1, 0] + } +}
\ No newline at end of file diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorProcessingUnit/OVERLAY_SIDE.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorProcessingUnit/OVERLAY_SIDE.png Binary files differnew file mode 100644 index 0000000000..671bbd7d97 --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorProcessingUnit/OVERLAY_SIDE.png diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorProcessingUnit/OVERLAY_SIDE_ACTIVE.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorProcessingUnit/OVERLAY_SIDE_ACTIVE.png Binary files differnew file mode 100644 index 0000000000..ae63da7746 --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorProcessingUnit/OVERLAY_SIDE_ACTIVE.png diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorProcessingUnit/OVERLAY_SIDE_ACTIVE.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorProcessingUnit/OVERLAY_SIDE_ACTIVE.png.mcmeta new file mode 100644 index 0000000000..8447c98f9a --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorProcessingUnit/OVERLAY_SIDE_ACTIVE.png.mcmeta @@ -0,0 +1,6 @@ +{ + "animation":{ + "frametime":2, + "frames": [0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 7, 7, 6, 6, 5, 5, 4, 4, 3, 3, 2, 2, 1, 1, 0, 0] + } +}
\ No newline at end of file diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorProcessingUnit/OVERLAY_TOP.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorProcessingUnit/OVERLAY_TOP.png Binary files differnew file mode 100644 index 0000000000..a9ab34e963 --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorProcessingUnit/OVERLAY_TOP.png diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorProcessingUnit/OVERLAY_TOP_ACTIVE.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorProcessingUnit/OVERLAY_TOP_ACTIVE.png Binary files differnew file mode 100644 index 0000000000..8a5c131623 --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/ReactorProcessingUnit/OVERLAY_TOP_ACTIVE.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/MACHINE_CASING_VENT.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/MACHINE_CASING_VENT.png Binary files differindex 6d9fb32d7e..6d9fb32d7e 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/MACHINE_CASING_VENT.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/MACHINE_CASING_VENT.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Side_0.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Side_0.png Binary files differindex cbf604f2b3..cbf604f2b3 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Side_0.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Side_0.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Side_1.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Side_1.png Binary files differindex 3b7ac3d50e..3b7ac3d50e 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Side_1.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Side_1.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Side_2.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Side_2.png Binary files differindex a5a5e2c559..a5a5e2c559 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Side_2.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Side_2.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Side_3.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Side_3.png Binary files differindex b68c900ddd..b68c900ddd 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Side_3.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Side_3.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Side_4.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Side_4.png Binary files differindex df182aeaa5..df182aeaa5 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Side_4.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Side_4.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Top_0.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Top_0.png Binary files differindex 85bc3f16cd..85bc3f16cd 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Top_0.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Top_0.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Top_1.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Top_1.png Binary files differindex f82185ebdb..f82185ebdb 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Top_1.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Top_1.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Top_2.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Top_2.png Binary files differindex 345476e03c..345476e03c 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Top_2.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Top_2.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Top_3.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Top_3.png Binary files differindex 971164eb3e..971164eb3e 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Top_3.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Top_3.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Top_4.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Top_4.png Binary files differindex 5b5bac3ad2..5b5bac3ad2 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Top_4.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/RoundRobinator/Top_4.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/STEAM_TURBINE_SIDE_ACTIVE.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/STEAM_TURBINE_SIDE_ACTIVE.png Binary files differindex 8ae37e61d4..8ae37e61d4 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/STEAM_TURBINE_SIDE_ACTIVE.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/STEAM_TURBINE_SIDE_ACTIVE.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/STEAM_TURBINE_SIDE_ACTIVE.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/STEAM_TURBINE_SIDE_ACTIVE.png.mcmeta index dfae8cae16..dfae8cae16 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/STEAM_TURBINE_SIDE_ACTIVE.png.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/STEAM_TURBINE_SIDE_ACTIVE.png.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/_PlaceHolder.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/_PlaceHolder.png Binary files differindex 9dc63e146e..9dc63e146e 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/_PlaceHolder.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/_PlaceHolder.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_dimensional.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_dimensional.png Binary files differindex d391da4eaf..d391da4eaf 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_dimensional.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_dimensional.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_dimensional.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_dimensional.png.mcmeta index 60af678259..60af678259 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_dimensional.png.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_dimensional.png.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_dimensional_cover_blue.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_dimensional_cover_blue.png Binary files differindex ce051d468c..ce051d468c 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_dimensional_cover_blue.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_dimensional_cover_blue.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_dimensional_cover_blue.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_dimensional_cover_blue.png.mcmeta index 60af678259..60af678259 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_dimensional_cover_blue.png.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_dimensional_cover_blue.png.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_dimensional_cover_orange.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_dimensional_cover_orange.png Binary files differindex 9d454b17d4..9d454b17d4 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_dimensional_cover_orange.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_dimensional_cover_orange.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_dimensional_cover_orange.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_dimensional_cover_orange.png.mcmeta index 60af678259..60af678259 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_dimensional_cover_orange.png.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_dimensional_cover_orange.png.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_lesu.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_lesu.png Binary files differindex d5f23d447f..d5f23d447f 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_lesu.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_lesu.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_matterfab.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_matterfab.png Binary files differindex 5a4f23d3ea..5a4f23d3ea 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_matterfab.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_matterfab.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_matterfab_active.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_matterfab_active.png Binary files differindex d40c95f3aa..d40c95f3aa 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_matterfab_active.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_matterfab_active.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_matterfab_active_animated.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_matterfab_active_animated.png Binary files differindex 69330145ba..69330145ba 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_matterfab_active_animated.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_matterfab_active_animated.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_matterfab_active_animated.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_matterfab_active_animated.png.mcmeta index 49e988e8bb..49e988e8bb 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_matterfab_active_animated.png.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_matterfab_active_animated.png.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_matterfab_animated.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_matterfab_animated.png Binary files differindex 2af5057b3d..2af5057b3d 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_matterfab_animated.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_matterfab_animated.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_matterfab_animated.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_matterfab_animated.png.mcmeta index 49e988e8bb..49e988e8bb 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_matterfab_animated.png.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_matterfab_animated.png.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_oil.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_oil.png Binary files differindex a8a857b5b8..a8a857b5b8 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_oil.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_oil.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_screen_frequency.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_screen_frequency.png Binary files differindex fc9c6e5d8a..fc9c6e5d8a 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_screen_frequency.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_screen_frequency.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_screen_logo.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_screen_logo.png Binary files differindex 695451fafc..695451fafc 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_screen_logo.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_screen_logo.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_screen_logo.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_screen_logo.png.mcmeta index 19b79a1e22..19b79a1e22 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_screen_logo.png.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_screen_logo.png.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_screen_random1.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_screen_random1.png Binary files differindex 7157b7541d..7157b7541d 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_screen_random1.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_screen_random1.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_screen_random1.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_screen_random1.png.mcmeta index 60af678259..60af678259 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_screen_random1.png.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_screen_random1.png.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_screen_random2.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_screen_random2.png Binary files differindex 7157b7541d..7157b7541d 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_screen_random2.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_screen_random2.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_screen_random2.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_screen_random2.png.mcmeta index 97596ba817..97596ba817 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_screen_random2.png.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_screen_random2.png.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_screen_random3.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_screen_random3.png Binary files differindex 7157b7541d..7157b7541d 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_screen_random3.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_screen_random3.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_screen_random3.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_screen_random3.png.mcmeta index dfae8cae16..dfae8cae16 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_screen_random3.png.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_screen_random3.png.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_uum.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_uum.png Binary files differindex 6a1894756d..6a1894756d 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_uum.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_uum.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_vent_rotating.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_vent_rotating.png Binary files differindex c9663bf711..c9663bf711 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_vent_rotating.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_vent_rotating.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_vent_rotating.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_vent_rotating.png.mcmeta index dfae8cae16..dfae8cae16 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_vent_rotating.png.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_vent_rotating.png.mcmeta diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_water.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_water.png Binary files differnew file mode 100644 index 0000000000..3351f5d0a6 --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/adv_machine_water.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/audio_out.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/audio_out.png Binary files differindex 7037204d20..7037204d20 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/audio_out.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/audio_out.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/audio_out_active.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/audio_out_active.png Binary files differindex 600def1e1b..600def1e1b 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/audio_out_active.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/audio_out_active.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/audio_out_active.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/audio_out_active.png.mcmeta index dfae8cae16..dfae8cae16 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/audio_out_active.png.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/audio_out_active.png.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/bronze_side.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/bronze_side.png Binary files differindex 652245a61c..652245a61c 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/bronze_side.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/bronze_side.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/bronze_side_cabinet.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/bronze_side_cabinet.png Binary files differindex 455264cffa..455264cffa 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/bronze_side_cabinet.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/bronze_side_cabinet.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/bronze_top_crafting.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/bronze_top_crafting.png Binary files differindex eeb0bae10f..eeb0bae10f 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/bronze_top_crafting.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/bronze_top_crafting.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/cover_charger.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/cover_charger.png Binary files differindex 386f3c8e67..386f3c8e67 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/cover_charger.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/cover_charger.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/cover_crafting.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/cover_crafting.png Binary files differindex a61413240b..a61413240b 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/cover_crafting.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/cover_crafting.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/cover_discharge.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/cover_discharge.png Binary files differindex 26b3b1e4c1..26b3b1e4c1 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/cover_discharge.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/cover_discharge.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/cover_redstone_conductor.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/cover_redstone_conductor.png Binary files differindex 72e8c12c07..72e8c12c07 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/cover_redstone_conductor.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/cover_redstone_conductor.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/cover_redstone_emitter.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/cover_redstone_emitter.png Binary files differindex 148d5e4955..148d5e4955 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/cover_redstone_emitter.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/cover_redstone_emitter.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/dirt_podzol_top.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/dirt_podzol_top.png Binary files differindex ebeda86aa0..ebeda86aa0 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/dirt_podzol_top.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/dirt_podzol_top.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/fishtrap.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/fishtrap.png Binary files differindex a0767f7836..a0767f7836 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/fishtrap.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/fishtrap.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/gt4/machine_bottom.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/machine_bottom.png Binary files differindex ba45c43891..ba45c43891 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/gt4/machine_bottom.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/machine_bottom.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/gt4/machine_side.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/machine_side.png Binary files differindex 9fd8c3be81..9fd8c3be81 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/gt4/machine_side.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/machine_side.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/gt4/machine_side_cabinet.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/machine_side_cabinet.png Binary files differindex 6f1e9c0664..6f1e9c0664 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/gt4/machine_side_cabinet.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/machine_side_cabinet.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/gt4/machine_top.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/machine_top.png Binary files differindex 815ad92daf..815ad92daf 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/gt4/machine_top.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/gt4/machine_top.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/high_adv_machine.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/high_adv_machine.png Binary files differindex c594b58add..c594b58add 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/high_adv_machine.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/high_adv_machine.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/high_adv_machine_dimensional.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/high_adv_machine_dimensional.png Binary files differindex fe779e8a9e..fe779e8a9e 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/high_adv_machine_dimensional.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/high_adv_machine_dimensional.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/high_adv_machine_dimensional.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/high_adv_machine_dimensional.png.mcmeta index 60af678259..60af678259 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/high_adv_machine_dimensional.png.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/high_adv_machine_dimensional.png.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/log_acacia_top.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/log_acacia_top.png Binary files differindex 68b4e3e9c2..68b4e3e9c2 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/log_acacia_top.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/log_acacia_top.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/machine_bottom.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/machine_bottom.png Binary files differindex ba45c43891..ba45c43891 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/machine_bottom.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/machine_bottom.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/machine_top.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/machine_top.png Binary files differindex 815ad92daf..815ad92daf 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/machine_top.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/machine_top.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/machine_top_dieselmotor.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/machine_top_dieselmotor.png Binary files differindex 3bd3092cc0..3bd3092cc0 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/machine_top_dieselmotor.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/machine_top_dieselmotor.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/machine_top_dieselmotor2.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/machine_top_dieselmotor2.png Binary files differindex e402d9b6d0..e402d9b6d0 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/machine_top_dieselmotor2.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/machine_top_dieselmotor2.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/machine_top_dieselmotor2_active.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/machine_top_dieselmotor2_active.png Binary files differindex 975f4aed86..975f4aed86 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/machine_top_dieselmotor2_active.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/machine_top_dieselmotor2_active.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/machine_top_dieselmotor2_active.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/machine_top_dieselmotor2_active.png.mcmeta index 97596ba817..97596ba817 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/machine_top_dieselmotor2_active.png.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/machine_top_dieselmotor2_active.png.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/machine_top_dieselmotor_active.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/machine_top_dieselmotor_active.png Binary files differindex bf1cb0e6a5..bf1cb0e6a5 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/machine_top_dieselmotor_active.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/machine_top_dieselmotor_active.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/machine_top_dieselmotor_active.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/machine_top_dieselmotor_active.png.mcmeta index 97596ba817..97596ba817 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/machine_top_dieselmotor_active.png.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/machine_top_dieselmotor_active.png.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/machine_top_vent_rotating.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/machine_top_vent_rotating.png Binary files differindex 3256b41734..3256b41734 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/machine_top_vent_rotating.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/machine_top_vent_rotating.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/machine_top_vent_rotating.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/machine_top_vent_rotating.png.mcmeta index 5e86a7cd5f..5e86a7cd5f 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/machine_top_vent_rotating.png.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/machine_top_vent_rotating.png.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/machine_top_vent_rotating_fast.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/machine_top_vent_rotating_fast.png Binary files differindex 3256b41734..3256b41734 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/machine_top_vent_rotating_fast.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/machine_top_vent_rotating_fast.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/machine_top_vent_rotating_fast.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/machine_top_vent_rotating_fast.png.mcmeta index dfae8cae16..dfae8cae16 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/machine_top_vent_rotating_fast.png.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/machine_top_vent_rotating_fast.png.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/sewer_adv_sides.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/sewer_adv_sides.png Binary files differindex a8e497ec01..a8e497ec01 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/sewer_adv_sides.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/sewer_adv_sides.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/sewer_adv_top.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/sewer_adv_top.png Binary files differindex 34d35b44e3..34d35b44e3 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/sewer_adv_top.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/sewer_adv_top.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/sewer_sides.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/sewer_sides.png Binary files differindex 1754172689..1754172689 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/sewer_sides.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/sewer_sides.png diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/sewer_top.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/sewer_top.png Binary files differindex 4835240aee..4835240aee 100644 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/sewer_top.png +++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/sewer_top.png diff --git a/src/resources/assets/miscutils/textures/blocks/blockAntiGrief.png b/src/main/resources/assets/miscutils/textures/blocks/blockAntiGrief.png Binary files differindex 4168d9d934..4168d9d934 100644 --- a/src/resources/assets/miscutils/textures/blocks/blockAntiGrief.png +++ b/src/main/resources/assets/miscutils/textures/blocks/blockAntiGrief.png diff --git a/src/resources/assets/miscutils/textures/blocks/blockBlock.png b/src/main/resources/assets/miscutils/textures/blocks/blockBlock.png Binary files differindex 1276f5fa24..1276f5fa24 100644 --- a/src/resources/assets/miscutils/textures/blocks/blockBlock.png +++ b/src/main/resources/assets/miscutils/textures/blocks/blockBlock.png diff --git a/src/resources/assets/miscutils/textures/blocks/blockBloodSteel.png b/src/main/resources/assets/miscutils/textures/blocks/blockBloodSteel.png Binary files differindex d23f8721e4..d23f8721e4 100644 --- a/src/resources/assets/miscutils/textures/blocks/blockBloodSteel.png +++ b/src/main/resources/assets/miscutils/textures/blocks/blockBloodSteel.png diff --git a/src/resources/assets/miscutils/textures/blocks/blockDefault.png b/src/main/resources/assets/miscutils/textures/blocks/blockDefault.png Binary files differindex 84a6b68e0e..84a6b68e0e 100644 --- a/src/resources/assets/miscutils/textures/blocks/blockDefault.png +++ b/src/main/resources/assets/miscutils/textures/blocks/blockDefault.png diff --git a/src/resources/assets/miscutils/textures/blocks/blockFrameGt.png b/src/main/resources/assets/miscutils/textures/blocks/blockFrameGt.png Binary files differindex 56a56cf752..56a56cf752 100644 --- a/src/resources/assets/miscutils/textures/blocks/blockFrameGt.png +++ b/src/main/resources/assets/miscutils/textures/blocks/blockFrameGt.png diff --git a/src/resources/assets/miscutils/textures/blocks/blockMFEffect.png b/src/main/resources/assets/miscutils/textures/blocks/blockMFEffect.png Binary files differindex 8e48e12070..8e48e12070 100644 --- a/src/resources/assets/miscutils/textures/blocks/blockMFEffect.png +++ b/src/main/resources/assets/miscutils/textures/blocks/blockMFEffect.png diff --git a/src/resources/assets/miscutils/textures/blocks/blockNuclearFueledHeliumGenerator.png b/src/main/resources/assets/miscutils/textures/blocks/blockNuclearFueledHeliumGenerator.png Binary files differindex f5f51c7175..f5f51c7175 100644 --- a/src/resources/assets/miscutils/textures/blocks/blockNuclearFueledHeliumGenerator.png +++ b/src/main/resources/assets/miscutils/textures/blocks/blockNuclearFueledHeliumGenerator.png diff --git a/src/resources/assets/miscutils/textures/blocks/blockOre_Overlay.png b/src/main/resources/assets/miscutils/textures/blocks/blockOre_Overlay.png Binary files differindex b7155ba3dc..b7155ba3dc 100644 --- a/src/resources/assets/miscutils/textures/blocks/blockOre_Overlay.png +++ b/src/main/resources/assets/miscutils/textures/blocks/blockOre_Overlay.png diff --git a/src/resources/assets/miscutils/textures/blocks/blockStaballoy.png b/src/main/resources/assets/miscutils/textures/blocks/blockStaballoy.png Binary files differindex 84a6b68e0e..84a6b68e0e 100644 --- a/src/resources/assets/miscutils/textures/blocks/blockStaballoy.png +++ b/src/main/resources/assets/miscutils/textures/blocks/blockStaballoy.png diff --git a/src/resources/assets/miscutils/textures/blocks/blockStone.png b/src/main/resources/assets/miscutils/textures/blocks/blockStone.png Binary files differindex 87e19ff46b..87e19ff46b 100644 --- a/src/resources/assets/miscutils/textures/blocks/blockStone.png +++ b/src/main/resources/assets/miscutils/textures/blocks/blockStone.png diff --git a/src/resources/assets/miscutils/textures/blocks/chrono/CyberPanel.png b/src/main/resources/assets/miscutils/textures/blocks/chrono/CyberPanel.png Binary files differindex 6761aa4773..6761aa4773 100644 --- a/src/resources/assets/miscutils/textures/blocks/chrono/CyberPanel.png +++ b/src/main/resources/assets/miscutils/textures/blocks/chrono/CyberPanel.png diff --git a/src/resources/assets/miscutils/textures/blocks/chrono/CyberPanel2.png b/src/main/resources/assets/miscutils/textures/blocks/chrono/CyberPanel2.png Binary files differindex befbe80c9f..befbe80c9f 100644 --- a/src/resources/assets/miscutils/textures/blocks/chrono/CyberPanel2.png +++ b/src/main/resources/assets/miscutils/textures/blocks/chrono/CyberPanel2.png diff --git a/src/resources/assets/miscutils/textures/blocks/chrono/MetalFunnel.png b/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalFunnel.png Binary files differindex e52a1b11dc..e52a1b11dc 100644 --- a/src/resources/assets/miscutils/textures/blocks/chrono/MetalFunnel.png +++ b/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalFunnel.png diff --git a/src/resources/assets/miscutils/textures/blocks/chrono/MetalGrate.png b/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalGrate.png Binary files differindex b24e8657f8..b24e8657f8 100644 --- a/src/resources/assets/miscutils/textures/blocks/chrono/MetalGrate.png +++ b/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalGrate.png diff --git a/src/resources/assets/miscutils/textures/blocks/chrono/MetalGrate2.png b/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalGrate2.png Binary files differindex 4f84e52ab1..4f84e52ab1 100644 --- a/src/resources/assets/miscutils/textures/blocks/chrono/MetalGrate2.png +++ b/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalGrate2.png diff --git a/src/resources/assets/miscutils/textures/blocks/chrono/MetalGrate3.png b/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalGrate3.png Binary files differindex ba4f079ba9..ba4f079ba9 100644 --- a/src/resources/assets/miscutils/textures/blocks/chrono/MetalGrate3.png +++ b/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalGrate3.png diff --git a/src/resources/assets/miscutils/textures/blocks/chrono/MetalGrateA_Solid.png b/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalGrateA_Solid.png Binary files differindex 28b1b4dbed..28b1b4dbed 100644 --- a/src/resources/assets/miscutils/textures/blocks/chrono/MetalGrateA_Solid.png +++ b/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalGrateA_Solid.png diff --git a/src/resources/assets/miscutils/textures/blocks/chrono/MetalPanel.png b/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalPanel.png Binary files differindex 2c56924c8b..2c56924c8b 100644 --- a/src/resources/assets/miscutils/textures/blocks/chrono/MetalPanel.png +++ b/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalPanel.png diff --git a/src/resources/assets/miscutils/textures/blocks/chrono/MetalSheet.png b/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet.png Binary files differindex 223ae1cad3..223ae1cad3 100644 --- a/src/resources/assets/miscutils/textures/blocks/chrono/MetalSheet.png +++ b/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet.png diff --git a/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet10.png b/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet10.png Binary files differnew file mode 100644 index 0000000000..8d56915ff2 --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet10.png diff --git a/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet11.png b/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet11.png Binary files differnew file mode 100644 index 0000000000..a08f7e1c25 --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet11.png diff --git a/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet12.png b/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet12.png Binary files differnew file mode 100644 index 0000000000..46c385c4ea --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet12.png diff --git a/src/resources/assets/miscutils/textures/blocks/chrono/MetalSheet2.png b/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet2.png Binary files differindex 951871ce12..951871ce12 100644 --- a/src/resources/assets/miscutils/textures/blocks/chrono/MetalSheet2.png +++ b/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet2.png diff --git a/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet3.png b/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet3.png Binary files differnew file mode 100644 index 0000000000..1e9356ba6c --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet3.png diff --git a/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet4.png b/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet4.png Binary files differnew file mode 100644 index 0000000000..f555273f65 --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet4.png diff --git a/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet5.png b/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet5.png Binary files differnew file mode 100644 index 0000000000..6a1c62579d --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet5.png diff --git a/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet6.png b/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet6.png Binary files differnew file mode 100644 index 0000000000..e93c9c35c2 --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet6.png diff --git a/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet7.png b/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet7.png Binary files differnew file mode 100644 index 0000000000..1952b3d14e --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet7.png diff --git a/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet8.png b/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet8.png Binary files differnew file mode 100644 index 0000000000..5307adb9f5 --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet8.png diff --git a/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet9.png b/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet9.png Binary files differnew file mode 100644 index 0000000000..4862094cbd --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet9.png diff --git a/src/resources/assets/miscutils/textures/blocks/chrono/Overlay_Cyber.png b/src/main/resources/assets/miscutils/textures/blocks/chrono/Overlay_Cyber.png Binary files differindex 0d32fdeec8..0d32fdeec8 100644 --- a/src/resources/assets/miscutils/textures/blocks/chrono/Overlay_Cyber.png +++ b/src/main/resources/assets/miscutils/textures/blocks/chrono/Overlay_Cyber.png diff --git a/src/resources/assets/miscutils/textures/blocks/clear_flow.png b/src/main/resources/assets/miscutils/textures/blocks/clear_flow.png Binary files differindex 84a6b68e0e..84a6b68e0e 100644 --- a/src/resources/assets/miscutils/textures/blocks/clear_flow.png +++ b/src/main/resources/assets/miscutils/textures/blocks/clear_flow.png diff --git a/src/resources/assets/miscutils/textures/blocks/clear_still.png b/src/main/resources/assets/miscutils/textures/blocks/clear_still.png Binary files differindex 84a6b68e0e..84a6b68e0e 100644 --- a/src/resources/assets/miscutils/textures/blocks/clear_still.png +++ b/src/main/resources/assets/miscutils/textures/blocks/clear_still.png diff --git a/src/resources/assets/miscutils/textures/blocks/compressed/obsidian1.png b/src/main/resources/assets/miscutils/textures/blocks/compressed/obsidian1.png Binary files differindex 0970b27745..0970b27745 100644 --- a/src/resources/assets/miscutils/textures/blocks/compressed/obsidian1.png +++ b/src/main/resources/assets/miscutils/textures/blocks/compressed/obsidian1.png diff --git a/src/resources/assets/miscutils/textures/blocks/compressed/obsidian2.png b/src/main/resources/assets/miscutils/textures/blocks/compressed/obsidian2.png Binary files differindex 6cf79c75c4..6cf79c75c4 100644 --- a/src/resources/assets/miscutils/textures/blocks/compressed/obsidian2.png +++ b/src/main/resources/assets/miscutils/textures/blocks/compressed/obsidian2.png diff --git a/src/resources/assets/miscutils/textures/blocks/compressed/obsidian3.png b/src/main/resources/assets/miscutils/textures/blocks/compressed/obsidian3.png Binary files differindex 0cf85541e4..0cf85541e4 100644 --- a/src/resources/assets/miscutils/textures/blocks/compressed/obsidian3.png +++ b/src/main/resources/assets/miscutils/textures/blocks/compressed/obsidian3.png diff --git a/src/resources/assets/miscutils/textures/blocks/compressed/obsidian4.png b/src/main/resources/assets/miscutils/textures/blocks/compressed/obsidian4.png Binary files differindex 4d9c3d2f67..4d9c3d2f67 100644 --- a/src/resources/assets/miscutils/textures/blocks/compressed/obsidian4.png +++ b/src/main/resources/assets/miscutils/textures/blocks/compressed/obsidian4.png diff --git a/src/resources/assets/miscutils/textures/blocks/compressed/obsidian5.png b/src/main/resources/assets/miscutils/textures/blocks/compressed/obsidian5.png Binary files differindex 149ae598d0..149ae598d0 100644 --- a/src/resources/assets/miscutils/textures/blocks/compressed/obsidian5.png +++ b/src/main/resources/assets/miscutils/textures/blocks/compressed/obsidian5.png diff --git a/src/resources/assets/miscutils/textures/blocks/compressed/obsidian_invert.png b/src/main/resources/assets/miscutils/textures/blocks/compressed/obsidian_invert.png Binary files differindex 8c55fdddd3..8c55fdddd3 100644 --- a/src/resources/assets/miscutils/textures/blocks/compressed/obsidian_invert.png +++ b/src/main/resources/assets/miscutils/textures/blocks/compressed/obsidian_invert.png diff --git a/src/resources/assets/miscutils/textures/blocks/crop/blockCrop.Hemp.1.png b/src/main/resources/assets/miscutils/textures/blocks/crop/blockCrop.Hemp.1.png Binary files differindex 8c5f1ec338..8c5f1ec338 100644 --- a/src/resources/assets/miscutils/textures/blocks/crop/blockCrop.Hemp.1.png +++ b/src/main/resources/assets/miscutils/textures/blocks/crop/blockCrop.Hemp.1.png diff --git a/src/resources/assets/miscutils/textures/blocks/crop/blockCrop.Hemp.2.png b/src/main/resources/assets/miscutils/textures/blocks/crop/blockCrop.Hemp.2.png Binary files differindex 75ff7b2558..75ff7b2558 100644 --- a/src/resources/assets/miscutils/textures/blocks/crop/blockCrop.Hemp.2.png +++ b/src/main/resources/assets/miscutils/textures/blocks/crop/blockCrop.Hemp.2.png diff --git a/src/resources/assets/miscutils/textures/blocks/crop/blockCrop.Hemp.3.png b/src/main/resources/assets/miscutils/textures/blocks/crop/blockCrop.Hemp.3.png Binary files differindex edcfc53edd..edcfc53edd 100644 --- a/src/resources/assets/miscutils/textures/blocks/crop/blockCrop.Hemp.3.png +++ b/src/main/resources/assets/miscutils/textures/blocks/crop/blockCrop.Hemp.3.png diff --git a/src/resources/assets/miscutils/textures/blocks/crop/blockCrop.Hemp.4.png b/src/main/resources/assets/miscutils/textures/blocks/crop/blockCrop.Hemp.4.png Binary files differindex 8176e98807..8176e98807 100644 --- a/src/resources/assets/miscutils/textures/blocks/crop/blockCrop.Hemp.4.png +++ b/src/main/resources/assets/miscutils/textures/blocks/crop/blockCrop.Hemp.4.png diff --git a/src/resources/assets/miscutils/textures/blocks/crop/blockCrop.Hemp.5.png b/src/main/resources/assets/miscutils/textures/blocks/crop/blockCrop.Hemp.5.png Binary files differindex 0737748bb9..0737748bb9 100644 --- a/src/resources/assets/miscutils/textures/blocks/crop/blockCrop.Hemp.5.png +++ b/src/main/resources/assets/miscutils/textures/blocks/crop/blockCrop.Hemp.5.png diff --git a/src/resources/assets/miscutils/textures/blocks/door_cactus_lower.png b/src/main/resources/assets/miscutils/textures/blocks/door_cactus_lower.png Binary files differindex 2beea822b4..2beea822b4 100644 --- a/src/resources/assets/miscutils/textures/blocks/door_cactus_lower.png +++ b/src/main/resources/assets/miscutils/textures/blocks/door_cactus_lower.png diff --git a/src/resources/assets/miscutils/textures/blocks/door_cactus_upper.png b/src/main/resources/assets/miscutils/textures/blocks/door_cactus_upper.png Binary files differindex 75ddf4ddfe..75ddf4ddfe 100644 --- a/src/resources/assets/miscutils/textures/blocks/door_cactus_upper.png +++ b/src/main/resources/assets/miscutils/textures/blocks/door_cactus_upper.png diff --git a/src/resources/assets/miscutils/textures/blocks/door_glass_lower.png b/src/main/resources/assets/miscutils/textures/blocks/door_glass_lower.png Binary files differindex 29d3ebf7ad..29d3ebf7ad 100644 --- a/src/resources/assets/miscutils/textures/blocks/door_glass_lower.png +++ b/src/main/resources/assets/miscutils/textures/blocks/door_glass_lower.png diff --git a/src/resources/assets/miscutils/textures/blocks/door_glass_upper.png b/src/main/resources/assets/miscutils/textures/blocks/door_glass_upper.png Binary files differindex 9cb8b98946..9cb8b98946 100644 --- a/src/resources/assets/miscutils/textures/blocks/door_glass_upper.png +++ b/src/main/resources/assets/miscutils/textures/blocks/door_glass_upper.png diff --git a/src/resources/assets/miscutils/textures/blocks/door_ice_lower.png b/src/main/resources/assets/miscutils/textures/blocks/door_ice_lower.png Binary files differindex c80ab691f1..c80ab691f1 100644 --- a/src/resources/assets/miscutils/textures/blocks/door_ice_lower.png +++ b/src/main/resources/assets/miscutils/textures/blocks/door_ice_lower.png diff --git a/src/resources/assets/miscutils/textures/blocks/door_ice_upper.png b/src/main/resources/assets/miscutils/textures/blocks/door_ice_upper.png Binary files differindex f647ed3621..f647ed3621 100644 --- a/src/resources/assets/miscutils/textures/blocks/door_ice_upper.png +++ b/src/main/resources/assets/miscutils/textures/blocks/door_ice_upper.png diff --git a/src/resources/assets/miscutils/textures/blocks/fluid/Fluid_Cryotheum_Flow.png b/src/main/resources/assets/miscutils/textures/blocks/fluid/Fluid_Cryotheum_Flow.png Binary files differindex 6ea5b4c515..6ea5b4c515 100644 --- a/src/resources/assets/miscutils/textures/blocks/fluid/Fluid_Cryotheum_Flow.png +++ b/src/main/resources/assets/miscutils/textures/blocks/fluid/Fluid_Cryotheum_Flow.png diff --git a/src/resources/assets/miscutils/textures/blocks/fluid/Fluid_Cryotheum_Flow.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/fluid/Fluid_Cryotheum_Flow.png.mcmeta index 70cc4d313c..70cc4d313c 100644 --- a/src/resources/assets/miscutils/textures/blocks/fluid/Fluid_Cryotheum_Flow.png.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/fluid/Fluid_Cryotheum_Flow.png.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/fluid/Fluid_Cryotheum_Still.png b/src/main/resources/assets/miscutils/textures/blocks/fluid/Fluid_Cryotheum_Still.png Binary files differindex 7f1f2aa712..7f1f2aa712 100644 --- a/src/resources/assets/miscutils/textures/blocks/fluid/Fluid_Cryotheum_Still.png +++ b/src/main/resources/assets/miscutils/textures/blocks/fluid/Fluid_Cryotheum_Still.png diff --git a/src/resources/assets/miscutils/textures/blocks/fluid/Fluid_Cryotheum_Still.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/fluid/Fluid_Cryotheum_Still.png.mcmeta index aa41c3d5c8..aa41c3d5c8 100644 --- a/src/resources/assets/miscutils/textures/blocks/fluid/Fluid_Cryotheum_Still.png.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/fluid/Fluid_Cryotheum_Still.png.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/fluid/Fluid_Ender_Flow.png b/src/main/resources/assets/miscutils/textures/blocks/fluid/Fluid_Ender_Flow.png Binary files differindex b24939367a..b24939367a 100644 --- a/src/resources/assets/miscutils/textures/blocks/fluid/Fluid_Ender_Flow.png +++ b/src/main/resources/assets/miscutils/textures/blocks/fluid/Fluid_Ender_Flow.png diff --git a/src/resources/assets/miscutils/textures/blocks/fluid/Fluid_Ender_Flow.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/fluid/Fluid_Ender_Flow.png.mcmeta index 7e77c64858..7e77c64858 100644 --- a/src/resources/assets/miscutils/textures/blocks/fluid/Fluid_Ender_Flow.png.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/fluid/Fluid_Ender_Flow.png.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/fluid/Fluid_Ender_Still.png b/src/main/resources/assets/miscutils/textures/blocks/fluid/Fluid_Ender_Still.png Binary files differindex 3fb18d9c00..3fb18d9c00 100644 --- a/src/resources/assets/miscutils/textures/blocks/fluid/Fluid_Ender_Still.png +++ b/src/main/resources/assets/miscutils/textures/blocks/fluid/Fluid_Ender_Still.png diff --git a/src/resources/assets/miscutils/textures/blocks/fluid/Fluid_Ender_Still.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/fluid/Fluid_Ender_Still.png.mcmeta index 4fadce8aff..4fadce8aff 100644 --- a/src/resources/assets/miscutils/textures/blocks/fluid/Fluid_Ender_Still.png.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/fluid/Fluid_Ender_Still.png.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/fluid/Fluid_Pyrotheum_Flow.png b/src/main/resources/assets/miscutils/textures/blocks/fluid/Fluid_Pyrotheum_Flow.png Binary files differindex fa4fa813bf..fa4fa813bf 100644 --- a/src/resources/assets/miscutils/textures/blocks/fluid/Fluid_Pyrotheum_Flow.png +++ b/src/main/resources/assets/miscutils/textures/blocks/fluid/Fluid_Pyrotheum_Flow.png diff --git a/src/resources/assets/miscutils/textures/blocks/fluid/Fluid_Pyrotheum_Flow.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/fluid/Fluid_Pyrotheum_Flow.png.mcmeta index 70cc4d313c..70cc4d313c 100644 --- a/src/resources/assets/miscutils/textures/blocks/fluid/Fluid_Pyrotheum_Flow.png.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/fluid/Fluid_Pyrotheum_Flow.png.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/fluid/Fluid_Pyrotheum_Still.png b/src/main/resources/assets/miscutils/textures/blocks/fluid/Fluid_Pyrotheum_Still.png Binary files differindex 00355135df..00355135df 100644 --- a/src/resources/assets/miscutils/textures/blocks/fluid/Fluid_Pyrotheum_Still.png +++ b/src/main/resources/assets/miscutils/textures/blocks/fluid/Fluid_Pyrotheum_Still.png diff --git a/src/resources/assets/miscutils/textures/blocks/fluid/Fluid_Pyrotheum_Still.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/fluid/Fluid_Pyrotheum_Still.png.mcmeta index aa41c3d5c8..aa41c3d5c8 100644 --- a/src/resources/assets/miscutils/textures/blocks/fluid/Fluid_Pyrotheum_Still.png.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/fluid/Fluid_Pyrotheum_Still.png.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/fluid/Fluid_Sludge_Flow.png b/src/main/resources/assets/miscutils/textures/blocks/fluid/Fluid_Sludge_Flow.png Binary files differindex 50414d57db..50414d57db 100644 --- a/src/resources/assets/miscutils/textures/blocks/fluid/Fluid_Sludge_Flow.png +++ b/src/main/resources/assets/miscutils/textures/blocks/fluid/Fluid_Sludge_Flow.png diff --git a/src/resources/assets/miscutils/textures/blocks/fluid/Fluid_Sludge_Flow.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/fluid/Fluid_Sludge_Flow.png.mcmeta index 7e77c64858..7e77c64858 100644 --- a/src/resources/assets/miscutils/textures/blocks/fluid/Fluid_Sludge_Flow.png.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/fluid/Fluid_Sludge_Flow.png.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/fluid/Fluid_Sludge_Still.png b/src/main/resources/assets/miscutils/textures/blocks/fluid/Fluid_Sludge_Still.png Binary files differindex edf0166265..edf0166265 100644 --- a/src/resources/assets/miscutils/textures/blocks/fluid/Fluid_Sludge_Still.png +++ b/src/main/resources/assets/miscutils/textures/blocks/fluid/Fluid_Sludge_Still.png diff --git a/src/resources/assets/miscutils/textures/blocks/fluid/Fluid_Sludge_Still.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/fluid/Fluid_Sludge_Still.png.mcmeta index 4fadce8aff..4fadce8aff 100644 --- a/src/resources/assets/miscutils/textures/blocks/fluid/Fluid_Sludge_Still.png.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/fluid/Fluid_Sludge_Still.png.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.cryotheum.png b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.cryotheum.png Binary files differindex b51346219b..b51346219b 100644 --- a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.cryotheum.png +++ b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.cryotheum.png diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.cryotheum.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.cryotheum.png.mcmeta index aa41c3d5c8..aa41c3d5c8 100644 --- a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.cryotheum.png.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.cryotheum.png.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.ender.png b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.ender.png Binary files differindex 3fb18d9c00..3fb18d9c00 100644 --- a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.ender.png +++ b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.ender.png diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.ender.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.ender.png.mcmeta index 4fadce8aff..4fadce8aff 100644 --- a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.ender.png.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.ender.png.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.flowing.png b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.flowing.png Binary files differindex 003d1597a6..003d1597a6 100644 --- a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.flowing.png +++ b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.flowing.png diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.flowing.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.flowing.png.mcmeta index 4f0718ac96..4f0718ac96 100644 --- a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.flowing.png.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.flowing.png.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.png b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.png Binary files differindex 512df7ce04..512df7ce04 100644 --- a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.png +++ b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.png diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.png.mcmeta index b8533e5109..b8533e5109 100644 --- a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.png.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.png.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.still.png b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.still.png Binary files differindex ef08c75bc8..ef08c75bc8 100644 --- a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.still.png +++ b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.still.png diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.still.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.still.png.mcmeta index 0645f48c62..0645f48c62 100644 --- a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.still.png.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.fluid.autogenerated.still.png.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.hydrofluoricacid.png b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.hydrofluoricacid.png Binary files differindex 61d77a51d3..61d77a51d3 100644 --- a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.hydrofluoricacid.png +++ b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.hydrofluoricacid.png diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.hydrofluoricacid.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.hydrofluoricacid.png.mcmeta index 70cc4d313c..70cc4d313c 100644 --- a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.hydrofluoricacid.png.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.hydrofluoricacid.png.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.hydrogenchloride.png b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.hydrogenchloride.png Binary files differindex f79564ea36..f79564ea36 100644 --- a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.hydrogenchloride.png +++ b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.hydrogenchloride.png diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.hydrogenchloride.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.hydrogenchloride.png.mcmeta index 7e77c64858..7e77c64858 100644 --- a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.hydrogenchloride.png.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.hydrogenchloride.png.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.jackdaniels.png b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.jackdaniels.png Binary files differindex a752755254..a752755254 100644 --- a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.jackdaniels.png +++ b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.jackdaniels.png diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.jackdaniels.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.jackdaniels.png.mcmeta index 0df7234a79..0df7234a79 100644 --- a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.jackdaniels.png.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.jackdaniels.png.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.lithiumhydroxide.png b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.lithiumhydroxide.png Binary files differindex 251206d195..251206d195 100644 --- a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.lithiumhydroxide.png +++ b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.lithiumhydroxide.png diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.lithiumhydroxide.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.lithiumhydroxide.png.mcmeta index eb608948b6..eb608948b6 100644 --- a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.lithiumhydroxide.png.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.lithiumhydroxide.png.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.molten.autogenerated.new.1.png b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.molten.autogenerated.new.1.png Binary files differindex 6e44e97212..6e44e97212 100644 --- a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.molten.autogenerated.new.1.png +++ b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.molten.autogenerated.new.1.png diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.molten.autogenerated.old.png b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.molten.autogenerated.old.png Binary files differindex 512df7ce04..512df7ce04 100644 --- a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.molten.autogenerated.old.png +++ b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.molten.autogenerated.old.png diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.molten.autogenerated.png b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.molten.autogenerated.png Binary files differindex 7c5ffd0c77..7c5ffd0c77 100644 --- a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.molten.autogenerated.png +++ b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.molten.autogenerated.png diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.molten.autogenerated.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.molten.autogenerated.png.mcmeta index b8533e5109..b8533e5109 100644 --- a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.molten.autogenerated.png.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.molten.autogenerated.png.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.plasma.autogenerated.png b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.plasma.autogenerated.png Binary files differindex f0265d8ad2..f0265d8ad2 100644 --- a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.plasma.autogenerated.png +++ b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.plasma.autogenerated.png diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.plasma.autogenerated.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.plasma.autogenerated.png.mcmeta index 87c542d295..87c542d295 100644 --- a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.plasma.autogenerated.png.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.plasma.autogenerated.png.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.pyrotheum.png b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.pyrotheum.png Binary files differindex 00355135df..00355135df 100644 --- a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.pyrotheum.png +++ b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.pyrotheum.png diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.pyrotheum.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.pyrotheum.png.mcmeta index aa41c3d5c8..aa41c3d5c8 100644 --- a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.pyrotheum.png.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.pyrotheum.png.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfurdioxide.png b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfurdioxide.png Binary files differindex 2ff3fb6e7b..2ff3fb6e7b 100644 --- a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfurdioxide.png +++ b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfurdioxide.png diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfurdioxide.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfurdioxide.png.mcmeta index 3fc1338d74..3fc1338d74 100644 --- a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfurdioxide.png.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfurdioxide.png.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfuricapatite.png b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfuricapatite.png Binary files differindex 902015b8e1..902015b8e1 100644 --- a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfuricapatite.png +++ b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfuricapatite.png diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfuricapatite.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfuricapatite.png.mcmeta index 7e77c64858..7e77c64858 100644 --- a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfuricapatite.png.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfuricapatite.png.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfuriclithium.png b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfuriclithium.png Binary files differindex fee5f03cd5..fee5f03cd5 100644 --- a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfuriclithium.png +++ b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfuriclithium.png diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfuriclithium.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfuriclithium.png.mcmeta index eb608948b6..eb608948b6 100644 --- a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfuriclithium.png.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfuriclithium.png.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfurousacid.png b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfurousacid.png Binary files differindex 73fa814eb5..73fa814eb5 100644 --- a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfurousacid.png +++ b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfurousacid.png diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfurousacid.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfurousacid.png.mcmeta index 70cc4d313c..70cc4d313c 100644 --- a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfurousacid.png.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.sulfurousacid.png.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.thoriumhexafluoride.png b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.thoriumhexafluoride.png Binary files differindex 63e9189c45..63e9189c45 100644 --- a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.thoriumhexafluoride.png +++ b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.thoriumhexafluoride.png diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.thoriumtetrafluoride.png b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.thoriumtetrafluoride.png Binary files differindex 05d4c69e1a..05d4c69e1a 100644 --- a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.thoriumtetrafluoride.png +++ b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.thoriumtetrafluoride.png diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.thoriumtetrafluoride.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.thoriumtetrafluoride.png.mcmeta index f6730e30a9..f6730e30a9 100644 --- a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.thoriumtetrafluoride.png.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.thoriumtetrafluoride.png.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.uraniumhexafluoride.png b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.uraniumhexafluoride.png Binary files differindex 90cbef3417..90cbef3417 100644 --- a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.uraniumhexafluoride.png +++ b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.uraniumhexafluoride.png diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.uraniumhexafluoride.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.uraniumhexafluoride.png.mcmeta index f6730e30a9..f6730e30a9 100644 --- a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.uraniumhexafluoride.png.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.uraniumhexafluoride.png.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.uraniumtetrafluoride.png b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.uraniumtetrafluoride.png Binary files differindex 90cbef3417..90cbef3417 100644 --- a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.uraniumtetrafluoride.png +++ b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.uraniumtetrafluoride.png diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.uraniumtetrafluoride.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.uraniumtetrafluoride.png.mcmeta index 5169aabdc2..5169aabdc2 100644 --- a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.uraniumtetrafluoride.png.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/fluids/fluid.uraniumtetrafluoride.png.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/hellfire/blockHellFire_layer_0.png b/src/main/resources/assets/miscutils/textures/blocks/hellfire/blockHellFire_layer_0.png Binary files differindex d4e45d6adf..d4e45d6adf 100644 --- a/src/resources/assets/miscutils/textures/blocks/hellfire/blockHellFire_layer_0.png +++ b/src/main/resources/assets/miscutils/textures/blocks/hellfire/blockHellFire_layer_0.png diff --git a/src/resources/assets/miscutils/textures/blocks/hellfire/blockHellFire_layer_0.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/hellfire/blockHellFire_layer_0.png.mcmeta index 76446714d8..76446714d8 100644 --- a/src/resources/assets/miscutils/textures/blocks/hellfire/blockHellFire_layer_0.png.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/hellfire/blockHellFire_layer_0.png.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/hellfire/blockHellFire_layer_1.png b/src/main/resources/assets/miscutils/textures/blocks/hellfire/blockHellFire_layer_1.png Binary files differindex 739abd1090..739abd1090 100644 --- a/src/resources/assets/miscutils/textures/blocks/hellfire/blockHellFire_layer_1.png +++ b/src/main/resources/assets/miscutils/textures/blocks/hellfire/blockHellFire_layer_1.png diff --git a/src/resources/assets/miscutils/textures/blocks/hellfire/blockHellFire_layer_1.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/hellfire/blockHellFire_layer_1.png.mcmeta index 4f0718ac96..4f0718ac96 100644 --- a/src/resources/assets/miscutils/textures/blocks/hellfire/blockHellFire_layer_1.png.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/hellfire/blockHellFire_layer_1.png.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_1.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_1.png Binary files differindex 2780ffe2dd..2780ffe2dd 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_1.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_1.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_2.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_2.png Binary files differindex c3ca19138c..c3ca19138c 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_2.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_2.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_3.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_3.png Binary files differindex d04b15cd89..d04b15cd89 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_3.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_3.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_4.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_4.png Binary files differindex d8ec997508..d8ec997508 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_4.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_4.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_5.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_5.png Binary files differindex 3466822e04..3466822e04 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_5.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_5.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_6.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_6.png Binary files differindex 853e88b189..853e88b189 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_6.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_6.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_7.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_7.png Binary files differindex 3979e4ae76..3979e4ae76 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_7.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_7.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_8.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_8.png Binary files differindex 503022d656..503022d656 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_8.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_8.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_9.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_9.png Binary files differindex e1ae9fafb0..e1ae9fafb0 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_9.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_9.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_1.PNG.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_1.PNG.mcmeta index d746756cbd..d746756cbd 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_1.PNG.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_1.PNG.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_1.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_1.png Binary files differindex 7b14db3bda..7b14db3bda 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_1.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_1.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_2.PNG.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_2.PNG.mcmeta index d746756cbd..d746756cbd 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_2.PNG.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_2.PNG.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_2.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_2.png Binary files differindex d8880393ce..d8880393ce 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_2.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_2.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_3.PNG.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_3.PNG.mcmeta index d746756cbd..d746756cbd 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_3.PNG.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_3.PNG.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_3.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_3.png Binary files differindex 84f6f55c22..84f6f55c22 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_3.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_3.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_4.PNG.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_4.PNG.mcmeta index d746756cbd..d746756cbd 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_4.PNG.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_4.PNG.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_4.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_4.png Binary files differindex b79fa87cf6..b79fa87cf6 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_4.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_4.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_5.PNG.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_5.PNG.mcmeta index d746756cbd..d746756cbd 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_5.PNG.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_5.PNG.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_5.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_5.png Binary files differindex 49e957bc1f..49e957bc1f 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_5.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_5.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_6.PNG.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_6.PNG.mcmeta index d746756cbd..d746756cbd 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_6.PNG.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_6.PNG.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_6.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_6.png Binary files differindex 150c1312c9..150c1312c9 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_6.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_6.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_7.PNG.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_7.PNG.mcmeta index d746756cbd..d746756cbd 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_7.PNG.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_7.PNG.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_7.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_7.png Binary files differindex 2c5541ec6d..2c5541ec6d 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_7.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_7.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_8.PNG.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_8.PNG.mcmeta index d746756cbd..d746756cbd 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_8.PNG.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_8.PNG.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_8.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_8.png Binary files differindex c62b04a499..c62b04a499 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_8.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_8.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_9.PNG.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_9.PNG.mcmeta index d746756cbd..d746756cbd 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_9.PNG.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_9.PNG.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_9.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_9.png Binary files differindex 3712f39fdd..3712f39fdd 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_9.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_HP_ACTIVE_9.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_1.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_1.png Binary files differindex 719aad5646..719aad5646 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_1.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_1.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_2.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_2.png Binary files differindex 855132c0b3..855132c0b3 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_2.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_2.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_3.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_3.png Binary files differindex 3354bbe815..3354bbe815 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_3.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_3.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_4.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_4.png Binary files differindex 16e4db14ad..16e4db14ad 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_4.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_4.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_5.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_5.png Binary files differindex 3466822e04..3466822e04 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_5.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_5.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_6.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_6.png Binary files differindex f332bb77e5..f332bb77e5 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_6.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_6.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_7.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_7.png Binary files differindex b6576c39e4..b6576c39e4 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_7.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_7.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_8.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_8.png Binary files differindex 2c11681fcd..2c11681fcd 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_8.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_8.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_9.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_9.png Binary files differindex 0d3178a481..0d3178a481 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_9.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_9.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_1.PNG.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_1.PNG.mcmeta index d746756cbd..d746756cbd 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_1.PNG.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_1.PNG.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_1.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_1.png Binary files differindex b0f38da9c9..b0f38da9c9 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_1.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_1.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_2.PNG.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_2.PNG.mcmeta index d746756cbd..d746756cbd 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_2.PNG.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_2.PNG.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_2.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_2.png Binary files differindex f614e41d52..f614e41d52 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_2.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_2.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_3.PNG.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_3.PNG.mcmeta index d746756cbd..d746756cbd 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_3.PNG.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_3.PNG.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_3.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_3.png Binary files differindex c011a999de..c011a999de 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_3.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_3.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_4.PNG.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_4.PNG.mcmeta index d746756cbd..d746756cbd 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_4.PNG.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_4.PNG.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_4.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_4.png Binary files differindex 21a2847a7c..21a2847a7c 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_4.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_4.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_5.PNG.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_5.PNG.mcmeta index d746756cbd..d746756cbd 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_5.PNG.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_5.PNG.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_5.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_5.png Binary files differindex 49e957bc1f..49e957bc1f 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_5.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_5.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_6.PNG.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_6.PNG.mcmeta index d746756cbd..d746756cbd 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_6.PNG.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_6.PNG.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_6.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_6.png Binary files differindex 98bf3224ce..98bf3224ce 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_6.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_6.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_7.PNG.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_7.PNG.mcmeta index d746756cbd..d746756cbd 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_7.PNG.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_7.PNG.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_7.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_7.png Binary files differindex cad7674ce5..cad7674ce5 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_7.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_7.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_8.PNG.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_8.PNG.mcmeta index d746756cbd..d746756cbd 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_8.PNG.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_8.PNG.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_8.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_8.png Binary files differindex a5501d12d2..a5501d12d2 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_8.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_8.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_9.PNG.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_9.PNG.mcmeta index d746756cbd..d746756cbd 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_9.PNG.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_9.PNG.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_9.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_9.png Binary files differindex b294af5b63..b294af5b63 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_9.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/BigTurbine/LARGE_TURBINE_LP_ACTIVE_9.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_1.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_1.png Binary files differindex 9b82677382..9b82677382 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_1.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_1.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_10.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_10.png Binary files differindex bb8649fabc..bb8649fabc 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_10.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_10.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_11.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_11.png Binary files differindex 60ac4bce02..60ac4bce02 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_11.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_11.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_12.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_12.png Binary files differindex f7e479652f..f7e479652f 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_12.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_12.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_2.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_2.png Binary files differindex 8d1e3f14e2..8d1e3f14e2 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_2.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_2.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_3.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_3.png Binary files differindex 9f997cedf8..9f997cedf8 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_3.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_3.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_4.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_4.png Binary files differindex ff2c73964a..ff2c73964a 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_4.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_4.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_5.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_5.png Binary files differindex 107d539765..107d539765 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_5.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_5.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_6.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_6.png Binary files differindex 5dd516f5e2..5dd516f5e2 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_6.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_6.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_7.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_7.png Binary files differindex eb8cd5882d..eb8cd5882d 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_7.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_7.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_8.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_8.png Binary files differindex fa3e6027a7..fa3e6027a7 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_8.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_8.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_9.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_9.png Binary files differindex ce258e3c13..ce258e3c13 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_9.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/FUSIONIII_9.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER1.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER1.png Binary files differindex ce1c2ef3d8..ce1c2ef3d8 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER1.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER1.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER2.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER2.png Binary files differindex 84e1ac6350..84e1ac6350 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER2.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER2.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER3.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER3.png Binary files differindex 4f716e4c61..4f716e4c61 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER3.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER3.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER4.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER4.png Binary files differindex fa9e98a6f5..fa9e98a6f5 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER4.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER4.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER5.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER5.png Binary files differindex 6c05b315b6..6c05b315b6 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER5.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER5.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER6.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER6.png Binary files differindex d4a3888fe5..d4a3888fe5 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER6.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER6.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER7.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER7.png Binary files differindex 8346cccf41..8346cccf41 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER7.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER7.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER8.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER8.png Binary files differindex 31bbffb4d4..31bbffb4d4 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER8.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER8.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER9.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER9.png Binary files differindex 0858b2d399..0858b2d399 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER9.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER9.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE1.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE1.png Binary files differindex 1bc399315d..1bc399315d 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE1.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE1.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE1.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE1.png.mcmeta index d746756cbd..d746756cbd 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE1.png.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE1.png.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE2.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE2.png Binary files differindex 32ea4edd45..32ea4edd45 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE2.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE2.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE2.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE2.png.mcmeta index d746756cbd..d746756cbd 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE2.png.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE2.png.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE3.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE3.png Binary files differindex eb530ffb75..eb530ffb75 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE3.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE3.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE3.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE3.png.mcmeta index d746756cbd..d746756cbd 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE3.png.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE3.png.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE4.pdn b/src/main/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE4.pdn Binary files differindex 3c8bbeb696..3c8bbeb696 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE4.pdn +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE4.pdn diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE4.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE4.png Binary files differindex 1050d78b01..1050d78b01 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE4.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE4.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE4.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE4.png.mcmeta index d746756cbd..d746756cbd 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE4.png.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE4.png.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE5.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE5.png Binary files differindex b59c940f5e..b59c940f5e 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE5.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE5.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE5.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE5.png.mcmeta index d746756cbd..d746756cbd 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE5.png.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE5.png.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE6.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE6.png Binary files differindex 8bde3ca423..8bde3ca423 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE6.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE6.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE6.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE6.png.mcmeta index d746756cbd..d746756cbd 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE6.png.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE6.png.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE7.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE7.png Binary files differindex 1b1b12db3b..1b1b12db3b 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE7.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE7.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE7.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE7.png.mcmeta index d746756cbd..d746756cbd 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE7.png.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE7.png.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE8.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE8.png Binary files differindex da672b0e24..da672b0e24 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE8.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE8.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE8.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE8.png.mcmeta index d746756cbd..d746756cbd 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE8.png.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE8.png.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE9.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE9.png Binary files differindex f082c94c55..f082c94c55 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE9.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE9.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE9.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE9.png.mcmeta index d746756cbd..d746756cbd 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE9.png.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/Grinder/GRINDER_ACTIVE9.png.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE1.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE1.png Binary files differindex 020ed28da8..020ed28da8 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE1.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE1.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE2.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE2.png Binary files differindex 12e321b7e9..12e321b7e9 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE2.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE2.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE3.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE3.png Binary files differindex c6d7715356..c6d7715356 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE3.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE3.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE4.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE4.png Binary files differindex 7f21c841aa..7f21c841aa 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE4.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE4.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE5.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE5.png Binary files differindex 3466822e04..3466822e04 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE5.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE5.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE6.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE6.png Binary files differindex c1ae3ca1af..c1ae3ca1af 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE6.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE6.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE7.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE7.png Binary files differindex a0263e4341..a0263e4341 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE7.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE7.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE8.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE8.png Binary files differindex 26956df456..26956df456 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE8.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE8.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE9.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE9.png Binary files differindex f30b34fe4a..f30b34fe4a 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE9.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE9.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE1.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE1.png Binary files differindex 288df82736..288df82736 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE1.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE1.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE1.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE1.png.mcmeta index d746756cbd..d746756cbd 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE1.png.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE1.png.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE2.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE2.png Binary files differindex b8c344736e..b8c344736e 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE2.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE2.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE2.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE2.png.mcmeta index d746756cbd..d746756cbd 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE2.png.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE2.png.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE3.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE3.png Binary files differindex 0ef17da006..0ef17da006 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE3.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE3.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE3.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE3.png.mcmeta index d746756cbd..d746756cbd 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE3.png.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE3.png.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE4.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE4.png Binary files differindex 07dd921123..07dd921123 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE4.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE4.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE4.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE4.png.mcmeta index d746756cbd..d746756cbd 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE4.png.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE4.png.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE5.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE5.png Binary files differindex 49e957bc1f..49e957bc1f 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE5.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE5.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE5.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE5.png.mcmeta index d746756cbd..d746756cbd 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE5.png.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE5.png.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE6.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE6.png Binary files differindex 2dd6ca5a8e..2dd6ca5a8e 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE6.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE6.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE6.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE6.png.mcmeta index d746756cbd..d746756cbd 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE6.png.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE6.png.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE7.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE7.png Binary files differindex 16091f0e18..16091f0e18 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE7.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE7.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE7.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE7.png.mcmeta index d746756cbd..d746756cbd 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE7.png.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE7.png.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE8.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE8.png Binary files differindex 698d96bf11..698d96bf11 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE8.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE8.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE8.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE8.png.mcmeta index d746756cbd..d746756cbd 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE8.png.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE8.png.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE9.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE9.png Binary files differindex 963d8b1a22..963d8b1a22 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE9.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE9.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE9.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE9.png.mcmeta index d746756cbd..d746756cbd 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE9.png.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE9.png.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_FUSION_3.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_FUSION_3.png Binary files differindex b0aa8bf5e5..b0aa8bf5e5 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_FUSION_3.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_FUSION_3.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_FUSION_COIL_II.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_FUSION_COIL_II.png Binary files differindex 6322205460..6322205460 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_FUSION_COIL_II.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_FUSION_COIL_II.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_FUSION_GLASS_ULTRA.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_FUSION_GLASS_ULTRA.png Binary files differindex 0c9e529514..0c9e529514 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_FUSION_GLASS_ULTRA.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/MACHINE_CASING_FUSION_GLASS_ULTRA.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_CATALYSTS.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_CATALYSTS.png Binary files differindex 110e9ee38f..110e9ee38f 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_CATALYSTS.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_CATALYSTS.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_CATALYSTS.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_CATALYSTS.png.mcmeta index 24f863c95e..24f863c95e 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_CATALYSTS.png.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_CATALYSTS.png.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_CONTROL_CORE_BUS.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_CONTROL_CORE_BUS.png Binary files differindex 574f481c68..574f481c68 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_CONTROL_CORE_BUS.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_CONTROL_CORE_BUS.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_ENERGY_OUT_BUFFER.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_ENERGY_OUT_BUFFER.png Binary files differindex 8af98deabf..8af98deabf 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_ENERGY_OUT_BUFFER.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_ENERGY_OUT_BUFFER.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_ENERGY_OUT_MULTI_BUFFER.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_ENERGY_OUT_MULTI_BUFFER.png Binary files differindex 56b02d1914..56b02d1914 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_ENERGY_OUT_MULTI_BUFFER.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_ENERGY_OUT_MULTI_BUFFER.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_ENERGY_RTG_OFF.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_ENERGY_RTG_OFF.png Binary files differindex 8b5f405322..8b5f405322 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_ENERGY_RTG_OFF.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_ENERGY_RTG_OFF.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_ENERGY_RTG_ON.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_ENERGY_RTG_ON.png Binary files differindex 2424eef68f..2424eef68f 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_ENERGY_RTG_ON.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_ENERGY_RTG_ON.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_FRONT_ADVANCED_MULTIBLOCK_ANIMATED.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_FRONT_ADVANCED_MULTIBLOCK_ANIMATED.png Binary files differindex 1fd61ede58..1fd61ede58 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_FRONT_ADVANCED_MULTIBLOCK_ANIMATED.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_FRONT_ADVANCED_MULTIBLOCK_ANIMATED.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_FRONT_ADVANCED_MULTIBLOCK_ANIMATED.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_FRONT_ADVANCED_MULTIBLOCK_ANIMATED.png.mcmeta index 24f863c95e..24f863c95e 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_FRONT_ADVANCED_MULTIBLOCK_ANIMATED.png.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_FRONT_ADVANCED_MULTIBLOCK_ANIMATED.png.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_FRONT_ADVANCED_MULTIBLOCK_ANIMATED_ACTIVE.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_FRONT_ADVANCED_MULTIBLOCK_ANIMATED_ACTIVE.png Binary files differindex 5433ee1ff2..5433ee1ff2 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_FRONT_ADVANCED_MULTIBLOCK_ANIMATED_ACTIVE.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_FRONT_ADVANCED_MULTIBLOCK_ANIMATED_ACTIVE.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_FRONT_ADVANCED_MULTIBLOCK_ANIMATED_ACTIVE.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_FRONT_ADVANCED_MULTIBLOCK_ANIMATED_ACTIVE.png.mcmeta index 97596ba817..97596ba817 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_FRONT_ADVANCED_MULTIBLOCK_ANIMATED_ACTIVE.png.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_FRONT_ADVANCED_MULTIBLOCK_ANIMATED_ACTIVE.png.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE.png Binary files differindex 6a749e96a9..6a749e96a9 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ACTIVE.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ACTIVE.png Binary files differindex 92910c9cdf..92910c9cdf 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ACTIVE.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ACTIVE.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ANIMATED.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ANIMATED.png Binary files differindex b7b2bed6de..b7b2bed6de 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ANIMATED.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ANIMATED.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ANIMATED.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ANIMATED.png.mcmeta index 60af678259..60af678259 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ANIMATED.png.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ANIMATED.png.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ANIMATED_ACTIVE.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ANIMATED_ACTIVE.png Binary files differindex 8c93e83d2d..8c93e83d2d 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ANIMATED_ACTIVE.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ANIMATED_ACTIVE.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ANIMATED_ACTIVE.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ANIMATED_ACTIVE.png.mcmeta index 24f863c95e..24f863c95e 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ANIMATED_ACTIVE.png.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ANIMATED_ACTIVE.png.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_MILLING_BALL_BUS.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_MILLING_BALL_BUS.png Binary files differindex c7b22a7ef8..c7b22a7ef8 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_MILLING_BALL_BUS.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_MILLING_BALL_BUS.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_MILLING_BALL_BUS.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_MILLING_BALL_BUS.png.mcmeta index 5d86d73ad2..5d86d73ad2 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_MILLING_BALL_BUS.png.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_MILLING_BALL_BUS.png.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_MUFFLER_ADV.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_MUFFLER_ADV.png Binary files differindex ce88198867..ce88198867 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_MUFFLER_ADV.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_MUFFLER_ADV.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_OVERFLOW_VALVE.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_OVERFLOW_VALVE.png Binary files differindex edd4efbba9..edd4efbba9 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_OVERFLOW_VALVE.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_OVERFLOW_VALVE.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_OVERFLOW_VALVE.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_OVERFLOW_VALVE.png.mcmeta index 330653c04d..330653c04d 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_OVERFLOW_VALVE.png.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_OVERFLOW_VALVE.png.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_EV.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_EV.png Binary files differindex d70927f140..d70927f140 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_EV.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_EV.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_HV.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_HV.png Binary files differindex 13310d6f57..13310d6f57 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_HV.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_HV.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_IV.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_IV.png Binary files differindex 7ef41870d4..7ef41870d4 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_IV.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_IV.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_LV.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_LV.png Binary files differindex e42acc5c01..e42acc5c01 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_LV.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_LV.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_LuV.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_LuV.png Binary files differindex 440c987d6e..440c987d6e 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_LuV.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_LuV.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_MAX.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_MAX.png Binary files differindex 453cc94662..453cc94662 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_MAX.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_MAX.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_MV.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_MV.png Binary files differindex b1f29058ec..b1f29058ec 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_MV.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_MV.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_ULV.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_ULV.png Binary files differindex 747adeb2e5..747adeb2e5 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_ULV.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_ULV.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_UV.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_UV.png Binary files differindex 23cc2c60c2..23cc2c60c2 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_UV.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_UV.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_ZPM.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_ZPM.png Binary files differindex 230e78fe96..230e78fe96 100644 --- a/src/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_ZPM.png +++ b/src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_ZPM.png diff --git a/src/resources/assets/miscutils/textures/blocks/mash_flow.png b/src/main/resources/assets/miscutils/textures/blocks/mash_flow.png Binary files differindex f155520eae..f155520eae 100644 --- a/src/resources/assets/miscutils/textures/blocks/mash_flow.png +++ b/src/main/resources/assets/miscutils/textures/blocks/mash_flow.png diff --git a/src/resources/assets/miscutils/textures/blocks/mash_still.png b/src/main/resources/assets/miscutils/textures/blocks/mash_still.png Binary files differindex f155520eae..f155520eae 100644 --- a/src/resources/assets/miscutils/textures/blocks/mash_still.png +++ b/src/main/resources/assets/miscutils/textures/blocks/mash_still.png diff --git a/src/resources/assets/miscutils/textures/blocks/metro/OVERLAY_GRATE_A.png b/src/main/resources/assets/miscutils/textures/blocks/metro/OVERLAY_GRATE_A.png Binary files differindex 950a44d2b7..950a44d2b7 100644 --- a/src/resources/assets/miscutils/textures/blocks/metro/OVERLAY_GRATE_A.png +++ b/src/main/resources/assets/miscutils/textures/blocks/metro/OVERLAY_GRATE_A.png diff --git a/src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_MAGIC_A.png b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_MAGIC_A.png Binary files differindex 1f53895490..1f53895490 100644 --- a/src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_MAGIC_A.png +++ b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_MAGIC_A.png diff --git a/src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_MAGIC_A.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_MAGIC_A.png.mcmeta index 0285ac2f3b..0285ac2f3b 100644 --- a/src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_MAGIC_A.png.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_MAGIC_A.png.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_GRATE_A.png b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_GRATE_A.png Binary files differindex 50be701a0b..50be701a0b 100644 --- a/src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_GRATE_A.png +++ b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_GRATE_A.png diff --git a/src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_A.png b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_A.png Binary files differindex 8eeb0179d7..8eeb0179d7 100644 --- a/src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_A.png +++ b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_A.png diff --git a/src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_B.png b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_B.png Binary files differindex ffac706bbd..ffac706bbd 100644 --- a/src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_B.png +++ b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_B.png diff --git a/src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_C.png b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_C.png Binary files differindex 87c6017569..87c6017569 100644 --- a/src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_C.png +++ b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_C.png diff --git a/src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_D.png b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_D.png Binary files differindex 61d1f49a12..61d1f49a12 100644 --- a/src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_D.png +++ b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_D.png diff --git a/src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_E.png b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_E.png Binary files differindex 47f1792843..47f1792843 100644 --- a/src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_E.png +++ b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_E.png diff --git a/src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_F.png b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_F.png Binary files differindex 548c0ec283..548c0ec283 100644 --- a/src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_F.png +++ b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_F.png diff --git a/src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_G.png b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_G.png Binary files differindex 172fab4657..172fab4657 100644 --- a/src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_G.png +++ b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_G.png diff --git a/src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_H.png b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_H.png Binary files differindex 68ab46a03d..68ab46a03d 100644 --- a/src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_H.png +++ b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_H.png diff --git a/src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_I.png b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_I.png Binary files differindex 4443dc8024..4443dc8024 100644 --- a/src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_I.png +++ b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_I.png diff --git a/src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_ORGANIC_PANEL_A.png b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_ORGANIC_PANEL_A.png Binary files differindex 44bc5362ac..44bc5362ac 100644 --- a/src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_ORGANIC_PANEL_A.png +++ b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_ORGANIC_PANEL_A.png diff --git a/src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_ORGANIC_PANEL_A_GLOWING.png b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_ORGANIC_PANEL_A_GLOWING.png Binary files differindex ed8ad55ba2..ed8ad55ba2 100644 --- a/src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_ORGANIC_PANEL_A_GLOWING.png +++ b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_ORGANIC_PANEL_A_GLOWING.png diff --git a/src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_ORGANIC_PANEL_A_GLOWING.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_ORGANIC_PANEL_A_GLOWING.png.mcmeta index ba9119c7ad..ba9119c7ad 100644 --- a/src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_ORGANIC_PANEL_A_GLOWING.png.mcmeta +++ b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_ORGANIC_PANEL_A_GLOWING.png.mcmeta diff --git a/src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_BIRD_A.png b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_BIRD_A.png Binary files differindex 48315c82cd..48315c82cd 100644 --- a/src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_BIRD_A.png +++ b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_BIRD_A.png diff --git a/src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_BIRD_A_LEFT.png b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_BIRD_A_LEFT.png Binary files differindex e3a652f3f9..e3a652f3f9 100644 --- a/src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_BIRD_A_LEFT.png +++ b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_BIRD_A_LEFT.png diff --git a/src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_BIRD_A_RIGHT.png b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_BIRD_A_RIGHT.png Binary files differindex d759a163a4..d759a163a4 100644 --- a/src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_BIRD_A_RIGHT.png +++ b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_BIRD_A_RIGHT.png diff --git a/src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_BLUE_A.png b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_BLUE_A.png Binary files differindex eb6c62491e..eb6c62491e 100644 --- a/src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_BLUE_A.png +++ b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_BLUE_A.png diff --git a/src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_GREEN_A.png b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_GREEN_A.png Binary files differindex f8d0b84c10..f8d0b84c10 100644 --- a/src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_GREEN_A.png +++ b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_GREEN_A.png diff --git a/src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_RED_A.png b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_RED_A.png Binary files differindex eb3257c754..eb3257c754 100644 --- a/src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_RED_A.png +++ b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_RED_A.png diff --git a/src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_RED_B.png b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_RED_B.png Binary files differindex 3a1b683837..3a1b683837 100644 --- a/src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_RED_B.png +++ b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_RED_B.png diff --git a/src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_TABLET_A.png b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_TABLET_A.png Binary files differindex a5d73f716d..a5d73f716d 100644 --- a/src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_TABLET_A.png +++ b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_TABLET_A.png diff --git a/src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_TABLET_B.png b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_TABLET_B.png Binary files differindex 53df62051b..53df62051b 100644 --- a/src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_TABLET_B.png +++ b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_TABLET_B.png diff --git a/src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_A.png b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_A.png Binary files differindex 5bc352238f..5bc352238f 100644 --- a/src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_A.png +++ b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_A.png diff --git a/src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_B.png b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_B.png Binary files differindex 32b6735a0d..32b6735a0d 100644 --- a/src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_B.png +++ b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_B.png diff --git a/src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_C.png b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_C.png Binary files differindex 946559cf4e..946559cf4e 100644 --- a/src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_C.png +++ b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_C.png diff --git a/src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_PANEL_A.png b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_PANEL_A.png Binary files differindex 196600afdb..196600afdb 100644 --- a/src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_PANEL_A.png +++ b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_PANEL_A.png diff --git a/src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_PANEL_B.png b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_PANEL_B.png Binary files differindex 1bcd1ec78f..1bcd1ec78f 100644 --- a/src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_PANEL_B.png +++ b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_PANEL_B.png diff --git a/src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_PANEL_C.png b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_PANEL_C.png Binary files differindex 54381fcf21..54381fcf21 100644 --- a/src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_PANEL_C.png +++ b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_PANEL_C.png diff --git a/src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_PANEL_D.png b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_PANEL_D.png Binary files differindex 0cf3f40762..0cf3f40762 100644 --- a/src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_PANEL_D.png +++ b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_PANEL_D.png diff --git a/src/resources/assets/miscutils/textures/blocks/net.png b/src/main/resources/assets/miscutils/textures/blocks/net.png Binary files differindex e885ed12db..e885ed12db 100644 --- a/src/resources/assets/miscutils/textures/blocks/net.png +++ b/src/main/resources/assets/miscutils/textures/blocks/net.png diff --git a/src/resources/assets/miscutils/textures/blocks/redox/redox1.png b/src/main/resources/assets/miscutils/textures/blocks/redox/redox1.png Binary files differindex 05b752e0e7..05b752e0e7 100644 --- a/src/resources/assets/miscutils/textures/blocks/redox/redox1.png +++ b/src/main/resources/assets/miscutils/textures/blocks/redox/redox1.png diff --git a/src/resources/assets/miscutils/textures/blocks/redox/redox2.png b/src/main/resources/assets/miscutils/textures/blocks/redox/redox2.png Binary files differindex 231b6b17af..231b6b17af 100644 --- a/src/resources/assets/miscutils/textures/blocks/redox/redox2.png +++ b/src/main/resources/assets/miscutils/textures/blocks/redox/redox2.png diff --git a/src/resources/assets/miscutils/textures/blocks/redox/redox3.png b/src/main/resources/assets/miscutils/textures/blocks/redox/redox3.png Binary files differindex 88cb664c41..88cb664c41 100644 --- a/src/resources/assets/miscutils/textures/blocks/redox/redox3.png +++ b/src/main/resources/assets/miscutils/textures/blocks/redox/redox3.png diff --git a/src/resources/assets/miscutils/textures/blocks/redox/redox4.png b/src/main/resources/assets/miscutils/textures/blocks/redox/redox4.png Binary files differindex a627b64eef..a627b64eef 100644 --- a/src/resources/assets/miscutils/textures/blocks/redox/redox4.png +++ b/src/main/resources/assets/miscutils/textures/blocks/redox/redox4.png diff --git a/src/resources/assets/miscutils/textures/blocks/redox/redox5.png b/src/main/resources/assets/miscutils/textures/blocks/redox/redox5.png Binary files differindex 9564596329..9564596329 100644 --- a/src/resources/assets/miscutils/textures/blocks/redox/redox5.png +++ b/src/main/resources/assets/miscutils/textures/blocks/redox/redox5.png diff --git a/src/resources/assets/miscutils/textures/blocks/redox/redox6.png b/src/main/resources/assets/miscutils/textures/blocks/redox/redox6.png Binary files differindex 1023b718cc..1023b718cc 100644 --- a/src/resources/assets/miscutils/textures/blocks/redox/redox6.png +++ b/src/main/resources/assets/miscutils/textures/blocks/redox/redox6.png diff --git a/src/resources/assets/miscutils/textures/blocks/redstone/redstone_meter/top.png b/src/main/resources/assets/miscutils/textures/blocks/redstone/redstone_meter/top.png Binary files differindex ba45c43891..ba45c43891 100644 --- a/src/resources/assets/miscutils/textures/blocks/redstone/redstone_meter/top.png +++ b/src/main/resources/assets/miscutils/textures/blocks/redstone/redstone_meter/top.png diff --git a/src/resources/assets/miscutils/textures/blocks/rum_mature_flow.png b/src/main/resources/assets/miscutils/textures/blocks/rum_mature_flow.png Binary files differindex f155520eae..f155520eae 100644 --- a/src/resources/assets/miscutils/textures/blocks/rum_mature_flow.png +++ b/src/main/resources/assets/miscutils/textures/blocks/rum_mature_flow.png diff --git a/src/resources/assets/miscutils/textures/blocks/rum_mature_still.png b/src/main/resources/assets/miscutils/textures/blocks/rum_mature_still.png Binary files differindex f155520eae..f155520eae 100644 --- a/src/resources/assets/miscutils/textures/blocks/rum_mature_still.png +++ b/src/main/resources/assets/miscutils/textures/blocks/rum_mature_still.png diff --git a/src/resources/assets/miscutils/textures/blocks/rum_semi_mature_flow.png b/src/main/resources/assets/miscutils/textures/blocks/rum_semi_mature_flow.png Binary files differindex f155520eae..f155520eae 100644 --- a/src/resources/assets/miscutils/textures/blocks/rum_semi_mature_flow.png +++ b/src/main/resources/assets/miscutils/textures/blocks/rum_semi_mature_flow.png diff --git a/src/resources/assets/miscutils/textures/blocks/rum_semi_mature_still.png b/src/main/resources/assets/miscutils/textures/blocks/rum_semi_mature_still.png Binary files differindex f155520eae..f155520eae 100644 --- a/src/resources/assets/miscutils/textures/blocks/rum_semi_mature_still.png +++ b/src/main/resources/assets/miscutils/textures/blocks/rum_semi_mature_still.png diff --git a/src/resources/assets/miscutils/textures/blocks/trees/leaves/leaves_pine.png b/src/main/resources/assets/miscutils/textures/blocks/trees/leaves/leaves_pine.png Binary files differindex 68949e5f47..68949e5f47 100644 --- a/src/resources/assets/miscutils/textures/blocks/trees/leaves/leaves_pine.png +++ b/src/main/resources/assets/miscutils/textures/blocks/trees/leaves/leaves_pine.png diff --git a/src/resources/assets/miscutils/textures/blocks/trees/leaves/leaves_pine_opaque .png b/src/main/resources/assets/miscutils/textures/blocks/trees/leaves/leaves_pine_opaque.png Binary files differindex c7c0d6492f..c7c0d6492f 100644 --- a/src/resources/assets/miscutils/textures/blocks/trees/leaves/leaves_pine_opaque .png +++ b/src/main/resources/assets/miscutils/textures/blocks/trees/leaves/leaves_pine_opaque.png diff --git a/src/resources/assets/miscutils/textures/blocks/trees/leaves/leaves_rainforest.png b/src/main/resources/assets/miscutils/textures/blocks/trees/leaves/leaves_rainforest.png Binary files differindex ddccb0e4fa..ddccb0e4fa 100644 --- a/src/resources/assets/miscutils/textures/blocks/trees/leaves/leaves_rainforest.png +++ b/src/main/resources/assets/miscutils/textures/blocks/trees/leaves/leaves_rainforest.png diff --git a/src/resources/assets/miscutils/textures/blocks/trees/leaves/leaves_rainforest_opaque.png b/src/main/resources/assets/miscutils/textures/blocks/trees/leaves/leaves_rainforest_opaque.png Binary files differindex 96e756c22c..96e756c22c 100644 --- a/src/resources/assets/miscutils/textures/blocks/trees/leaves/leaves_rainforest_opaque.png +++ b/src/main/resources/assets/miscutils/textures/blocks/trees/leaves/leaves_rainforest_opaque.png diff --git a/src/main/resources/assets/miscutils/textures/blocks/trees/logs/log_pine.png b/src/main/resources/assets/miscutils/textures/blocks/trees/logs/log_pine.png Binary files differnew file mode 100644 index 0000000000..ae77894258 --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/blocks/trees/logs/log_pine.png diff --git a/src/main/resources/assets/miscutils/textures/blocks/trees/logs/log_pine_top.png b/src/main/resources/assets/miscutils/textures/blocks/trees/logs/log_pine_top.png Binary files differnew file mode 100644 index 0000000000..146b0a99b6 --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/blocks/trees/logs/log_pine_top.png diff --git a/src/resources/assets/miscutils/textures/blocks/trees/logs/log_rainforest.png b/src/main/resources/assets/miscutils/textures/blocks/trees/logs/log_rainforest.png Binary files differindex 3ff2ee2021..3ff2ee2021 100644 --- a/src/resources/assets/miscutils/textures/blocks/trees/logs/log_rainforest.png +++ b/src/main/resources/assets/miscutils/textures/blocks/trees/logs/log_rainforest.png diff --git a/src/resources/assets/miscutils/textures/blocks/trees/logs/log_rainforest_top.png b/src/main/resources/assets/miscutils/textures/blocks/trees/logs/log_rainforest_top.png Binary files differindex 99137b6f26..99137b6f26 100644 --- a/src/resources/assets/miscutils/textures/blocks/trees/logs/log_rainforest_top.png +++ b/src/main/resources/assets/miscutils/textures/blocks/trees/logs/log_rainforest_top.png diff --git a/src/resources/assets/miscutils/textures/blocks/trees/saplings/sapling_pine.png b/src/main/resources/assets/miscutils/textures/blocks/trees/saplings/sapling_pine.png Binary files differindex f4c3ca84ac..f4c3ca84ac 100644 --- a/src/resources/assets/miscutils/textures/blocks/trees/saplings/sapling_pine.png +++ b/src/main/resources/assets/miscutils/textures/blocks/trees/saplings/sapling_pine.png diff --git a/src/resources/assets/miscutils/textures/blocks/trees/saplings/sapling_rainforest.png b/src/main/resources/assets/miscutils/textures/blocks/trees/saplings/sapling_rainforest.png Binary files differindex 93d414d695..93d414d695 100644 --- a/src/resources/assets/miscutils/textures/blocks/trees/saplings/sapling_rainforest.png +++ b/src/main/resources/assets/miscutils/textures/blocks/trees/saplings/sapling_rainforest.png diff --git a/src/resources/assets/miscutils/textures/blocks/workbench.png b/src/main/resources/assets/miscutils/textures/blocks/workbench.png Binary files differindex b40ad65c71..b40ad65c71 100644 --- a/src/resources/assets/miscutils/textures/blocks/workbench.png +++ b/src/main/resources/assets/miscutils/textures/blocks/workbench.png diff --git a/src/resources/assets/miscutils/textures/blocks/workbench_top.png b/src/main/resources/assets/miscutils/textures/blocks/workbench_top.png Binary files differindex 5cd53a54bf..5cd53a54bf 100644 --- a/src/resources/assets/miscutils/textures/blocks/workbench_top.png +++ b/src/main/resources/assets/miscutils/textures/blocks/workbench_top.png diff --git a/src/resources/assets/miscutils/textures/entity/australia/boar.png b/src/main/resources/assets/miscutils/textures/entity/australia/boar.png Binary files differindex 147fc906fc..147fc906fc 100644 --- a/src/resources/assets/miscutils/textures/entity/australia/boar.png +++ b/src/main/resources/assets/miscutils/textures/entity/australia/boar.png diff --git a/src/resources/assets/miscutils/textures/entity/australia/bush_spider.png b/src/main/resources/assets/miscutils/textures/entity/australia/bush_spider.png Binary files differindex 5e05105be5..5e05105be5 100644 --- a/src/resources/assets/miscutils/textures/entity/australia/bush_spider.png +++ b/src/main/resources/assets/miscutils/textures/entity/australia/bush_spider.png diff --git a/src/resources/assets/miscutils/textures/entity/australia/dingo/dingo.png b/src/main/resources/assets/miscutils/textures/entity/australia/dingo/dingo.png Binary files differindex 3fa3b44ea7..3fa3b44ea7 100644 --- a/src/resources/assets/miscutils/textures/entity/australia/dingo/dingo.png +++ b/src/main/resources/assets/miscutils/textures/entity/australia/dingo/dingo.png diff --git a/src/resources/assets/miscutils/textures/entity/australia/dingo/dingo_angry.png b/src/main/resources/assets/miscutils/textures/entity/australia/dingo/dingo_angry.png Binary files differindex 9b2912aba5..9b2912aba5 100644 --- a/src/resources/assets/miscutils/textures/entity/australia/dingo/dingo_angry.png +++ b/src/main/resources/assets/miscutils/textures/entity/australia/dingo/dingo_angry.png diff --git a/src/resources/assets/miscutils/textures/entity/australia/dingo/dingo_collar.png b/src/main/resources/assets/miscutils/textures/entity/australia/dingo/dingo_collar.png Binary files differindex 6e37c611cb..6e37c611cb 100644 --- a/src/resources/assets/miscutils/textures/entity/australia/dingo/dingo_collar.png +++ b/src/main/resources/assets/miscutils/textures/entity/australia/dingo/dingo_collar.png diff --git a/src/resources/assets/miscutils/textures/entity/australia/dingo/dingo_tame.png b/src/main/resources/assets/miscutils/textures/entity/australia/dingo/dingo_tame.png Binary files differindex cd539c5773..cd539c5773 100644 --- a/src/resources/assets/miscutils/textures/entity/australia/dingo/dingo_tame.png +++ b/src/main/resources/assets/miscutils/textures/entity/australia/dingo/dingo_tame.png diff --git a/src/resources/assets/miscutils/textures/entity/australia/octopus.png b/src/main/resources/assets/miscutils/textures/entity/australia/octopus.png Binary files differindex 8ce98b003c..8ce98b003c 100644 --- a/src/resources/assets/miscutils/textures/entity/australia/octopus.png +++ b/src/main/resources/assets/miscutils/textures/entity/australia/octopus.png diff --git a/src/resources/assets/miscutils/textures/entity/batKing.png b/src/main/resources/assets/miscutils/textures/entity/batKing.png Binary files differindex ced2722563..ced2722563 100644 --- a/src/resources/assets/miscutils/textures/entity/batKing.png +++ b/src/main/resources/assets/miscutils/textures/entity/batKing.png diff --git a/src/resources/assets/miscutils/textures/entity/golemStaballoy.png b/src/main/resources/assets/miscutils/textures/entity/golemStaballoy.png Binary files differindex 307a25bd3f..307a25bd3f 100644 --- a/src/resources/assets/miscutils/textures/entity/golemStaballoy.png +++ b/src/main/resources/assets/miscutils/textures/entity/golemStaballoy.png diff --git a/src/resources/assets/miscutils/textures/entity/sickBlaze.png b/src/main/resources/assets/miscutils/textures/entity/sickBlaze.png Binary files differindex d2b36d633d..d2b36d633d 100644 --- a/src/resources/assets/miscutils/textures/entity/sickBlaze.png +++ b/src/main/resources/assets/miscutils/textures/entity/sickBlaze.png diff --git a/src/resources/assets/miscutils/textures/entity/villager/aboriginal.png b/src/main/resources/assets/miscutils/textures/entity/villager/aboriginal.png Binary files differindex cd0474869f..cd0474869f 100644 --- a/src/resources/assets/miscutils/textures/entity/villager/aboriginal.png +++ b/src/main/resources/assets/miscutils/textures/entity/villager/aboriginal.png diff --git a/src/resources/assets/miscutils/textures/entity/villager/banker.png b/src/main/resources/assets/miscutils/textures/entity/villager/banker.png Binary files differindex afe65842cb..afe65842cb 100644 --- a/src/resources/assets/miscutils/textures/entity/villager/banker.png +++ b/src/main/resources/assets/miscutils/textures/entity/villager/banker.png diff --git a/src/resources/assets/miscutils/textures/entity/villager/technician.png b/src/main/resources/assets/miscutils/textures/entity/villager/technician.png Binary files differindex 3df6503f9e..3df6503f9e 100644 --- a/src/resources/assets/miscutils/textures/entity/villager/technician.png +++ b/src/main/resources/assets/miscutils/textures/entity/villager/technician.png diff --git a/src/resources/assets/miscutils/textures/entity/villager/trader.png b/src/main/resources/assets/miscutils/textures/entity/villager/trader.png Binary files differindex f21c4eea6c..f21c4eea6c 100644 --- a/src/resources/assets/miscutils/textures/entity/villager/trader.png +++ b/src/main/resources/assets/miscutils/textures/entity/villager/trader.png diff --git a/src/resources/assets/miscutils/textures/enviroment/moon_phases.png b/src/main/resources/assets/miscutils/textures/enviroment/moon_phases.png Binary files differindex 9131d0f58c..9131d0f58c 100644 --- a/src/resources/assets/miscutils/textures/enviroment/moon_phases.png +++ b/src/main/resources/assets/miscutils/textures/enviroment/moon_phases.png diff --git a/src/resources/assets/miscutils/textures/enviroment/snow.png b/src/main/resources/assets/miscutils/textures/enviroment/snow.png Binary files differindex a91935ee0e..a91935ee0e 100644 --- a/src/resources/assets/miscutils/textures/enviroment/snow.png +++ b/src/main/resources/assets/miscutils/textures/enviroment/snow.png diff --git a/src/resources/assets/miscutils/textures/enviroment/sun.png b/src/main/resources/assets/miscutils/textures/enviroment/sun.png Binary files differindex 6c25e9c637..6c25e9c637 100644 --- a/src/resources/assets/miscutils/textures/enviroment/sun.png +++ b/src/main/resources/assets/miscutils/textures/enviroment/sun.png diff --git a/src/resources/assets/miscutils/textures/gui/AdvancedBoiler.png b/src/main/resources/assets/miscutils/textures/gui/AdvancedBoiler.png Binary files differindex e678d0fdb2..e678d0fdb2 100644 --- a/src/resources/assets/miscutils/textures/gui/AdvancedBoiler.png +++ b/src/main/resources/assets/miscutils/textures/gui/AdvancedBoiler.png diff --git a/src/resources/assets/miscutils/textures/gui/AdvancedCraftingTable.png b/src/main/resources/assets/miscutils/textures/gui/AdvancedCraftingTable.png Binary files differindex 1b2314c488..1b2314c488 100644 --- a/src/resources/assets/miscutils/textures/gui/AdvancedCraftingTable.png +++ b/src/main/resources/assets/miscutils/textures/gui/AdvancedCraftingTable.png diff --git a/src/resources/assets/miscutils/textures/gui/BronzeCraftingTable.png b/src/main/resources/assets/miscutils/textures/gui/BronzeCraftingTable.png Binary files differindex ea9319a50e..ea9319a50e 100644 --- a/src/resources/assets/miscutils/textures/gui/BronzeCraftingTable.png +++ b/src/main/resources/assets/miscutils/textures/gui/BronzeCraftingTable.png diff --git a/src/resources/assets/miscutils/textures/gui/CircuitProgrammer.png b/src/main/resources/assets/miscutils/textures/gui/CircuitProgrammer.png Binary files differindex 8f77124bbb..8f77124bbb 100644 --- a/src/resources/assets/miscutils/textures/gui/CircuitProgrammer.png +++ b/src/main/resources/assets/miscutils/textures/gui/CircuitProgrammer.png diff --git a/src/resources/assets/miscutils/textures/gui/CokeOven.png b/src/main/resources/assets/miscutils/textures/gui/CokeOven.png Binary files differindex c094d9c319..c094d9c319 100644 --- a/src/resources/assets/miscutils/textures/gui/CokeOven.png +++ b/src/main/resources/assets/miscutils/textures/gui/CokeOven.png diff --git a/src/resources/assets/miscutils/textures/gui/Cyclotron.png b/src/main/resources/assets/miscutils/textures/gui/Cyclotron.png Binary files differindex 98c374ace8..98c374ace8 100644 --- a/src/resources/assets/miscutils/textures/gui/Cyclotron.png +++ b/src/main/resources/assets/miscutils/textures/gui/Cyclotron.png diff --git a/src/resources/assets/miscutils/textures/gui/FishTrap.png b/src/main/resources/assets/miscutils/textures/gui/FishTrap.png Binary files differindex 35423fffb9..35423fffb9 100644 --- a/src/resources/assets/miscutils/textures/gui/FishTrap.png +++ b/src/main/resources/assets/miscutils/textures/gui/FishTrap.png diff --git a/src/resources/assets/miscutils/textures/gui/FluidReactor.png b/src/main/resources/assets/miscutils/textures/gui/FluidReactor.png Binary files differindex b8e88bd461..b8e88bd461 100644 --- a/src/resources/assets/miscutils/textures/gui/FluidReactor.png +++ b/src/main/resources/assets/miscutils/textures/gui/FluidReactor.png diff --git a/src/resources/assets/miscutils/textures/gui/Generic3By3.png b/src/main/resources/assets/miscutils/textures/gui/Generic3By3.png Binary files differindex 1d8c806693..1d8c806693 100644 --- a/src/resources/assets/miscutils/textures/gui/Generic3By3.png +++ b/src/main/resources/assets/miscutils/textures/gui/Generic3By3.png diff --git a/src/resources/assets/miscutils/textures/gui/IndustrialCentrifuge.png b/src/main/resources/assets/miscutils/textures/gui/IndustrialCentrifuge.png Binary files differindex 95ec56941d..95ec56941d 100644 --- a/src/resources/assets/miscutils/textures/gui/IndustrialCentrifuge.png +++ b/src/main/resources/assets/miscutils/textures/gui/IndustrialCentrifuge.png diff --git a/src/resources/assets/miscutils/textures/gui/IndustrialCuttingMachine.png b/src/main/resources/assets/miscutils/textures/gui/IndustrialCuttingMachine.png Binary files differindex a555f14f11..a555f14f11 100644 --- a/src/resources/assets/miscutils/textures/gui/IndustrialCuttingMachine.png +++ b/src/main/resources/assets/miscutils/textures/gui/IndustrialCuttingMachine.png diff --git a/src/resources/assets/miscutils/textures/gui/IndustrialElectrolyzer.png b/src/main/resources/assets/miscutils/textures/gui/IndustrialElectrolyzer.png Binary files differindex ec8d7eb118..ec8d7eb118 100644 --- a/src/resources/assets/miscutils/textures/gui/IndustrialElectrolyzer.png +++ b/src/main/resources/assets/miscutils/textures/gui/IndustrialElectrolyzer.png diff --git a/src/resources/assets/miscutils/textures/gui/IndustrialExtruder.png b/src/main/resources/assets/miscutils/textures/gui/IndustrialExtruder.png Binary files differindex a555f14f11..a555f14f11 100644 --- a/src/resources/assets/miscutils/textures/gui/IndustrialExtruder.png +++ b/src/main/resources/assets/miscutils/textures/gui/IndustrialExtruder.png diff --git a/src/resources/assets/miscutils/textures/gui/IndustrialMixer.png b/src/main/resources/assets/miscutils/textures/gui/IndustrialMixer.png Binary files differindex 1c24391f02..1c24391f02 100644 --- a/src/resources/assets/miscutils/textures/gui/IndustrialMixer.png +++ b/src/main/resources/assets/miscutils/textures/gui/IndustrialMixer.png diff --git a/src/resources/assets/miscutils/textures/gui/IndustrialSifter.png b/src/main/resources/assets/miscutils/textures/gui/IndustrialSifter.png Binary files differindex 34641e3a09..34641e3a09 100644 --- a/src/resources/assets/miscutils/textures/gui/IndustrialSifter.png +++ b/src/main/resources/assets/miscutils/textures/gui/IndustrialSifter.png diff --git a/src/resources/assets/miscutils/textures/gui/IndustrialThermalCentrifuge.png b/src/main/resources/assets/miscutils/textures/gui/IndustrialThermalCentrifuge.png Binary files differindex d75e2b6ae6..d75e2b6ae6 100644 --- a/src/resources/assets/miscutils/textures/gui/IndustrialThermalCentrifuge.png +++ b/src/main/resources/assets/miscutils/textures/gui/IndustrialThermalCentrifuge.png diff --git a/src/resources/assets/miscutils/textures/gui/IndustrialWashPlant.png b/src/main/resources/assets/miscutils/textures/gui/IndustrialWashPlant.png Binary files differindex 4475138f7b..4475138f7b 100644 --- a/src/resources/assets/miscutils/textures/gui/IndustrialWashPlant.png +++ b/src/main/resources/assets/miscutils/textures/gui/IndustrialWashPlant.png diff --git a/src/resources/assets/miscutils/textures/gui/IndustrialWireFactory.png b/src/main/resources/assets/miscutils/textures/gui/IndustrialWireFactory.png Binary files differindex dd0c5ce5e7..dd0c5ce5e7 100644 --- a/src/resources/assets/miscutils/textures/gui/IndustrialWireFactory.png +++ b/src/main/resources/assets/miscutils/textures/gui/IndustrialWireFactory.png diff --git a/src/resources/assets/miscutils/textures/gui/IronBlastFurnace.png b/src/main/resources/assets/miscutils/textures/gui/IronBlastFurnace.png Binary files differindex c2ccbba96b..c2ccbba96b 100644 --- a/src/resources/assets/miscutils/textures/gui/IronBlastFurnace.png +++ b/src/main/resources/assets/miscutils/textures/gui/IronBlastFurnace.png diff --git a/src/resources/assets/miscutils/textures/gui/MacerationStack.png b/src/main/resources/assets/miscutils/textures/gui/MacerationStack.png Binary files differindex 7fb4099566..7fb4099566 100644 --- a/src/resources/assets/miscutils/textures/gui/MacerationStack.png +++ b/src/main/resources/assets/miscutils/textures/gui/MacerationStack.png diff --git a/src/resources/assets/miscutils/textures/gui/MaterialPress.png b/src/main/resources/assets/miscutils/textures/gui/MaterialPress.png Binary files differindex 70befc17f0..70befc17f0 100644 --- a/src/resources/assets/miscutils/textures/gui/MaterialPress.png +++ b/src/main/resources/assets/miscutils/textures/gui/MaterialPress.png diff --git a/src/resources/assets/miscutils/textures/gui/MatterFabricator.png b/src/main/resources/assets/miscutils/textures/gui/MatterFabricator.png Binary files differindex 1d5e9d27b8..1d5e9d27b8 100644 --- a/src/resources/assets/miscutils/textures/gui/MatterFabricator.png +++ b/src/main/resources/assets/miscutils/textures/gui/MatterFabricator.png diff --git a/src/resources/assets/miscutils/textures/gui/ModularityTable.png b/src/main/resources/assets/miscutils/textures/gui/ModularityTable.png Binary files differindex 1a455d4f95..1a455d4f95 100644 --- a/src/resources/assets/miscutils/textures/gui/ModularityTable.png +++ b/src/main/resources/assets/miscutils/textures/gui/ModularityTable.png diff --git a/src/resources/assets/miscutils/textures/gui/MultiblockDisplay.png b/src/main/resources/assets/miscutils/textures/gui/MultiblockDisplay.png Binary files differindex bec61bce18..bec61bce18 100644 --- a/src/resources/assets/miscutils/textures/gui/MultiblockDisplay.png +++ b/src/main/resources/assets/miscutils/textures/gui/MultiblockDisplay.png diff --git a/src/resources/assets/miscutils/textures/gui/MultiblockDisplay_Generic.png b/src/main/resources/assets/miscutils/textures/gui/MultiblockDisplay_Generic.png Binary files differindex c1ed0e5f37..c1ed0e5f37 100644 --- a/src/resources/assets/miscutils/textures/gui/MultiblockDisplay_Generic.png +++ b/src/main/resources/assets/miscutils/textures/gui/MultiblockDisplay_Generic.png diff --git a/src/resources/assets/miscutils/textures/gui/PestKiller.png b/src/main/resources/assets/miscutils/textures/gui/PestKiller.png Binary files differindex d1978ae04a..d1978ae04a 100644 --- a/src/resources/assets/miscutils/textures/gui/PestKiller.png +++ b/src/main/resources/assets/miscutils/textures/gui/PestKiller.png diff --git a/src/resources/assets/miscutils/textures/gui/PollutionCleaner.png b/src/main/resources/assets/miscutils/textures/gui/PollutionCleaner.png Binary files differindex 6162c2fdc3..6162c2fdc3 100644 --- a/src/resources/assets/miscutils/textures/gui/PollutionCleaner.png +++ b/src/main/resources/assets/miscutils/textures/gui/PollutionCleaner.png diff --git a/src/resources/assets/miscutils/textures/gui/PowerSubStation.png b/src/main/resources/assets/miscutils/textures/gui/PowerSubStation.png Binary files differindex a764dc719a..a764dc719a 100644 --- a/src/resources/assets/miscutils/textures/gui/PowerSubStation.png +++ b/src/main/resources/assets/miscutils/textures/gui/PowerSubStation.png diff --git a/src/resources/assets/miscutils/textures/gui/ProjectTable.png b/src/main/resources/assets/miscutils/textures/gui/ProjectTable.png Binary files differindex e8f65a6752..e8f65a6752 100644 --- a/src/resources/assets/miscutils/textures/gui/ProjectTable.png +++ b/src/main/resources/assets/miscutils/textures/gui/ProjectTable.png diff --git a/src/resources/assets/miscutils/textures/gui/RoundRobinator.png b/src/main/resources/assets/miscutils/textures/gui/RoundRobinator.png Binary files differindex 54c06f22ae..54c06f22ae 100644 --- a/src/resources/assets/miscutils/textures/gui/RoundRobinator.png +++ b/src/main/resources/assets/miscutils/textures/gui/RoundRobinator.png diff --git a/src/resources/assets/miscutils/textures/gui/SafeBlock.png b/src/main/resources/assets/miscutils/textures/gui/SafeBlock.png Binary files differindex fe60913941..fe60913941 100644 --- a/src/resources/assets/miscutils/textures/gui/SafeBlock.png +++ b/src/main/resources/assets/miscutils/textures/gui/SafeBlock.png diff --git a/src/resources/assets/miscutils/textures/gui/SlowFusion.png b/src/main/resources/assets/miscutils/textures/gui/SlowFusion.png Binary files differindex 76c6c91ad1..76c6c91ad1 100644 --- a/src/resources/assets/miscutils/textures/gui/SlowFusion.png +++ b/src/main/resources/assets/miscutils/textures/gui/SlowFusion.png diff --git a/src/resources/assets/miscutils/textures/gui/SteelBoiler.png b/src/main/resources/assets/miscutils/textures/gui/SteelBoiler.png Binary files differindex e4f2869e8f..e4f2869e8f 100644 --- a/src/resources/assets/miscutils/textures/gui/SteelBoiler.png +++ b/src/main/resources/assets/miscutils/textures/gui/SteelBoiler.png diff --git a/src/resources/assets/miscutils/textures/gui/SuperJukebox.png b/src/main/resources/assets/miscutils/textures/gui/SuperJukebox.png Binary files differindex c50c0da4a5..c50c0da4a5 100644 --- a/src/resources/assets/miscutils/textures/gui/SuperJukebox.png +++ b/src/main/resources/assets/miscutils/textures/gui/SuperJukebox.png diff --git a/src/resources/assets/miscutils/textures/gui/TreeFarmer.png b/src/main/resources/assets/miscutils/textures/gui/TreeFarmer.png Binary files differindex cd2e86dcb4..cd2e86dcb4 100644 --- a/src/resources/assets/miscutils/textures/gui/TreeFarmer.png +++ b/src/main/resources/assets/miscutils/textures/gui/TreeFarmer.png diff --git a/src/resources/assets/miscutils/textures/gui/VolumetricFlaskSetter.png b/src/main/resources/assets/miscutils/textures/gui/VolumetricFlaskSetter.png Binary files differindex 08f9761233..08f9761233 100644 --- a/src/resources/assets/miscutils/textures/gui/VolumetricFlaskSetter.png +++ b/src/main/resources/assets/miscutils/textures/gui/VolumetricFlaskSetter.png diff --git a/src/resources/assets/miscutils/textures/gui/Workbench.png b/src/main/resources/assets/miscutils/textures/gui/Workbench.png Binary files differindex 95d93d3c4c..95d93d3c4c 100644 --- a/src/resources/assets/miscutils/textures/gui/Workbench.png +++ b/src/main/resources/assets/miscutils/textures/gui/Workbench.png diff --git a/src/resources/assets/miscutils/textures/gui/helium_collector_gui.png b/src/main/resources/assets/miscutils/textures/gui/helium_collector_gui.png Binary files differindex b22d0ed947..b22d0ed947 100644 --- a/src/resources/assets/miscutils/textures/gui/helium_collector_gui.png +++ b/src/main/resources/assets/miscutils/textures/gui/helium_collector_gui.png diff --git a/src/resources/assets/miscutils/textures/gui/itemBackpack.png b/src/main/resources/assets/miscutils/textures/gui/itemBackpack.png Binary files differindex 08ac08a2db..08ac08a2db 100644 --- a/src/resources/assets/miscutils/textures/gui/itemBackpack.png +++ b/src/main/resources/assets/miscutils/textures/gui/itemBackpack.png diff --git a/src/resources/assets/miscutils/textures/gui/itemGrindle.png b/src/main/resources/assets/miscutils/textures/gui/itemGrindle.png Binary files differindex 98ccb311d0..98ccb311d0 100644 --- a/src/resources/assets/miscutils/textures/gui/itemGrindle.png +++ b/src/main/resources/assets/miscutils/textures/gui/itemGrindle.png diff --git a/src/resources/assets/miscutils/textures/gui/machine_Charger.png b/src/main/resources/assets/miscutils/textures/gui/machine_Charger.png Binary files differindex dcad2b2983..dcad2b2983 100644 --- a/src/resources/assets/miscutils/textures/gui/machine_Charger.png +++ b/src/main/resources/assets/miscutils/textures/gui/machine_Charger.png diff --git a/src/resources/assets/miscutils/textures/gui/nei/decayables.png b/src/main/resources/assets/miscutils/textures/gui/nei/decayables.png Binary files differindex d1827433a0..d1827433a0 100644 --- a/src/resources/assets/miscutils/textures/gui/nei/decayables.png +++ b/src/main/resources/assets/miscutils/textures/gui/nei/decayables.png diff --git a/src/resources/assets/miscutils/textures/gui/nei/widgets.png b/src/main/resources/assets/miscutils/textures/gui/nei/widgets.png Binary files differindex 0dc26c43e4..0dc26c43e4 100644 --- a/src/resources/assets/miscutils/textures/gui/nei/widgets.png +++ b/src/main/resources/assets/miscutils/textures/gui/nei/widgets.png diff --git a/src/resources/assets/miscutils/textures/items/IndustrialDiamondExquisite.png b/src/main/resources/assets/miscutils/textures/items/IndustrialDiamondExquisite.png Binary files differindex 5427f66858..5427f66858 100644 --- a/src/resources/assets/miscutils/textures/items/IndustrialDiamondExquisite.png +++ b/src/main/resources/assets/miscutils/textures/items/IndustrialDiamondExquisite.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/0.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/0.png Binary files differindex 4a7c1ce427..4a7c1ce427 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/0.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/0.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/1.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/1.png Binary files differindex 4a7c1ce427..4a7c1ce427 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/1.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/1.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/10.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/10.png Binary files differindex bf81a1b4b2..bf81a1b4b2 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/10.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/10.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/100.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/100.png Binary files differindex cedee004e4..cedee004e4 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/100.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/100.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/101.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/101.png Binary files differindex 1ebe9648e6..1ebe9648e6 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/101.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/101.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/102.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/102.png Binary files differindex c73159e9da..c73159e9da 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/102.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/102.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/103.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/103.png Binary files differindex 5e2e56f927..5e2e56f927 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/103.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/103.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/104.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/104.png Binary files differindex 8ad5f2ee31..8ad5f2ee31 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/104.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/104.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/105.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/105.png Binary files differindex f9ebf8c4a5..f9ebf8c4a5 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/105.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/105.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/106.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/106.png Binary files differindex b3b257e59c..b3b257e59c 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/106.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/106.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/107.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/107.png Binary files differindex 3d47ce434c..3d47ce434c 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/107.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/107.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/108.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/108.png Binary files differindex 2b99670ea1..2b99670ea1 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/108.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/108.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/109.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/109.png Binary files differindex e516903d26..e516903d26 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/109.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/109.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/11.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/11.png Binary files differindex bf81a1b4b2..bf81a1b4b2 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/11.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/11.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/110.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/110.png Binary files differindex 97767a73c6..97767a73c6 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/110.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/110.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/111.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/111.png Binary files differindex 3147037815..3147037815 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/111.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/111.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/112.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/112.png Binary files differindex dce530370f..dce530370f 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/112.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/112.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/113.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/113.png Binary files differindex 0c85939327..0c85939327 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/113.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/113.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/114.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/114.png Binary files differindex b3c3716abb..b3c3716abb 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/114.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/114.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/115.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/115.png Binary files differindex a9a9c6fcee..a9a9c6fcee 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/115.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/115.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/12.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/12.png Binary files differindex 051b45e6bc..051b45e6bc 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/12.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/12.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/13.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/13.png Binary files differindex 051b45e6bc..051b45e6bc 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/13.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/13.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/130.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/130.png Binary files differindex 1938287f27..1938287f27 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/130.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/130.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/131.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/131.png Binary files differindex 327e530f1b..327e530f1b 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/131.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/131.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/132.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/132.png Binary files differindex 635be463af..635be463af 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/132.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/132.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/133.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/133.png Binary files differindex 24afa30c17..24afa30c17 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/133.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/133.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/134.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/134.png Binary files differindex 847e54ef60..847e54ef60 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/134.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/134.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/135.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/135.png Binary files differindex ddd9cb7a2f..ddd9cb7a2f 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/135.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/135.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/136.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/136.png Binary files differindex e21c4fb78c..e21c4fb78c 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/136.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/136.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/137.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/137.png Binary files differindex 29e270f862..29e270f862 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/137.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/137.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/138.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/138.png Binary files differindex 87a48050fd..87a48050fd 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/138.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/138.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/139.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/139.png Binary files differindex 3836414587..3836414587 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/139.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/139.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/14.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/14.png Binary files differindex 051b45e6bc..051b45e6bc 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/14.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/14.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/140.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/140.png Binary files differindex 8b38dcd9ce..8b38dcd9ce 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/140.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/140.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/141.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/141.png Binary files differindex 53682976a8..53682976a8 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/141.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/141.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/142.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/142.png Binary files differindex 8a21902982..8a21902982 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/142.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/142.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/143.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/143.png Binary files differindex 81f418e1a8..81f418e1a8 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/143.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/143.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/144.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/144.png Binary files differindex 2e66f92a2c..2e66f92a2c 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/144.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/144.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/145.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/145.png Binary files differindex 61a783176e..61a783176e 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/145.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/145.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/146.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/146.png Binary files differindex 16a79d6896..16a79d6896 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/146.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/146.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/147.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/147.png Binary files differindex 4b39623750..4b39623750 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/147.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/147.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/148.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/148.png Binary files differindex fbe1b9ac82..fbe1b9ac82 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/148.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/148.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/149.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/149.png Binary files differindex 5979772ace..5979772ace 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/149.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/149.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/15.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/15.png Binary files differindex 051b45e6bc..051b45e6bc 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/15.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/15.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/150.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/150.png Binary files differindex 254680aff4..254680aff4 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/150.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/150.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/151.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/151.png Binary files differindex 29ba464570..29ba464570 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/151.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/151.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/16.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/16.png Binary files differindex 5ddb32de79..5ddb32de79 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/16.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/16.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/160.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/160.png Binary files differindex fa7f814d3a..fa7f814d3a 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/160.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/160.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/161.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/161.png Binary files differindex 673c6e011b..673c6e011b 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/161.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/161.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/162.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/162.png Binary files differindex 65fc3f7d6e..65fc3f7d6e 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/162.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/162.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/17.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/17.png Binary files differindex 5ddb32de79..5ddb32de79 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/17.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/17.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/18.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/18.png Binary files differindex 5ddb32de79..5ddb32de79 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/18.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/18.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/19.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/19.png Binary files differindex 5ddb32de79..5ddb32de79 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/19.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/19.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/2.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/2.png Binary files differindex 4a7c1ce427..4a7c1ce427 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/2.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/2.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/20.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/20.png Binary files differindex 38f7ec8756..38f7ec8756 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/20.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/20.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/200.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/200.png Binary files differindex e10815677a..e10815677a 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/200.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/200.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/201.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/201.png Binary files differindex 661cd14817..661cd14817 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/201.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/201.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/202.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/202.png Binary files differindex 6c64b90877..6c64b90877 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/202.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/202.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/203.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/203.png Binary files differindex ec3c0358a1..ec3c0358a1 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/203.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/203.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/204.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/204.png Binary files differindex daace0f92a..daace0f92a 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/204.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/204.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/205.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/205.png Binary files differindex f5d5a1bc39..f5d5a1bc39 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/205.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/205.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/206.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/206.png Binary files differindex d6ff394c66..d6ff394c66 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/206.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/206.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/207.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/207.png Binary files differindex 9f03d572b7..9f03d572b7 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/207.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/207.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/208.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/208.png Binary files differindex 548784db2a..548784db2a 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/208.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/208.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/21.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/21.png Binary files differindex 38f7ec8756..38f7ec8756 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/21.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/21.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/210.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/210.png Binary files differindex 6f403c14f5..6f403c14f5 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/210.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/210.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/211.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/211.png Binary files differindex 6614c152a6..6614c152a6 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/211.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/211.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/212.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/212.png Binary files differindex 98c4b4f2b7..98c4b4f2b7 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/212.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/212.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/213.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/213.png Binary files differindex 7da7ab1e69..7da7ab1e69 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/213.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/213.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/214.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/214.png Binary files differindex 56da7e8d0d..56da7e8d0d 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/214.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/214.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/215.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/215.png Binary files differindex cffad53f13..cffad53f13 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/215.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/215.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/216.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/216.png Binary files differindex 6c9c006044..6c9c006044 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/216.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/216.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/217.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/217.png Binary files differindex ee1c87e1b1..ee1c87e1b1 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/217.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/217.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/218.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/218.png Binary files differindex 5d6a74cd72..5d6a74cd72 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/218.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/218.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/219.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/219.png Binary files differindex 881bdaa78a..881bdaa78a 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/219.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/219.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/22.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/22.png Binary files differindex 38f7ec8756..38f7ec8756 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/22.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/22.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/220.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/220.png Binary files differindex 00900203dc..00900203dc 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/220.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/220.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/221.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/221.png Binary files differindex ccf9edc4a4..ccf9edc4a4 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/221.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/221.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/23.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/23.png Binary files differindex 38f7ec8756..38f7ec8756 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/23.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/23.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/24.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/24.png Binary files differindex a1c2183ee8..a1c2183ee8 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/24.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/24.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/25.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/25.png Binary files differindex a1c2183ee8..a1c2183ee8 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/25.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/25.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/26.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/26.png Binary files differindex a1c2183ee8..a1c2183ee8 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/26.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/26.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/27.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/27.png Binary files differindex a1c2183ee8..a1c2183ee8 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/27.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/27.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/28.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/28.png Binary files differindex 5e4886b0f8..5e4886b0f8 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/28.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/28.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/29.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/29.png Binary files differindex 5e4886b0f8..5e4886b0f8 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/29.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/29.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/3.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/3.png Binary files differindex 4a7c1ce427..4a7c1ce427 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/3.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/3.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/30.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/30.png Binary files differindex 5e4886b0f8..5e4886b0f8 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/30.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/30.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/31.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/31.png Binary files differindex 5e4886b0f8..5e4886b0f8 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/31.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/31.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/32.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/32.png Binary files differindex 4a7c1ce427..4a7c1ce427 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/32.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/32.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/33.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/33.png Binary files differindex 1a3acd9e94..1a3acd9e94 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/33.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/33.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/34.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/34.png Binary files differindex bf81a1b4b2..bf81a1b4b2 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/34.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/34.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/35.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/35.png Binary files differindex 051b45e6bc..051b45e6bc 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/35.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/35.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/36.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/36.png Binary files differindex 5ddb32de79..5ddb32de79 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/36.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/36.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/37.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/37.png Binary files differindex 38f7ec8756..38f7ec8756 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/37.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/37.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/38.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/38.png Binary files differindex a1c2183ee8..a1c2183ee8 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/38.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/38.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/39.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/39.png Binary files differindex 5e4886b0f8..5e4886b0f8 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/39.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/39.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/4.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/4.png Binary files differindex 1a3acd9e94..1a3acd9e94 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/4.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/4.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/40.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/40.png Binary files differindex a1b063620a..a1b063620a 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/40.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/40.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/41.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/41.png Binary files differindex 9b9c314475..9b9c314475 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/41.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/41.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/42.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/42.png Binary files differindex b3f174ebd4..b3f174ebd4 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/42.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/42.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/43.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/43.png Binary files differindex 0939c7eb87..0939c7eb87 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/43.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/43.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/44.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/44.png Binary files differindex 23cc1deb66..23cc1deb66 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/44.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/44.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/5.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/5.png Binary files differindex 1a3acd9e94..1a3acd9e94 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/5.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/5.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/50.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/50.png Binary files differindex 52d46cb62c..52d46cb62c 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/50.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/50.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/50/1.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/50/1.png Binary files differindex 6660384d76..6660384d76 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/50/1.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/50/1.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/50/2.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/50/2.png Binary files differindex 0b4e7d6583..0b4e7d6583 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/50/2.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/50/2.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/50/3.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/50/3.png Binary files differindex 554a7d8e52..554a7d8e52 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/50/3.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/50/3.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/50/4.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/50/4.png Binary files differindex b567a0cd15..b567a0cd15 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/50/4.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/50/4.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/50/5.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/50/5.png Binary files differindex 891608d308..891608d308 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/50/5.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/50/5.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/50/6.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/50/6.png Binary files differindex 246319069a..246319069a 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/50/6.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/50/6.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/50/7.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/50/7.png Binary files differindex 296c9b6c97..296c9b6c97 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/50/7.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/50/7.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/50/8.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/50/8.png Binary files differindex fe22c02056..fe22c02056 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/50/8.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/50/8.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/52.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/52.png Binary files differindex 52d46cb62c..52d46cb62c 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/52.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/52.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/52/1.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/52/1.png Binary files differindex 6660384d76..6660384d76 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/52/1.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/52/1.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/52/2.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/52/2.png Binary files differindex 0b4e7d6583..0b4e7d6583 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/52/2.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/52/2.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/52/3.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/52/3.png Binary files differindex 554a7d8e52..554a7d8e52 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/52/3.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/52/3.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/52/4.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/52/4.png Binary files differindex b567a0cd15..b567a0cd15 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/52/4.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/52/4.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/52/5.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/52/5.png Binary files differindex 891608d308..891608d308 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/52/5.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/52/5.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/52/6.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/52/6.png Binary files differindex 246319069a..246319069a 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/52/6.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/52/6.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/52/7.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/52/7.png Binary files differindex 296c9b6c97..296c9b6c97 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/52/7.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/52/7.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/52/8.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/52/8.png Binary files differindex fe22c02056..fe22c02056 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/52/8.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/52/8.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/54.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/54.png Binary files differindex 52d46cb62c..52d46cb62c 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/54.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/54.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/54/1.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/54/1.png Binary files differindex 6660384d76..6660384d76 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/54/1.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/54/1.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/54/2.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/54/2.png Binary files differindex 0b4e7d6583..0b4e7d6583 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/54/2.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/54/2.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/54/3.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/54/3.png Binary files differindex 554a7d8e52..554a7d8e52 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/54/3.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/54/3.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/54/4.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/54/4.png Binary files differindex b567a0cd15..b567a0cd15 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/54/4.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/54/4.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/54/5.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/54/5.png Binary files differindex 891608d308..891608d308 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/54/5.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/54/5.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/54/6.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/54/6.png Binary files differindex 246319069a..246319069a 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/54/6.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/54/6.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/54/7.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/54/7.png Binary files differindex 296c9b6c97..296c9b6c97 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/54/7.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/54/7.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/54/8.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/54/8.png Binary files differindex fe22c02056..fe22c02056 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/54/8.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/54/8.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/55.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/55.png Binary files differindex 23e0a10e06..23e0a10e06 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/55.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/55.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/6.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/6.png Binary files differindex 1a3acd9e94..1a3acd9e94 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/6.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/6.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/60.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/60.png Binary files differindex 08122e5042..08122e5042 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/60.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/60.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/61.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/61.png Binary files differindex f1756e78ba..f1756e78ba 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/61.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/61.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/62.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/62.png Binary files differindex 9190330469..9190330469 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/62.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/62.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/63.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/63.png Binary files differindex f1756e78ba..f1756e78ba 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/63.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/63.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/64.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/64.png Binary files differindex 032a256989..032a256989 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/64.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/64.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/66.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/66.png Binary files differindex d96558c8f5..d96558c8f5 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/66.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/66.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/68.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/68.png Binary files differindex 4d8f366b9c..4d8f366b9c 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/68.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/68.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/7.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/7.png Binary files differindex 1a3acd9e94..1a3acd9e94 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/7.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/7.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/70.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/70.png Binary files differindex e914a7c788..e914a7c788 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/70.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/70.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/700.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/700.png Binary files differindex af05b249b2..af05b249b2 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/700.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/700.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/701.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/701.png Binary files differindex 87d68083fa..87d68083fa 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/701.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/701.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/702.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/702.png Binary files differindex 197729ce5c..197729ce5c 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/702.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/702.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/703.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/703.png Binary files differindex 9f75ddb6f2..9f75ddb6f2 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/703.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/703.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/704.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/704.png Binary files differindex 011f12583d..011f12583d 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/704.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/704.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/705.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/705.png Binary files differindex 2968f9e0f9..2968f9e0f9 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/705.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/705.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/706.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/706.png Binary files differindex ab26c57778..ab26c57778 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/706.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/706.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/707.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/707.png Binary files differindex 84cb315d59..84cb315d59 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/707.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/707.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/708.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/708.png Binary files differindex ac695c9089..ac695c9089 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/708.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/708.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/71.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/71.png Binary files differindex bd629f0ee4..bd629f0ee4 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/71.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/71.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/710.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/710.png Binary files differindex 9555795cbe..9555795cbe 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/710.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/710.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/711.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/711.png Binary files differindex b8294d66d5..b8294d66d5 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/711.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/711.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/712.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/712.png Binary files differindex d1ddb92013..d1ddb92013 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/712.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/712.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/713.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/713.png Binary files differindex db0d4d4dde..db0d4d4dde 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/713.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/713.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/714.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/714.png Binary files differindex dd3de3ecff..dd3de3ecff 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/714.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/714.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/715.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/715.png Binary files differindex dd3de3ecff..dd3de3ecff 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/715.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/715.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/716.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/716.png Binary files differindex 506ab6621b..506ab6621b 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/716.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/716.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/717.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/717.png Binary files differindex 506ab6621b..506ab6621b 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/717.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/717.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/718.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/718.png Binary files differindex 506ab6621b..506ab6621b 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/718.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/718.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/719.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/719.png Binary files differindex 05c3440206..05c3440206 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/719.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/719.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/72.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/72.png Binary files differindex e1ea94bac6..e1ea94bac6 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/72.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/72.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/720.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/720.png Binary files differindex 6b6d885084..6b6d885084 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/720.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/720.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/721.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/721.png Binary files differindex 23b7878fdd..23b7878fdd 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/721.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/721.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/73.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/73.png Binary files differindex 68de2aba73..68de2aba73 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/73.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/73.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/74.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/74.png Binary files differindex c0d974240c..c0d974240c 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/74.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/74.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/75.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/75.png Binary files differindex e1f8be799b..e1f8be799b 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/75.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/75.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/751.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/751.png Binary files differindex ee106b029f..ee106b029f 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/751.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/751.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/752.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/752.png Binary files differindex 3aed0ef200..3aed0ef200 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/752.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/752.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/753.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/753.png Binary files differindex 03d271872e..03d271872e 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/753.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/753.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/754.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/754.png Binary files differindex dd87199ae2..dd87199ae2 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/754.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/754.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/755.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/755.png Binary files differindex 5b9053e1f4..5b9053e1f4 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/755.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/755.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/756.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/756.png Binary files differindex 23c87b8a2d..23c87b8a2d 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/756.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/756.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/757.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/757.png Binary files differindex 511366e648..511366e648 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/757.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/757.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/758.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/758.png Binary files differindex d8d2012c51..d8d2012c51 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/758.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/758.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/759.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/759.png Binary files differindex 1e538bce45..1e538bce45 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/759.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/759.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/76.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/76.png Binary files differindex ed806126fb..ed806126fb 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/76.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/76.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/77.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/77.png Binary files differindex a7452f94ee..a7452f94ee 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/77.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/77.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/78.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/78.png Binary files differindex e371af02f9..e371af02f9 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/78.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/78.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/79.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/79.png Binary files differindex e911b80d03..e911b80d03 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/79.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/79.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/8.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/8.png Binary files differindex bf81a1b4b2..bf81a1b4b2 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/8.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/8.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/9.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/9.png Binary files differindex bf81a1b4b2..bf81a1b4b2 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/9.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/9.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metatool.01/0.png b/src/main/resources/assets/miscutils/textures/items/MU-metatool.01/0.png Binary files differindex 3bcbace856..3bcbace856 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metatool.01/0.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metatool.01/0.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metatool.01/1.png b/src/main/resources/assets/miscutils/textures/items/MU-metatool.01/1.png Binary files differindex eb6baf34ae..eb6baf34ae 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metatool.01/1.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metatool.01/1.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metatool.01/2.png b/src/main/resources/assets/miscutils/textures/items/MU-metatool.01/2.png Binary files differindex 3b72cb69b6..3b72cb69b6 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metatool.01/2.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metatool.01/2.png diff --git a/src/resources/assets/miscutils/textures/items/MU-metatool.01/3.png b/src/main/resources/assets/miscutils/textures/items/MU-metatool.01/3.png Binary files differindex ca0ad43c3b..ca0ad43c3b 100644 --- a/src/resources/assets/miscutils/textures/items/MU-metatool.01/3.png +++ b/src/main/resources/assets/miscutils/textures/items/MU-metatool.01/3.png diff --git a/src/resources/assets/miscutils/textures/items/StoneStatue.png b/src/main/resources/assets/miscutils/textures/items/StoneStatue.png Binary files differindex 36ab6ccd56..36ab6ccd56 100644 --- a/src/resources/assets/miscutils/textures/items/StoneStatue.png +++ b/src/main/resources/assets/miscutils/textures/items/StoneStatue.png diff --git a/src/resources/assets/miscutils/textures/items/baubles/itemFireProtectGlovesBetter.png b/src/main/resources/assets/miscutils/textures/items/baubles/itemFireProtectGlovesBetter.png Binary files differindex 8576ae1b7a..8576ae1b7a 100644 --- a/src/resources/assets/miscutils/textures/items/baubles/itemFireProtectGlovesBetter.png +++ b/src/main/resources/assets/miscutils/textures/items/baubles/itemFireProtectGlovesBetter.png diff --git a/src/resources/assets/miscutils/textures/items/bioscience/BasicAlgae.png b/src/main/resources/assets/miscutils/textures/items/bioscience/BasicAlgae.png Binary files differindex efa1a6e0ca..efa1a6e0ca 100644 --- a/src/resources/assets/miscutils/textures/items/bioscience/BasicAlgae.png +++ b/src/main/resources/assets/miscutils/textures/items/bioscience/BasicAlgae.png diff --git a/src/resources/assets/miscutils/textures/items/bioscience/BasicAlgae_Overlay.png b/src/main/resources/assets/miscutils/textures/items/bioscience/BasicAlgae_Overlay.png Binary files differindex aaea7803b5..aaea7803b5 100644 --- a/src/resources/assets/miscutils/textures/items/bioscience/BasicAlgae_Overlay.png +++ b/src/main/resources/assets/miscutils/textures/items/bioscience/BasicAlgae_Overlay.png diff --git a/src/resources/assets/miscutils/textures/items/bioscience/BioCircuit.png b/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit.png Binary files differindex c2736be76c..c2736be76c 100644 --- a/src/resources/assets/miscutils/textures/items/bioscience/BioCircuit.png +++ b/src/main/resources/assets/miscutils/textures/items/bioscience/BioCircuit.png diff --git a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/0.png b/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/0.png Binary files differindex 57d77be16a..57d77be16a 100644 --- a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/0.png +++ b/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/0.png diff --git a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/1.png b/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/1.png Binary files differindex 51bb4587d9..51bb4587d9 100644 --- a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/1.png +++ b/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/1.png diff --git a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/10.png b/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/10.png Binary files differindex e81bae4aae..e81bae4aae 100644 --- a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/10.png +++ b/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/10.png diff --git a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/11.png b/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/11.png Binary files differindex 0cc273996e..0cc273996e 100644 --- a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/11.png +++ b/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/11.png diff --git a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/12.png b/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/12.png Binary files differindex dca743acd3..dca743acd3 100644 --- a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/12.png +++ b/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/12.png diff --git a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/13.png b/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/13.png Binary files differindex 15257d9efd..15257d9efd 100644 --- a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/13.png +++ b/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/13.png diff --git a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/14.png b/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/14.png Binary files differindex f81fc43aff..f81fc43aff 100644 --- a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/14.png +++ b/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/14.png diff --git a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/15.png b/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/15.png Binary files differindex 31951671cd..31951671cd 100644 --- a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/15.png +++ b/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/15.png diff --git a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/16.png b/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/16.png Binary files differindex 2c6e0b8cb6..2c6e0b8cb6 100644 --- a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/16.png +++ b/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/16.png diff --git a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/17.png b/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/17.png Binary files differindex 4309f3a975..4309f3a975 100644 --- a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/17.png +++ b/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/17.png diff --git a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/18.png b/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/18.png Binary files differindex e82660e9f8..e82660e9f8 100644 --- a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/18.png +++ b/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/18.png diff --git a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/19.png b/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/19.png Binary files differindex dc2070e635..dc2070e635 100644 --- a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/19.png +++ b/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/19.png diff --git a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/2.png b/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/2.png Binary files differindex 2cdf37adad..2cdf37adad 100644 --- a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/2.png +++ b/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/2.png diff --git a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/20.png b/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/20.png Binary files differindex 9b536f84d0..9b536f84d0 100644 --- a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/20.png +++ b/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/20.png diff --git a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/21.png b/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/21.png Binary files differindex 1a04c2415c..1a04c2415c 100644 --- a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/21.png +++ b/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/21.png diff --git a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/22.png b/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/22.png Binary files differindex 77be3ef6a8..77be3ef6a8 100644 --- a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/22.png +++ b/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/22.png diff --git a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/23.png b/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/23.png Binary files differindex 110cd7f8e8..110cd7f8e8 100644 --- a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/23.png +++ b/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/23.png diff --git a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/24.png b/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/24.png Binary files differindex 0c065db4ce..0c065db4ce 100644 --- a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/24.png +++ b/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/24.png diff --git a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/25.png b/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/25.png Binary files differindex 168b15adb3..168b15adb3 100644 --- a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/25.png +++ b/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/25.png diff --git a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/3.png b/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/3.png Binary files differindex c98e2d6319..c98e2d6319 100644 --- a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/3.png +++ b/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/3.png diff --git a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/4.png b/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/4.png Binary files differindex af0bcc7064..af0bcc7064 100644 --- a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/4.png +++ b/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/4.png diff --git a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/5.png b/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/5.png Binary files differindex 1b60b7f555..1b60b7f555 100644 --- a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/5.png +++ b/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/5.png diff --git a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/6.png b/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/6.png Binary files differindex 7f6f045430..7f6f045430 100644 --- a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/6.png +++ b/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/6.png diff --git a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/7.png b/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/7.png Binary files differindex 8a2cd2891b..8a2cd2891b 100644 --- a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/7.png +++ b/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/7.png diff --git a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/8.png b/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/8.png Binary files differindex c8c6299d7b..c8c6299d7b 100644 --- a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/8.png +++ b/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/8.png diff --git a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/9.png b/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/9.png Binary files differindex df99f3f5e8..df99f3f5e8 100644 --- a/src/resources/assets/miscutils/textures/items/bioscience/MetaItem1/9.png +++ b/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/9.png diff --git a/src/resources/assets/miscutils/textures/items/bomb.png b/src/main/resources/assets/miscutils/textures/items/bomb.png Binary files differindex e8e9b0f532..e8e9b0f532 100644 --- a/src/resources/assets/miscutils/textures/items/bomb.png +++ b/src/main/resources/assets/miscutils/textures/items/bomb.png diff --git a/src/resources/assets/miscutils/textures/items/bomb_casing.png b/src/main/resources/assets/miscutils/textures/items/bomb_casing.png Binary files differindex d4238babe2..d4238babe2 100644 --- a/src/resources/assets/miscutils/textures/items/bomb_casing.png +++ b/src/main/resources/assets/miscutils/textures/items/bomb_casing.png diff --git a/src/resources/assets/miscutils/textures/items/bomb_lit.png b/src/main/resources/assets/miscutils/textures/items/bomb_lit.png Binary files differindex e40029160b..e40029160b 100644 --- a/src/resources/assets/miscutils/textures/items/bomb_lit.png +++ b/src/main/resources/assets/miscutils/textures/items/bomb_lit.png diff --git a/src/resources/assets/miscutils/textures/items/bucket.generic.overlay.png b/src/main/resources/assets/miscutils/textures/items/bucket.generic.overlay.png Binary files differindex 1597a9cc4a..1597a9cc4a 100644 --- a/src/resources/assets/miscutils/textures/items/bucket.generic.overlay.png +++ b/src/main/resources/assets/miscutils/textures/items/bucket.generic.overlay.png diff --git a/src/resources/assets/miscutils/textures/items/bucket/BucketCryotheum.png b/src/main/resources/assets/miscutils/textures/items/bucket/BucketCryotheum.png Binary files differindex f6c9a9f131..f6c9a9f131 100644 --- a/src/resources/assets/miscutils/textures/items/bucket/BucketCryotheum.png +++ b/src/main/resources/assets/miscutils/textures/items/bucket/BucketCryotheum.png diff --git a/src/resources/assets/miscutils/textures/items/bucket/BucketCryotheum.png.mcmeta b/src/main/resources/assets/miscutils/textures/items/bucket/BucketCryotheum.png.mcmeta index 70cc4d313c..70cc4d313c 100644 --- a/src/resources/assets/miscutils/textures/items/bucket/BucketCryotheum.png.mcmeta +++ b/src/main/resources/assets/miscutils/textures/items/bucket/BucketCryotheum.png.mcmeta diff --git a/src/resources/assets/miscutils/textures/items/bucket/BucketEnder.png b/src/main/resources/assets/miscutils/textures/items/bucket/BucketEnder.png Binary files differindex 6a00cf1509..6a00cf1509 100644 --- a/src/resources/assets/miscutils/textures/items/bucket/BucketEnder.png +++ b/src/main/resources/assets/miscutils/textures/items/bucket/BucketEnder.png diff --git a/src/resources/assets/miscutils/textures/items/bucket/BucketEnder.png.mcmeta b/src/main/resources/assets/miscutils/textures/items/bucket/BucketEnder.png.mcmeta index f6730e30a9..f6730e30a9 100644 --- a/src/resources/assets/miscutils/textures/items/bucket/BucketEnder.png.mcmeta +++ b/src/main/resources/assets/miscutils/textures/items/bucket/BucketEnder.png.mcmeta diff --git a/src/resources/assets/miscutils/textures/items/bucket/BucketPyrotheum.png b/src/main/resources/assets/miscutils/textures/items/bucket/BucketPyrotheum.png Binary files differindex 82f1bb4b84..82f1bb4b84 100644 --- a/src/resources/assets/miscutils/textures/items/bucket/BucketPyrotheum.png +++ b/src/main/resources/assets/miscutils/textures/items/bucket/BucketPyrotheum.png diff --git a/src/resources/assets/miscutils/textures/items/bucket/BucketPyrotheum.png.mcmeta b/src/main/resources/assets/miscutils/textures/items/bucket/BucketPyrotheum.png.mcmeta index ddc2f9fb7a..ddc2f9fb7a 100644 --- a/src/resources/assets/miscutils/textures/items/bucket/BucketPyrotheum.png.mcmeta +++ b/src/main/resources/assets/miscutils/textures/items/bucket/BucketPyrotheum.png.mcmeta diff --git a/src/resources/assets/miscutils/textures/items/bucket/OverlayIcon.png b/src/main/resources/assets/miscutils/textures/items/bucket/OverlayIcon.png Binary files differindex 99a6af0f18..99a6af0f18 100644 --- a/src/resources/assets/miscutils/textures/items/bucket/OverlayIcon.png +++ b/src/main/resources/assets/miscutils/textures/items/bucket/OverlayIcon.png diff --git a/src/resources/assets/miscutils/textures/items/burnables/itemCactusCharcoal.png b/src/main/resources/assets/miscutils/textures/items/burnables/itemCactusCharcoal.png Binary files differindex 3cb0ac7097..3cb0ac7097 100644 --- a/src/resources/assets/miscutils/textures/items/burnables/itemCactusCharcoal.png +++ b/src/main/resources/assets/miscutils/textures/items/burnables/itemCactusCharcoal.png diff --git a/src/resources/assets/miscutils/textures/items/burnables/itemCactusCoke.png b/src/main/resources/assets/miscutils/textures/items/burnables/itemCactusCoke.png Binary files differindex 9dc98ba18d..9dc98ba18d 100644 --- a/src/resources/assets/miscutils/textures/items/burnables/itemCactusCoke.png +++ b/src/main/resources/assets/miscutils/textures/items/burnables/itemCactusCoke.png diff --git a/src/resources/assets/miscutils/textures/items/burnables/itemCoalCoke.png b/src/main/resources/assets/miscutils/textures/items/burnables/itemCoalCoke.png Binary files differindex 4f8fd406d4..4f8fd406d4 100644 --- a/src/resources/assets/miscutils/textures/items/burnables/itemCoalCoke.png +++ b/src/main/resources/assets/miscutils/textures/items/burnables/itemCoalCoke.png diff --git a/src/resources/assets/miscutils/textures/items/burnables/itemSugarCharcoal.png b/src/main/resources/assets/miscutils/textures/items/burnables/itemSugarCharcoal.png Binary files differindex f66a217c78..f66a217c78 100644 --- a/src/resources/assets/miscutils/textures/items/burnables/itemSugarCharcoal.png +++ b/src/main/resources/assets/miscutils/textures/items/burnables/itemSugarCharcoal.png diff --git a/src/resources/assets/miscutils/textures/items/burnables/itemSugarCoke.png b/src/main/resources/assets/miscutils/textures/items/burnables/itemSugarCoke.png Binary files differindex 055655ebe1..055655ebe1 100644 --- a/src/resources/assets/miscutils/textures/items/burnables/itemSugarCoke.png +++ b/src/main/resources/assets/miscutils/textures/items/burnables/itemSugarCoke.png diff --git a/src/resources/assets/miscutils/textures/items/chargepack/1.png b/src/main/resources/assets/miscutils/textures/items/chargepack/1.png Binary files differindex 9039d443c3..9039d443c3 100644 --- a/src/resources/assets/miscutils/textures/items/chargepack/1.png +++ b/src/main/resources/assets/miscutils/textures/items/chargepack/1.png diff --git a/src/resources/assets/miscutils/textures/items/chargepack/2.png b/src/main/resources/assets/miscutils/textures/items/chargepack/2.png Binary files differindex 7023e7ce82..7023e7ce82 100644 --- a/src/resources/assets/miscutils/textures/items/chargepack/2.png +++ b/src/main/resources/assets/miscutils/textures/items/chargepack/2.png diff --git a/src/resources/assets/miscutils/textures/items/chargepack/3.png b/src/main/resources/assets/miscutils/textures/items/chargepack/3.png Binary files differindex 4d787e7aa8..4d787e7aa8 100644 --- a/src/resources/assets/miscutils/textures/items/chargepack/3.png +++ b/src/main/resources/assets/miscutils/textures/items/chargepack/3.png diff --git a/src/resources/assets/miscutils/textures/items/chargepack/4.png b/src/main/resources/assets/miscutils/textures/items/chargepack/4.png Binary files differindex 9320de0611..9320de0611 100644 --- a/src/resources/assets/miscutils/textures/items/chargepack/4.png +++ b/src/main/resources/assets/miscutils/textures/items/chargepack/4.png diff --git a/src/resources/assets/miscutils/textures/items/chargepack/5.png b/src/main/resources/assets/miscutils/textures/items/chargepack/5.png Binary files differindex ab8771c89c..ab8771c89c 100644 --- a/src/resources/assets/miscutils/textures/items/chargepack/5.png +++ b/src/main/resources/assets/miscutils/textures/items/chargepack/5.png diff --git a/src/resources/assets/miscutils/textures/items/chargepack/6.png b/src/main/resources/assets/miscutils/textures/items/chargepack/6.png Binary files differindex a01f435e72..a01f435e72 100644 --- a/src/resources/assets/miscutils/textures/items/chargepack/6.png +++ b/src/main/resources/assets/miscutils/textures/items/chargepack/6.png diff --git a/src/resources/assets/miscutils/textures/items/chargepack/7.png b/src/main/resources/assets/miscutils/textures/items/chargepack/7.png Binary files differindex fb5a5fba43..fb5a5fba43 100644 --- a/src/resources/assets/miscutils/textures/items/chargepack/7.png +++ b/src/main/resources/assets/miscutils/textures/items/chargepack/7.png diff --git a/src/resources/assets/miscutils/textures/items/chargepack/8.png b/src/main/resources/assets/miscutils/textures/items/chargepack/8.png Binary files differindex aff1ec693f..aff1ec693f 100644 --- a/src/resources/assets/miscutils/textures/items/chargepack/8.png +++ b/src/main/resources/assets/miscutils/textures/items/chargepack/8.png diff --git a/src/resources/assets/miscutils/textures/items/chargepack/9.png b/src/main/resources/assets/miscutils/textures/items/chargepack/9.png Binary files differindex 0b9cf4d18e..0b9cf4d18e 100644 --- a/src/resources/assets/miscutils/textures/items/chargepack/9.png +++ b/src/main/resources/assets/miscutils/textures/items/chargepack/9.png diff --git a/src/resources/assets/miscutils/textures/items/controlcore/Core_0.png b/src/main/resources/assets/miscutils/textures/items/controlcore/Core_0.png Binary files differindex a35084d087..a35084d087 100644 --- a/src/resources/assets/miscutils/textures/items/controlcore/Core_0.png +++ b/src/main/resources/assets/miscutils/textures/items/controlcore/Core_0.png diff --git a/src/resources/assets/miscutils/textures/items/controlcore/Core_1.png b/src/main/resources/assets/miscutils/textures/items/controlcore/Core_1.png Binary files differindex 93c1d6fd31..93c1d6fd31 100644 --- a/src/resources/assets/miscutils/textures/items/controlcore/Core_1.png +++ b/src/main/resources/assets/miscutils/textures/items/controlcore/Core_1.png diff --git a/src/resources/assets/miscutils/textures/items/controlcore/Core_2.png b/src/main/resources/assets/miscutils/textures/items/controlcore/Core_2.png Binary files differindex 7eb734b97d..7eb734b97d 100644 --- a/src/resources/assets/miscutils/textures/items/controlcore/Core_2.png +++ b/src/main/resources/assets/miscutils/textures/items/controlcore/Core_2.png diff --git a/src/resources/assets/miscutils/textures/items/controlcore/Core_3.png b/src/main/resources/assets/miscutils/textures/items/controlcore/Core_3.png Binary files differindex 7613641938..7613641938 100644 --- a/src/resources/assets/miscutils/textures/items/controlcore/Core_3.png +++ b/src/main/resources/assets/miscutils/textures/items/controlcore/Core_3.png diff --git a/src/resources/assets/miscutils/textures/items/controlcore/Core_4.png b/src/main/resources/assets/miscutils/textures/items/controlcore/Core_4.png Binary files differindex 83fe4225c8..83fe4225c8 100644 --- a/src/resources/assets/miscutils/textures/items/controlcore/Core_4.png +++ b/src/main/resources/assets/miscutils/textures/items/controlcore/Core_4.png diff --git a/src/resources/assets/miscutils/textures/items/controlcore/Core_5.png b/src/main/resources/assets/miscutils/textures/items/controlcore/Core_5.png Binary files differindex 15f0e28421..15f0e28421 100644 --- a/src/resources/assets/miscutils/textures/items/controlcore/Core_5.png +++ b/src/main/resources/assets/miscutils/textures/items/controlcore/Core_5.png diff --git a/src/resources/assets/miscutils/textures/items/controlcore/Core_6.png b/src/main/resources/assets/miscutils/textures/items/controlcore/Core_6.png Binary files differindex da59694ac6..da59694ac6 100644 --- a/src/resources/assets/miscutils/textures/items/controlcore/Core_6.png +++ b/src/main/resources/assets/miscutils/textures/items/controlcore/Core_6.png diff --git a/src/resources/assets/miscutils/textures/items/controlcore/Core_7.png b/src/main/resources/assets/miscutils/textures/items/controlcore/Core_7.png Binary files differindex 2055a6cb57..2055a6cb57 100644 --- a/src/resources/assets/miscutils/textures/items/controlcore/Core_7.png +++ b/src/main/resources/assets/miscutils/textures/items/controlcore/Core_7.png diff --git a/src/resources/assets/miscutils/textures/items/controlcore/Core_8.png b/src/main/resources/assets/miscutils/textures/items/controlcore/Core_8.png Binary files differindex 3f8a60db8d..3f8a60db8d 100644 --- a/src/resources/assets/miscutils/textures/items/controlcore/Core_8.png +++ b/src/main/resources/assets/miscutils/textures/items/controlcore/Core_8.png diff --git a/src/resources/assets/miscutils/textures/items/controlcore/Core_9.png b/src/main/resources/assets/miscutils/textures/items/controlcore/Core_9.png Binary files differindex 15046c1fbb..15046c1fbb 100644 --- a/src/resources/assets/miscutils/textures/items/controlcore/Core_9.png +++ b/src/main/resources/assets/miscutils/textures/items/controlcore/Core_9.png diff --git a/src/resources/assets/miscutils/textures/items/covers/0.png b/src/main/resources/assets/miscutils/textures/items/covers/0.png Binary files differindex 1938287f27..1938287f27 100644 --- a/src/resources/assets/miscutils/textures/items/covers/0.png +++ b/src/main/resources/assets/miscutils/textures/items/covers/0.png diff --git a/src/resources/assets/miscutils/textures/items/covers/1.png b/src/main/resources/assets/miscutils/textures/items/covers/1.png Binary files differindex 327e530f1b..327e530f1b 100644 --- a/src/resources/assets/miscutils/textures/items/covers/1.png +++ b/src/main/resources/assets/miscutils/textures/items/covers/1.png diff --git a/src/resources/assets/miscutils/textures/items/covers/10.png b/src/main/resources/assets/miscutils/textures/items/covers/10.png Binary files differindex 9e48f50335..9e48f50335 100644 --- a/src/resources/assets/miscutils/textures/items/covers/10.png +++ b/src/main/resources/assets/miscutils/textures/items/covers/10.png diff --git a/src/resources/assets/miscutils/textures/items/covers/11.png b/src/main/resources/assets/miscutils/textures/items/covers/11.png Binary files differindex 32ffcb8008..32ffcb8008 100644 --- a/src/resources/assets/miscutils/textures/items/covers/11.png +++ b/src/main/resources/assets/miscutils/textures/items/covers/11.png diff --git a/src/resources/assets/miscutils/textures/items/covers/12.png b/src/main/resources/assets/miscutils/textures/items/covers/12.png Binary files differindex 48b1eadf93..48b1eadf93 100644 --- a/src/resources/assets/miscutils/textures/items/covers/12.png +++ b/src/main/resources/assets/miscutils/textures/items/covers/12.png diff --git a/src/resources/assets/miscutils/textures/items/covers/13.png b/src/main/resources/assets/miscutils/textures/items/covers/13.png Binary files differindex 7f6a13cb82..7f6a13cb82 100644 --- a/src/resources/assets/miscutils/textures/items/covers/13.png +++ b/src/main/resources/assets/miscutils/textures/items/covers/13.png diff --git a/src/resources/assets/miscutils/textures/items/covers/14.png b/src/main/resources/assets/miscutils/textures/items/covers/14.png Binary files differindex 9f59404337..9f59404337 100644 --- a/src/resources/assets/miscutils/textures/items/covers/14.png +++ b/src/main/resources/assets/miscutils/textures/items/covers/14.png diff --git a/src/resources/assets/miscutils/textures/items/covers/15.png b/src/main/resources/assets/miscutils/textures/items/covers/15.png Binary files differindex ed0f49bd0f..ed0f49bd0f 100644 --- a/src/resources/assets/miscutils/textures/items/covers/15.png +++ b/src/main/resources/assets/miscutils/textures/items/covers/15.png diff --git a/src/resources/assets/miscutils/textures/items/covers/2.png b/src/main/resources/assets/miscutils/textures/items/covers/2.png Binary files differindex 635be463af..635be463af 100644 --- a/src/resources/assets/miscutils/textures/items/covers/2.png +++ b/src/main/resources/assets/miscutils/textures/items/covers/2.png diff --git a/src/resources/assets/miscutils/textures/items/covers/3.png b/src/main/resources/assets/miscutils/textures/items/covers/3.png Binary files differindex 24afa30c17..24afa30c17 100644 --- a/src/resources/assets/miscutils/textures/items/covers/3.png +++ b/src/main/resources/assets/miscutils/textures/items/covers/3.png diff --git a/src/resources/assets/miscutils/textures/items/covers/4.png b/src/main/resources/assets/miscutils/textures/items/covers/4.png Binary files differindex 847e54ef60..847e54ef60 100644 --- a/src/resources/assets/miscutils/textures/items/covers/4.png +++ b/src/main/resources/assets/miscutils/textures/items/covers/4.png diff --git a/src/resources/assets/miscutils/textures/items/covers/5.png b/src/main/resources/assets/miscutils/textures/items/covers/5.png Binary files differindex ddd9cb7a2f..ddd9cb7a2f 100644 --- a/src/resources/assets/miscutils/textures/items/covers/5.png +++ b/src/main/resources/assets/miscutils/textures/items/covers/5.png diff --git a/src/resources/assets/miscutils/textures/items/covers/6.png b/src/main/resources/assets/miscutils/textures/items/covers/6.png Binary files differindex e21c4fb78c..e21c4fb78c 100644 --- a/src/resources/assets/miscutils/textures/items/covers/6.png +++ b/src/main/resources/assets/miscutils/textures/items/covers/6.png diff --git a/src/resources/assets/miscutils/textures/items/covers/7.png b/src/main/resources/assets/miscutils/textures/items/covers/7.png Binary files differindex 29e270f862..29e270f862 100644 --- a/src/resources/assets/miscutils/textures/items/covers/7.png +++ b/src/main/resources/assets/miscutils/textures/items/covers/7.png diff --git a/src/resources/assets/miscutils/textures/items/covers/8.png b/src/main/resources/assets/miscutils/textures/items/covers/8.png Binary files differindex 87a48050fd..87a48050fd 100644 --- a/src/resources/assets/miscutils/textures/items/covers/8.png +++ b/src/main/resources/assets/miscutils/textures/items/covers/8.png diff --git a/src/resources/assets/miscutils/textures/items/covers/9.png b/src/main/resources/assets/miscutils/textures/items/covers/9.png Binary files differindex 3836414587..3836414587 100644 --- a/src/resources/assets/miscutils/textures/items/covers/9.png +++ b/src/main/resources/assets/miscutils/textures/items/covers/9.png diff --git a/src/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoilWire_0.png b/src/main/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoilWire_0.png Binary files differindex 652f68aeb7..652f68aeb7 100644 --- a/src/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoilWire_0.png +++ b/src/main/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoilWire_0.png diff --git a/src/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoilWire_1.png b/src/main/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoilWire_1.png Binary files differindex 7a14abccbd..7a14abccbd 100644 --- a/src/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoilWire_1.png +++ b/src/main/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoilWire_1.png diff --git a/src/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoilWire_2.png b/src/main/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoilWire_2.png Binary files differindex cc0a5fe94d..cc0a5fe94d 100644 --- a/src/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoilWire_2.png +++ b/src/main/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoilWire_2.png diff --git a/src/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoilWire_3.png b/src/main/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoilWire_3.png Binary files differindex ce0dbab306..ce0dbab306 100644 --- a/src/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoilWire_3.png +++ b/src/main/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoilWire_3.png diff --git a/src/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoil_0.png b/src/main/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoil_0.png Binary files differindex 2b2f615676..2b2f615676 100644 --- a/src/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoil_0.png +++ b/src/main/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoil_0.png diff --git a/src/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoil_1.png b/src/main/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoil_1.png Binary files differindex f01ba96be9..f01ba96be9 100644 --- a/src/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoil_1.png +++ b/src/main/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoil_1.png diff --git a/src/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoil_2.png b/src/main/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoil_2.png Binary files differindex f57bb1308b..f57bb1308b 100644 --- a/src/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoil_2.png +++ b/src/main/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoil_2.png diff --git a/src/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoil_3.png b/src/main/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoil_3.png Binary files differindex 77a416a3a6..77a416a3a6 100644 --- a/src/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoil_3.png +++ b/src/main/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoil_3.png diff --git a/src/resources/assets/miscutils/textures/items/dust.png b/src/main/resources/assets/miscutils/textures/items/dust.png Binary files differindex 4c8e6485ec..4c8e6485ec 100644 --- a/src/resources/assets/miscutils/textures/items/dust.png +++ b/src/main/resources/assets/miscutils/textures/items/dust.png diff --git a/src/resources/assets/miscutils/textures/items/dustSmall.png b/src/main/resources/assets/miscutils/textures/items/dustSmall.png Binary files differindex c432a032c2..c432a032c2 100644 --- a/src/resources/assets/miscutils/textures/items/dustSmall.png +++ b/src/main/resources/assets/miscutils/textures/items/dustSmall.png diff --git a/src/resources/assets/miscutils/textures/items/dustTiny.png b/src/main/resources/assets/miscutils/textures/items/dustTiny.png Binary files differindex 8f597c61e0..8f597c61e0 100644 --- a/src/resources/assets/miscutils/textures/items/dustTiny.png +++ b/src/main/resources/assets/miscutils/textures/items/dustTiny.png diff --git a/src/resources/assets/miscutils/textures/items/food/MetaItem1/0.png b/src/main/resources/assets/miscutils/textures/items/food/MetaItem1/0.png Binary files differindex 944ab47126..944ab47126 100644 --- a/src/resources/assets/miscutils/textures/items/food/MetaItem1/0.png +++ b/src/main/resources/assets/miscutils/textures/items/food/MetaItem1/0.png diff --git a/src/resources/assets/miscutils/textures/items/food/MetaItem1/1.png b/src/main/resources/assets/miscutils/textures/items/food/MetaItem1/1.png Binary files differindex 2d235ca65d..2d235ca65d 100644 --- a/src/resources/assets/miscutils/textures/items/food/MetaItem1/1.png +++ b/src/main/resources/assets/miscutils/textures/items/food/MetaItem1/1.png diff --git a/src/resources/assets/miscutils/textures/items/food/MetaItem1/2.png b/src/main/resources/assets/miscutils/textures/items/food/MetaItem1/2.png Binary files differindex ec81acba2c..ec81acba2c 100644 --- a/src/resources/assets/miscutils/textures/items/food/MetaItem1/2.png +++ b/src/main/resources/assets/miscutils/textures/items/food/MetaItem1/2.png diff --git a/src/resources/assets/miscutils/textures/items/food/MetaItem1/3.png b/src/main/resources/assets/miscutils/textures/items/food/MetaItem1/3.png Binary files differindex 1fc103297a..1fc103297a 100644 --- a/src/resources/assets/miscutils/textures/items/food/MetaItem1/3.png +++ b/src/main/resources/assets/miscutils/textures/items/food/MetaItem1/3.png diff --git a/src/resources/assets/miscutils/textures/items/food/MetaItem1/4.png b/src/main/resources/assets/miscutils/textures/items/food/MetaItem1/4.png Binary files differindex db5ddf0063..db5ddf0063 100644 --- a/src/resources/assets/miscutils/textures/items/food/MetaItem1/4.png +++ b/src/main/resources/assets/miscutils/textures/items/food/MetaItem1/4.png diff --git a/src/resources/assets/miscutils/textures/items/food/MetaItem1/5.png b/src/main/resources/assets/miscutils/textures/items/food/MetaItem1/5.png Binary files differindex 2497c88e2d..2497c88e2d 100644 --- a/src/resources/assets/miscutils/textures/items/food/MetaItem1/5.png +++ b/src/main/resources/assets/miscutils/textures/items/food/MetaItem1/5.png diff --git a/src/resources/assets/miscutils/textures/items/food/MetaItem1/6.png b/src/main/resources/assets/miscutils/textures/items/food/MetaItem1/6.png Binary files differindex 083db84ef1..083db84ef1 100644 --- a/src/resources/assets/miscutils/textures/items/food/MetaItem1/6.png +++ b/src/main/resources/assets/miscutils/textures/items/food/MetaItem1/6.png diff --git a/src/resources/assets/miscutils/textures/items/food/MetaItem1/7.png b/src/main/resources/assets/miscutils/textures/items/food/MetaItem1/7.png Binary files differindex 27927d0db6..27927d0db6 100644 --- a/src/resources/assets/miscutils/textures/items/food/MetaItem1/7.png +++ b/src/main/resources/assets/miscutils/textures/items/food/MetaItem1/7.png diff --git a/src/resources/assets/miscutils/textures/items/food/MetaItem1/8.png b/src/main/resources/assets/miscutils/textures/items/food/MetaItem1/8.png Binary files differindex 7013c41d6b..7013c41d6b 100644 --- a/src/resources/assets/miscutils/textures/items/food/MetaItem1/8.png +++ b/src/main/resources/assets/miscutils/textures/items/food/MetaItem1/8.png diff --git a/src/resources/assets/miscutils/textures/items/frameAccelerated.png b/src/main/resources/assets/miscutils/textures/items/frameAccelerated.png Binary files differindex e02bd78586..e02bd78586 100644 --- a/src/resources/assets/miscutils/textures/items/frameAccelerated.png +++ b/src/main/resources/assets/miscutils/textures/items/frameAccelerated.png diff --git a/src/resources/assets/miscutils/textures/items/frameArborists.png b/src/main/resources/assets/miscutils/textures/items/frameArborists.png Binary files differindex b55d3a92e6..b55d3a92e6 100644 --- a/src/resources/assets/miscutils/textures/items/frameArborists.png +++ b/src/main/resources/assets/miscutils/textures/items/frameArborists.png diff --git a/src/resources/assets/miscutils/textures/items/frameBusy.png b/src/main/resources/assets/miscutils/textures/items/frameBusy.png Binary files differindex ea20d3d046..ea20d3d046 100644 --- a/src/resources/assets/miscutils/textures/items/frameBusy.png +++ b/src/main/resources/assets/miscutils/textures/items/frameBusy.png diff --git a/src/resources/assets/miscutils/textures/items/frameChocolate.png b/src/main/resources/assets/miscutils/textures/items/frameChocolate.png Binary files differindex 624e9b674b..624e9b674b 100644 --- a/src/resources/assets/miscutils/textures/items/frameChocolate.png +++ b/src/main/resources/assets/miscutils/textures/items/frameChocolate.png diff --git a/src/resources/assets/miscutils/textures/items/frameDecaying.png b/src/main/resources/assets/miscutils/textures/items/frameDecaying.png Binary files differindex 3e6feb1a3c..3e6feb1a3c 100644 --- a/src/resources/assets/miscutils/textures/items/frameDecaying.png +++ b/src/main/resources/assets/miscutils/textures/items/frameDecaying.png diff --git a/src/resources/assets/miscutils/textures/items/frameHealing.png b/src/main/resources/assets/miscutils/textures/items/frameHealing.png Binary files differindex 7756b84da2..7756b84da2 100644 --- a/src/resources/assets/miscutils/textures/items/frameHealing.png +++ b/src/main/resources/assets/miscutils/textures/items/frameHealing.png diff --git a/src/resources/assets/miscutils/textures/items/frameMutagenic.png b/src/main/resources/assets/miscutils/textures/items/frameMutagenic.png Binary files differindex 0a24289776..0a24289776 100644 --- a/src/resources/assets/miscutils/textures/items/frameMutagenic.png +++ b/src/main/resources/assets/miscutils/textures/items/frameMutagenic.png diff --git a/src/resources/assets/miscutils/textures/items/frameNova.png b/src/main/resources/assets/miscutils/textures/items/frameNova.png Binary files differindex 3ed54fef87..3ed54fef87 100644 --- a/src/resources/assets/miscutils/textures/items/frameNova.png +++ b/src/main/resources/assets/miscutils/textures/items/frameNova.png diff --git a/src/resources/assets/miscutils/textures/items/frameRestraint.png b/src/main/resources/assets/miscutils/textures/items/frameRestraint.png Binary files differindex 4fc5cd3ab4..4fc5cd3ab4 100644 --- a/src/resources/assets/miscutils/textures/items/frameRestraint.png +++ b/src/main/resources/assets/miscutils/textures/items/frameRestraint.png diff --git a/src/resources/assets/miscutils/textures/items/frameSlowing.png b/src/main/resources/assets/miscutils/textures/items/frameSlowing.png Binary files differindex 8d07fdd47b..8d07fdd47b 100644 --- a/src/resources/assets/miscutils/textures/items/frameSlowing.png +++ b/src/main/resources/assets/miscutils/textures/items/frameSlowing.png diff --git a/src/resources/assets/miscutils/textures/items/frameSoul.png b/src/main/resources/assets/miscutils/textures/items/frameSoul.png Binary files differindex c044632ec9..c044632ec9 100644 --- a/src/resources/assets/miscutils/textures/items/frameSoul.png +++ b/src/main/resources/assets/miscutils/textures/items/frameSoul.png diff --git a/src/resources/assets/miscutils/textures/items/frameStabilizing.png b/src/main/resources/assets/miscutils/textures/items/frameStabilizing.png Binary files differindex 1fed360bf7..1fed360bf7 100644 --- a/src/resources/assets/miscutils/textures/items/frameStabilizing.png +++ b/src/main/resources/assets/miscutils/textures/items/frameStabilizing.png diff --git a/src/resources/assets/miscutils/textures/items/frameUseless.png b/src/main/resources/assets/miscutils/textures/items/frameUseless.png Binary files differindex e316e0a5d6..e316e0a5d6 100644 --- a/src/resources/assets/miscutils/textures/items/frameUseless.png +++ b/src/main/resources/assets/miscutils/textures/items/frameUseless.png diff --git a/src/resources/assets/miscutils/textures/items/frameVoid.png b/src/main/resources/assets/miscutils/textures/items/frameVoid.png Binary files differindex 45fc307328..45fc307328 100644 --- a/src/resources/assets/miscutils/textures/items/frameVoid.png +++ b/src/main/resources/assets/miscutils/textures/items/frameVoid.png diff --git a/src/resources/assets/miscutils/textures/items/iconsets/ANGLE_GRINDER.png b/src/main/resources/assets/miscutils/textures/items/iconsets/ANGLE_GRINDER.png Binary files differindex 3030cbe6aa..3030cbe6aa 100644 --- a/src/resources/assets/miscutils/textures/items/iconsets/ANGLE_GRINDER.png +++ b/src/main/resources/assets/miscutils/textures/items/iconsets/ANGLE_GRINDER.png diff --git a/src/resources/assets/miscutils/textures/items/iconsets/ANGLE_GRINDER_OVERLAY.png b/src/main/resources/assets/miscutils/textures/items/iconsets/ANGLE_GRINDER_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/miscutils/textures/items/iconsets/ANGLE_GRINDER_OVERLAY.png +++ b/src/main/resources/assets/miscutils/textures/items/iconsets/ANGLE_GRINDER_OVERLAY.png diff --git a/src/resources/assets/miscutils/textures/items/iconsets/ELECTRIC_BUTCHER_KNIFE.png b/src/main/resources/assets/miscutils/textures/items/iconsets/ELECTRIC_BUTCHER_KNIFE.png Binary files differindex 5114f2c9a8..5114f2c9a8 100644 --- a/src/resources/assets/miscutils/textures/items/iconsets/ELECTRIC_BUTCHER_KNIFE.png +++ b/src/main/resources/assets/miscutils/textures/items/iconsets/ELECTRIC_BUTCHER_KNIFE.png diff --git a/src/resources/assets/miscutils/textures/items/iconsets/ELECTRIC_BUTCHER_KNIFE_OVERLAY.png b/src/main/resources/assets/miscutils/textures/items/iconsets/ELECTRIC_BUTCHER_KNIFE_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/miscutils/textures/items/iconsets/ELECTRIC_BUTCHER_KNIFE_OVERLAY.png +++ b/src/main/resources/assets/miscutils/textures/items/iconsets/ELECTRIC_BUTCHER_KNIFE_OVERLAY.png diff --git a/src/resources/assets/miscutils/textures/items/iconsets/ELECTRIC_LIGHTER.png b/src/main/resources/assets/miscutils/textures/items/iconsets/ELECTRIC_LIGHTER.png Binary files differindex 1c6257f336..1c6257f336 100644 --- a/src/resources/assets/miscutils/textures/items/iconsets/ELECTRIC_LIGHTER.png +++ b/src/main/resources/assets/miscutils/textures/items/iconsets/ELECTRIC_LIGHTER.png diff --git a/src/resources/assets/miscutils/textures/items/iconsets/ELECTRIC_LIGHTER_OVERLAY.png b/src/main/resources/assets/miscutils/textures/items/iconsets/ELECTRIC_LIGHTER_OVERLAY.png Binary files differindex 1c91860461..1c91860461 100644 --- a/src/resources/assets/miscutils/textures/items/iconsets/ELECTRIC_LIGHTER_OVERLAY.png +++ b/src/main/resources/assets/miscutils/textures/items/iconsets/ELECTRIC_LIGHTER_OVERLAY.png diff --git a/src/resources/assets/miscutils/textures/items/iconsets/ELECTRIC_SNIPS.png b/src/main/resources/assets/miscutils/textures/items/iconsets/ELECTRIC_SNIPS.png Binary files differindex 8ccd7f3c1a..8ccd7f3c1a 100644 --- a/src/resources/assets/miscutils/textures/items/iconsets/ELECTRIC_SNIPS.png +++ b/src/main/resources/assets/miscutils/textures/items/iconsets/ELECTRIC_SNIPS.png diff --git a/src/resources/assets/miscutils/textures/items/iconsets/ELECTRIC_SNIPS_OVERLAY.png b/src/main/resources/assets/miscutils/textures/items/iconsets/ELECTRIC_SNIPS_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/miscutils/textures/items/iconsets/ELECTRIC_SNIPS_OVERLAY.png +++ b/src/main/resources/assets/miscutils/textures/items/iconsets/ELECTRIC_SNIPS_OVERLAY.png diff --git a/src/resources/assets/miscutils/textures/items/iconsets/PUMP_OVERLAY.png b/src/main/resources/assets/miscutils/textures/items/iconsets/PUMP_OVERLAY.png Binary files differindex 6c7e63b924..6c7e63b924 100644 --- a/src/resources/assets/miscutils/textures/items/iconsets/PUMP_OVERLAY.png +++ b/src/main/resources/assets/miscutils/textures/items/iconsets/PUMP_OVERLAY.png diff --git a/src/resources/assets/miscutils/textures/items/iconsets/RENDERING_ERROR.png b/src/main/resources/assets/miscutils/textures/items/iconsets/RENDERING_ERROR.png Binary files differindex ae13305b96..ae13305b96 100644 --- a/src/resources/assets/miscutils/textures/items/iconsets/RENDERING_ERROR.png +++ b/src/main/resources/assets/miscutils/textures/items/iconsets/RENDERING_ERROR.png diff --git a/src/resources/assets/miscutils/textures/items/iconsets/RENDERING_ERROR_OVERLAY.png b/src/main/resources/assets/miscutils/textures/items/iconsets/RENDERING_ERROR_OVERLAY.png Binary files differindex ae13305b96..ae13305b96 100644 --- a/src/resources/assets/miscutils/textures/items/iconsets/RENDERING_ERROR_OVERLAY.png +++ b/src/main/resources/assets/miscutils/textures/items/iconsets/RENDERING_ERROR_OVERLAY.png diff --git a/src/resources/assets/miscutils/textures/items/iconsets/SKOOKUMCHOOCHER.png b/src/main/resources/assets/miscutils/textures/items/iconsets/SKOOKUMCHOOCHER.png Binary files differindex d6ba7ec2ca..d6ba7ec2ca 100644 --- a/src/resources/assets/miscutils/textures/items/iconsets/SKOOKUMCHOOCHER.png +++ b/src/main/resources/assets/miscutils/textures/items/iconsets/SKOOKUMCHOOCHER.png diff --git a/src/resources/assets/miscutils/textures/items/iconsets/SKOOKUMCHOOCHER_OVERLAY.png b/src/main/resources/assets/miscutils/textures/items/iconsets/SKOOKUMCHOOCHER_OVERLAY.png Binary files differindex d83a131004..d83a131004 100644 --- a/src/resources/assets/miscutils/textures/items/iconsets/SKOOKUMCHOOCHER_OVERLAY.png +++ b/src/main/resources/assets/miscutils/textures/items/iconsets/SKOOKUMCHOOCHER_OVERLAY.png diff --git a/src/resources/assets/miscutils/textures/items/iconsets/VOID.png b/src/main/resources/assets/miscutils/textures/items/iconsets/VOID.png Binary files differindex db16e741fe..db16e741fe 100644 --- a/src/resources/assets/miscutils/textures/items/iconsets/VOID.png +++ b/src/main/resources/assets/miscutils/textures/items/iconsets/VOID.png diff --git a/src/resources/assets/miscutils/textures/items/iconsets/VOID_OVERLAY.png b/src/main/resources/assets/miscutils/textures/items/iconsets/VOID_OVERLAY.png Binary files differindex 6c7e63b924..6c7e63b924 100644 --- a/src/resources/assets/miscutils/textures/items/iconsets/VOID_OVERLAY.png +++ b/src/main/resources/assets/miscutils/textures/items/iconsets/VOID_OVERLAY.png diff --git a/src/resources/assets/miscutils/textures/items/ion/0.png b/src/main/resources/assets/miscutils/textures/items/ion/0.png Binary files differindex c56a04238f..c56a04238f 100644 --- a/src/resources/assets/miscutils/textures/items/ion/0.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/0.png diff --git a/src/resources/assets/miscutils/textures/items/ion/1.png b/src/main/resources/assets/miscutils/textures/items/ion/1.png Binary files differindex 174d2ad950..174d2ad950 100644 --- a/src/resources/assets/miscutils/textures/items/ion/1.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/1.png diff --git a/src/resources/assets/miscutils/textures/items/ion/10.png b/src/main/resources/assets/miscutils/textures/items/ion/10.png Binary files differindex 8e3348f582..8e3348f582 100644 --- a/src/resources/assets/miscutils/textures/items/ion/10.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/10.png diff --git a/src/resources/assets/miscutils/textures/items/ion/100.png b/src/main/resources/assets/miscutils/textures/items/ion/100.png Binary files differindex 3d92a39004..3d92a39004 100644 --- a/src/resources/assets/miscutils/textures/items/ion/100.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/100.png diff --git a/src/resources/assets/miscutils/textures/items/ion/101.png b/src/main/resources/assets/miscutils/textures/items/ion/101.png Binary files differindex 85b8f58ad9..85b8f58ad9 100644 --- a/src/resources/assets/miscutils/textures/items/ion/101.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/101.png diff --git a/src/resources/assets/miscutils/textures/items/ion/102.png b/src/main/resources/assets/miscutils/textures/items/ion/102.png Binary files differindex 6993d5e4cf..6993d5e4cf 100644 --- a/src/resources/assets/miscutils/textures/items/ion/102.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/102.png diff --git a/src/resources/assets/miscutils/textures/items/ion/103.png b/src/main/resources/assets/miscutils/textures/items/ion/103.png Binary files differindex a3faa8a260..a3faa8a260 100644 --- a/src/resources/assets/miscutils/textures/items/ion/103.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/103.png diff --git a/src/resources/assets/miscutils/textures/items/ion/104.png b/src/main/resources/assets/miscutils/textures/items/ion/104.png Binary files differindex 9c80b9d1f0..9c80b9d1f0 100644 --- a/src/resources/assets/miscutils/textures/items/ion/104.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/104.png diff --git a/src/resources/assets/miscutils/textures/items/ion/105.png b/src/main/resources/assets/miscutils/textures/items/ion/105.png Binary files differindex 2633689df4..2633689df4 100644 --- a/src/resources/assets/miscutils/textures/items/ion/105.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/105.png diff --git a/src/resources/assets/miscutils/textures/items/ion/106.png b/src/main/resources/assets/miscutils/textures/items/ion/106.png Binary files differindex c368411d12..c368411d12 100644 --- a/src/resources/assets/miscutils/textures/items/ion/106.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/106.png diff --git a/src/resources/assets/miscutils/textures/items/ion/107.png b/src/main/resources/assets/miscutils/textures/items/ion/107.png Binary files differindex fc8e4c2844..fc8e4c2844 100644 --- a/src/resources/assets/miscutils/textures/items/ion/107.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/107.png diff --git a/src/resources/assets/miscutils/textures/items/ion/108.png b/src/main/resources/assets/miscutils/textures/items/ion/108.png Binary files differindex d2b271526a..d2b271526a 100644 --- a/src/resources/assets/miscutils/textures/items/ion/108.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/108.png diff --git a/src/resources/assets/miscutils/textures/items/ion/109.png b/src/main/resources/assets/miscutils/textures/items/ion/109.png Binary files differindex 585321db38..585321db38 100644 --- a/src/resources/assets/miscutils/textures/items/ion/109.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/109.png diff --git a/src/resources/assets/miscutils/textures/items/ion/11.png b/src/main/resources/assets/miscutils/textures/items/ion/11.png Binary files differindex 72baf3d9e9..72baf3d9e9 100644 --- a/src/resources/assets/miscutils/textures/items/ion/11.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/11.png diff --git a/src/resources/assets/miscutils/textures/items/ion/110.png b/src/main/resources/assets/miscutils/textures/items/ion/110.png Binary files differindex 82d73b7aca..82d73b7aca 100644 --- a/src/resources/assets/miscutils/textures/items/ion/110.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/110.png diff --git a/src/resources/assets/miscutils/textures/items/ion/111.png b/src/main/resources/assets/miscutils/textures/items/ion/111.png Binary files differindex 869435fd75..869435fd75 100644 --- a/src/resources/assets/miscutils/textures/items/ion/111.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/111.png diff --git a/src/resources/assets/miscutils/textures/items/ion/112.png b/src/main/resources/assets/miscutils/textures/items/ion/112.png Binary files differindex bb14befcfe..bb14befcfe 100644 --- a/src/resources/assets/miscutils/textures/items/ion/112.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/112.png diff --git a/src/resources/assets/miscutils/textures/items/ion/113.png b/src/main/resources/assets/miscutils/textures/items/ion/113.png Binary files differindex 5aae8d7814..5aae8d7814 100644 --- a/src/resources/assets/miscutils/textures/items/ion/113.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/113.png diff --git a/src/resources/assets/miscutils/textures/items/ion/114.png b/src/main/resources/assets/miscutils/textures/items/ion/114.png Binary files differindex ea4897286d..ea4897286d 100644 --- a/src/resources/assets/miscutils/textures/items/ion/114.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/114.png diff --git a/src/resources/assets/miscutils/textures/items/ion/115.png b/src/main/resources/assets/miscutils/textures/items/ion/115.png Binary files differindex 815acfb339..815acfb339 100644 --- a/src/resources/assets/miscutils/textures/items/ion/115.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/115.png diff --git a/src/resources/assets/miscutils/textures/items/ion/116.png b/src/main/resources/assets/miscutils/textures/items/ion/116.png Binary files differindex a335c2bb70..a335c2bb70 100644 --- a/src/resources/assets/miscutils/textures/items/ion/116.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/116.png diff --git a/src/resources/assets/miscutils/textures/items/ion/117.png b/src/main/resources/assets/miscutils/textures/items/ion/117.png Binary files differindex f3d46e4bb6..f3d46e4bb6 100644 --- a/src/resources/assets/miscutils/textures/items/ion/117.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/117.png diff --git a/src/resources/assets/miscutils/textures/items/ion/12.png b/src/main/resources/assets/miscutils/textures/items/ion/12.png Binary files differindex c2698ef286..c2698ef286 100644 --- a/src/resources/assets/miscutils/textures/items/ion/12.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/12.png diff --git a/src/resources/assets/miscutils/textures/items/ion/13.png b/src/main/resources/assets/miscutils/textures/items/ion/13.png Binary files differindex d9f17334f7..d9f17334f7 100644 --- a/src/resources/assets/miscutils/textures/items/ion/13.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/13.png diff --git a/src/resources/assets/miscutils/textures/items/ion/14.png b/src/main/resources/assets/miscutils/textures/items/ion/14.png Binary files differindex 0640a05827..0640a05827 100644 --- a/src/resources/assets/miscutils/textures/items/ion/14.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/14.png diff --git a/src/resources/assets/miscutils/textures/items/ion/15.png b/src/main/resources/assets/miscutils/textures/items/ion/15.png Binary files differindex 8b9a6c872e..8b9a6c872e 100644 --- a/src/resources/assets/miscutils/textures/items/ion/15.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/15.png diff --git a/src/resources/assets/miscutils/textures/items/ion/16.png b/src/main/resources/assets/miscutils/textures/items/ion/16.png Binary files differindex 3e0dbe1143..3e0dbe1143 100644 --- a/src/resources/assets/miscutils/textures/items/ion/16.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/16.png diff --git a/src/resources/assets/miscutils/textures/items/ion/17.png b/src/main/resources/assets/miscutils/textures/items/ion/17.png Binary files differindex dfcb224a3e..dfcb224a3e 100644 --- a/src/resources/assets/miscutils/textures/items/ion/17.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/17.png diff --git a/src/resources/assets/miscutils/textures/items/ion/18.png b/src/main/resources/assets/miscutils/textures/items/ion/18.png Binary files differindex 910712afc5..910712afc5 100644 --- a/src/resources/assets/miscutils/textures/items/ion/18.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/18.png diff --git a/src/resources/assets/miscutils/textures/items/ion/19.png b/src/main/resources/assets/miscutils/textures/items/ion/19.png Binary files differindex 63627d13a3..63627d13a3 100644 --- a/src/resources/assets/miscutils/textures/items/ion/19.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/19.png diff --git a/src/resources/assets/miscutils/textures/items/ion/2.png b/src/main/resources/assets/miscutils/textures/items/ion/2.png Binary files differindex ab4474425e..ab4474425e 100644 --- a/src/resources/assets/miscutils/textures/items/ion/2.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/2.png diff --git a/src/resources/assets/miscutils/textures/items/ion/20.png b/src/main/resources/assets/miscutils/textures/items/ion/20.png Binary files differindex c4c2b0da40..c4c2b0da40 100644 --- a/src/resources/assets/miscutils/textures/items/ion/20.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/20.png diff --git a/src/resources/assets/miscutils/textures/items/ion/21.png b/src/main/resources/assets/miscutils/textures/items/ion/21.png Binary files differindex ad8c2b6dbf..ad8c2b6dbf 100644 --- a/src/resources/assets/miscutils/textures/items/ion/21.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/21.png diff --git a/src/resources/assets/miscutils/textures/items/ion/22.png b/src/main/resources/assets/miscutils/textures/items/ion/22.png Binary files differindex ce4fcd3ff2..ce4fcd3ff2 100644 --- a/src/resources/assets/miscutils/textures/items/ion/22.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/22.png diff --git a/src/resources/assets/miscutils/textures/items/ion/23.png b/src/main/resources/assets/miscutils/textures/items/ion/23.png Binary files differindex fe75b049ce..fe75b049ce 100644 --- a/src/resources/assets/miscutils/textures/items/ion/23.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/23.png diff --git a/src/resources/assets/miscutils/textures/items/ion/24.png b/src/main/resources/assets/miscutils/textures/items/ion/24.png Binary files differindex bb256ca2bb..bb256ca2bb 100644 --- a/src/resources/assets/miscutils/textures/items/ion/24.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/24.png diff --git a/src/resources/assets/miscutils/textures/items/ion/25.png b/src/main/resources/assets/miscutils/textures/items/ion/25.png Binary files differindex 6d413674c2..6d413674c2 100644 --- a/src/resources/assets/miscutils/textures/items/ion/25.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/25.png diff --git a/src/resources/assets/miscutils/textures/items/ion/26.png b/src/main/resources/assets/miscutils/textures/items/ion/26.png Binary files differindex c93c306f5a..c93c306f5a 100644 --- a/src/resources/assets/miscutils/textures/items/ion/26.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/26.png diff --git a/src/resources/assets/miscutils/textures/items/ion/27.png b/src/main/resources/assets/miscutils/textures/items/ion/27.png Binary files differindex f822d7a4bb..f822d7a4bb 100644 --- a/src/resources/assets/miscutils/textures/items/ion/27.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/27.png diff --git a/src/resources/assets/miscutils/textures/items/ion/28.png b/src/main/resources/assets/miscutils/textures/items/ion/28.png Binary files differindex 1b65383965..1b65383965 100644 --- a/src/resources/assets/miscutils/textures/items/ion/28.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/28.png diff --git a/src/resources/assets/miscutils/textures/items/ion/29.png b/src/main/resources/assets/miscutils/textures/items/ion/29.png Binary files differindex a3c412094e..a3c412094e 100644 --- a/src/resources/assets/miscutils/textures/items/ion/29.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/29.png diff --git a/src/resources/assets/miscutils/textures/items/ion/3.png b/src/main/resources/assets/miscutils/textures/items/ion/3.png Binary files differindex 59ad76340c..59ad76340c 100644 --- a/src/resources/assets/miscutils/textures/items/ion/3.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/3.png diff --git a/src/resources/assets/miscutils/textures/items/ion/30.png b/src/main/resources/assets/miscutils/textures/items/ion/30.png Binary files differindex 3ae749cc91..3ae749cc91 100644 --- a/src/resources/assets/miscutils/textures/items/ion/30.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/30.png diff --git a/src/resources/assets/miscutils/textures/items/ion/31.png b/src/main/resources/assets/miscutils/textures/items/ion/31.png Binary files differindex 6bb1f6c61f..6bb1f6c61f 100644 --- a/src/resources/assets/miscutils/textures/items/ion/31.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/31.png diff --git a/src/resources/assets/miscutils/textures/items/ion/32.png b/src/main/resources/assets/miscutils/textures/items/ion/32.png Binary files differindex c8bc92a688..c8bc92a688 100644 --- a/src/resources/assets/miscutils/textures/items/ion/32.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/32.png diff --git a/src/resources/assets/miscutils/textures/items/ion/33.png b/src/main/resources/assets/miscutils/textures/items/ion/33.png Binary files differindex 5062c0c109..5062c0c109 100644 --- a/src/resources/assets/miscutils/textures/items/ion/33.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/33.png diff --git a/src/resources/assets/miscutils/textures/items/ion/34.png b/src/main/resources/assets/miscutils/textures/items/ion/34.png Binary files differindex bd1e33c191..bd1e33c191 100644 --- a/src/resources/assets/miscutils/textures/items/ion/34.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/34.png diff --git a/src/resources/assets/miscutils/textures/items/ion/35.png b/src/main/resources/assets/miscutils/textures/items/ion/35.png Binary files differindex c2a42ac980..c2a42ac980 100644 --- a/src/resources/assets/miscutils/textures/items/ion/35.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/35.png diff --git a/src/resources/assets/miscutils/textures/items/ion/36.png b/src/main/resources/assets/miscutils/textures/items/ion/36.png Binary files differindex 403d45a66c..403d45a66c 100644 --- a/src/resources/assets/miscutils/textures/items/ion/36.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/36.png diff --git a/src/resources/assets/miscutils/textures/items/ion/37.png b/src/main/resources/assets/miscutils/textures/items/ion/37.png Binary files differindex 89f011e548..89f011e548 100644 --- a/src/resources/assets/miscutils/textures/items/ion/37.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/37.png diff --git a/src/resources/assets/miscutils/textures/items/ion/38.png b/src/main/resources/assets/miscutils/textures/items/ion/38.png Binary files differindex b00ab7f5fc..b00ab7f5fc 100644 --- a/src/resources/assets/miscutils/textures/items/ion/38.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/38.png diff --git a/src/resources/assets/miscutils/textures/items/ion/39.png b/src/main/resources/assets/miscutils/textures/items/ion/39.png Binary files differindex 9fc883c731..9fc883c731 100644 --- a/src/resources/assets/miscutils/textures/items/ion/39.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/39.png diff --git a/src/resources/assets/miscutils/textures/items/ion/4.png b/src/main/resources/assets/miscutils/textures/items/ion/4.png Binary files differindex 122cd9e837..122cd9e837 100644 --- a/src/resources/assets/miscutils/textures/items/ion/4.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/4.png diff --git a/src/resources/assets/miscutils/textures/items/ion/40.png b/src/main/resources/assets/miscutils/textures/items/ion/40.png Binary files differindex 371171fe61..371171fe61 100644 --- a/src/resources/assets/miscutils/textures/items/ion/40.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/40.png diff --git a/src/resources/assets/miscutils/textures/items/ion/41.png b/src/main/resources/assets/miscutils/textures/items/ion/41.png Binary files differindex acc8d4df0b..acc8d4df0b 100644 --- a/src/resources/assets/miscutils/textures/items/ion/41.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/41.png diff --git a/src/resources/assets/miscutils/textures/items/ion/42.png b/src/main/resources/assets/miscutils/textures/items/ion/42.png Binary files differindex 0f8432ea59..0f8432ea59 100644 --- a/src/resources/assets/miscutils/textures/items/ion/42.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/42.png diff --git a/src/resources/assets/miscutils/textures/items/ion/43.png b/src/main/resources/assets/miscutils/textures/items/ion/43.png Binary files differindex 1f62a1a4f9..1f62a1a4f9 100644 --- a/src/resources/assets/miscutils/textures/items/ion/43.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/43.png diff --git a/src/resources/assets/miscutils/textures/items/ion/44.png b/src/main/resources/assets/miscutils/textures/items/ion/44.png Binary files differindex f26b23050a..f26b23050a 100644 --- a/src/resources/assets/miscutils/textures/items/ion/44.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/44.png diff --git a/src/resources/assets/miscutils/textures/items/ion/45.png b/src/main/resources/assets/miscutils/textures/items/ion/45.png Binary files differindex e2d6413dee..e2d6413dee 100644 --- a/src/resources/assets/miscutils/textures/items/ion/45.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/45.png diff --git a/src/resources/assets/miscutils/textures/items/ion/46.png b/src/main/resources/assets/miscutils/textures/items/ion/46.png Binary files differindex 50920e75b5..50920e75b5 100644 --- a/src/resources/assets/miscutils/textures/items/ion/46.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/46.png diff --git a/src/resources/assets/miscutils/textures/items/ion/47.png b/src/main/resources/assets/miscutils/textures/items/ion/47.png Binary files differindex c31a2ad43d..c31a2ad43d 100644 --- a/src/resources/assets/miscutils/textures/items/ion/47.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/47.png diff --git a/src/resources/assets/miscutils/textures/items/ion/48.png b/src/main/resources/assets/miscutils/textures/items/ion/48.png Binary files differindex 90b6ab544e..90b6ab544e 100644 --- a/src/resources/assets/miscutils/textures/items/ion/48.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/48.png diff --git a/src/resources/assets/miscutils/textures/items/ion/49.png b/src/main/resources/assets/miscutils/textures/items/ion/49.png Binary files differindex 1c1ed02d40..1c1ed02d40 100644 --- a/src/resources/assets/miscutils/textures/items/ion/49.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/49.png diff --git a/src/resources/assets/miscutils/textures/items/ion/5.png b/src/main/resources/assets/miscutils/textures/items/ion/5.png Binary files differindex 0f33a3363c..0f33a3363c 100644 --- a/src/resources/assets/miscutils/textures/items/ion/5.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/5.png diff --git a/src/resources/assets/miscutils/textures/items/ion/50.png b/src/main/resources/assets/miscutils/textures/items/ion/50.png Binary files differindex c47f4a297e..c47f4a297e 100644 --- a/src/resources/assets/miscutils/textures/items/ion/50.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/50.png diff --git a/src/resources/assets/miscutils/textures/items/ion/51.png b/src/main/resources/assets/miscutils/textures/items/ion/51.png Binary files differindex 606a1e8ef4..606a1e8ef4 100644 --- a/src/resources/assets/miscutils/textures/items/ion/51.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/51.png diff --git a/src/resources/assets/miscutils/textures/items/ion/52.png b/src/main/resources/assets/miscutils/textures/items/ion/52.png Binary files differindex 0a535c6158..0a535c6158 100644 --- a/src/resources/assets/miscutils/textures/items/ion/52.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/52.png diff --git a/src/resources/assets/miscutils/textures/items/ion/53.png b/src/main/resources/assets/miscutils/textures/items/ion/53.png Binary files differindex 1fef4e5f2f..1fef4e5f2f 100644 --- a/src/resources/assets/miscutils/textures/items/ion/53.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/53.png diff --git a/src/resources/assets/miscutils/textures/items/ion/54.png b/src/main/resources/assets/miscutils/textures/items/ion/54.png Binary files differindex 663170c84d..663170c84d 100644 --- a/src/resources/assets/miscutils/textures/items/ion/54.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/54.png diff --git a/src/resources/assets/miscutils/textures/items/ion/55.png b/src/main/resources/assets/miscutils/textures/items/ion/55.png Binary files differindex 4519b12d97..4519b12d97 100644 --- a/src/resources/assets/miscutils/textures/items/ion/55.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/55.png diff --git a/src/resources/assets/miscutils/textures/items/ion/56.png b/src/main/resources/assets/miscutils/textures/items/ion/56.png Binary files differindex 926b37bc80..926b37bc80 100644 --- a/src/resources/assets/miscutils/textures/items/ion/56.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/56.png diff --git a/src/resources/assets/miscutils/textures/items/ion/57.png b/src/main/resources/assets/miscutils/textures/items/ion/57.png Binary files differindex c80a29d94e..c80a29d94e 100644 --- a/src/resources/assets/miscutils/textures/items/ion/57.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/57.png diff --git a/src/resources/assets/miscutils/textures/items/ion/58.png b/src/main/resources/assets/miscutils/textures/items/ion/58.png Binary files differindex e33f90d6bc..e33f90d6bc 100644 --- a/src/resources/assets/miscutils/textures/items/ion/58.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/58.png diff --git a/src/resources/assets/miscutils/textures/items/ion/59.png b/src/main/resources/assets/miscutils/textures/items/ion/59.png Binary files differindex 14b48b0c39..14b48b0c39 100644 --- a/src/resources/assets/miscutils/textures/items/ion/59.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/59.png diff --git a/src/resources/assets/miscutils/textures/items/ion/6.png b/src/main/resources/assets/miscutils/textures/items/ion/6.png Binary files differindex a8a9b906d2..a8a9b906d2 100644 --- a/src/resources/assets/miscutils/textures/items/ion/6.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/6.png diff --git a/src/resources/assets/miscutils/textures/items/ion/60.png b/src/main/resources/assets/miscutils/textures/items/ion/60.png Binary files differindex 4d77e6d779..4d77e6d779 100644 --- a/src/resources/assets/miscutils/textures/items/ion/60.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/60.png diff --git a/src/resources/assets/miscutils/textures/items/ion/61.png b/src/main/resources/assets/miscutils/textures/items/ion/61.png Binary files differindex 42e2669011..42e2669011 100644 --- a/src/resources/assets/miscutils/textures/items/ion/61.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/61.png diff --git a/src/resources/assets/miscutils/textures/items/ion/62.png b/src/main/resources/assets/miscutils/textures/items/ion/62.png Binary files differindex 5b0ce84ee4..5b0ce84ee4 100644 --- a/src/resources/assets/miscutils/textures/items/ion/62.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/62.png diff --git a/src/resources/assets/miscutils/textures/items/ion/63.png b/src/main/resources/assets/miscutils/textures/items/ion/63.png Binary files differindex 372d256a0e..372d256a0e 100644 --- a/src/resources/assets/miscutils/textures/items/ion/63.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/63.png diff --git a/src/resources/assets/miscutils/textures/items/ion/64.png b/src/main/resources/assets/miscutils/textures/items/ion/64.png Binary files differindex 61b6521d64..61b6521d64 100644 --- a/src/resources/assets/miscutils/textures/items/ion/64.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/64.png diff --git a/src/resources/assets/miscutils/textures/items/ion/65.png b/src/main/resources/assets/miscutils/textures/items/ion/65.png Binary files differindex 66129d8bab..66129d8bab 100644 --- a/src/resources/assets/miscutils/textures/items/ion/65.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/65.png diff --git a/src/resources/assets/miscutils/textures/items/ion/66.png b/src/main/resources/assets/miscutils/textures/items/ion/66.png Binary files differindex 5ec0a6c747..5ec0a6c747 100644 --- a/src/resources/assets/miscutils/textures/items/ion/66.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/66.png diff --git a/src/resources/assets/miscutils/textures/items/ion/67.png b/src/main/resources/assets/miscutils/textures/items/ion/67.png Binary files differindex 09c9dd8b12..09c9dd8b12 100644 --- a/src/resources/assets/miscutils/textures/items/ion/67.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/67.png diff --git a/src/resources/assets/miscutils/textures/items/ion/68.png b/src/main/resources/assets/miscutils/textures/items/ion/68.png Binary files differindex d809bd3646..d809bd3646 100644 --- a/src/resources/assets/miscutils/textures/items/ion/68.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/68.png diff --git a/src/resources/assets/miscutils/textures/items/ion/69.png b/src/main/resources/assets/miscutils/textures/items/ion/69.png Binary files differindex 9e0d0b0d75..9e0d0b0d75 100644 --- a/src/resources/assets/miscutils/textures/items/ion/69.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/69.png diff --git a/src/resources/assets/miscutils/textures/items/ion/7.png b/src/main/resources/assets/miscutils/textures/items/ion/7.png Binary files differindex 6d1f5c229c..6d1f5c229c 100644 --- a/src/resources/assets/miscutils/textures/items/ion/7.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/7.png diff --git a/src/resources/assets/miscutils/textures/items/ion/70.png b/src/main/resources/assets/miscutils/textures/items/ion/70.png Binary files differindex 5bf9df2778..5bf9df2778 100644 --- a/src/resources/assets/miscutils/textures/items/ion/70.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/70.png diff --git a/src/resources/assets/miscutils/textures/items/ion/71.png b/src/main/resources/assets/miscutils/textures/items/ion/71.png Binary files differindex f052e1c772..f052e1c772 100644 --- a/src/resources/assets/miscutils/textures/items/ion/71.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/71.png diff --git a/src/resources/assets/miscutils/textures/items/ion/72.png b/src/main/resources/assets/miscutils/textures/items/ion/72.png Binary files differindex 044e445356..044e445356 100644 --- a/src/resources/assets/miscutils/textures/items/ion/72.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/72.png diff --git a/src/resources/assets/miscutils/textures/items/ion/73.png b/src/main/resources/assets/miscutils/textures/items/ion/73.png Binary files differindex 24bf977862..24bf977862 100644 --- a/src/resources/assets/miscutils/textures/items/ion/73.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/73.png diff --git a/src/resources/assets/miscutils/textures/items/ion/74.png b/src/main/resources/assets/miscutils/textures/items/ion/74.png Binary files differindex 7768bd6f4e..7768bd6f4e 100644 --- a/src/resources/assets/miscutils/textures/items/ion/74.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/74.png diff --git a/src/resources/assets/miscutils/textures/items/ion/75.png b/src/main/resources/assets/miscutils/textures/items/ion/75.png Binary files differindex ed9961e54f..ed9961e54f 100644 --- a/src/resources/assets/miscutils/textures/items/ion/75.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/75.png diff --git a/src/resources/assets/miscutils/textures/items/ion/76.png b/src/main/resources/assets/miscutils/textures/items/ion/76.png Binary files differindex 9010680490..9010680490 100644 --- a/src/resources/assets/miscutils/textures/items/ion/76.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/76.png diff --git a/src/resources/assets/miscutils/textures/items/ion/77.png b/src/main/resources/assets/miscutils/textures/items/ion/77.png Binary files differindex 007497b931..007497b931 100644 --- a/src/resources/assets/miscutils/textures/items/ion/77.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/77.png diff --git a/src/resources/assets/miscutils/textures/items/ion/78.png b/src/main/resources/assets/miscutils/textures/items/ion/78.png Binary files differindex 36c2031937..36c2031937 100644 --- a/src/resources/assets/miscutils/textures/items/ion/78.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/78.png diff --git a/src/resources/assets/miscutils/textures/items/ion/79.png b/src/main/resources/assets/miscutils/textures/items/ion/79.png Binary files differindex 144e55beae..144e55beae 100644 --- a/src/resources/assets/miscutils/textures/items/ion/79.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/79.png diff --git a/src/resources/assets/miscutils/textures/items/ion/8.png b/src/main/resources/assets/miscutils/textures/items/ion/8.png Binary files differindex 0249fbcf3b..0249fbcf3b 100644 --- a/src/resources/assets/miscutils/textures/items/ion/8.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/8.png diff --git a/src/resources/assets/miscutils/textures/items/ion/80.png b/src/main/resources/assets/miscutils/textures/items/ion/80.png Binary files differindex ec7de9fda2..ec7de9fda2 100644 --- a/src/resources/assets/miscutils/textures/items/ion/80.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/80.png diff --git a/src/resources/assets/miscutils/textures/items/ion/81.png b/src/main/resources/assets/miscutils/textures/items/ion/81.png Binary files differindex 9e19f0dbde..9e19f0dbde 100644 --- a/src/resources/assets/miscutils/textures/items/ion/81.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/81.png diff --git a/src/resources/assets/miscutils/textures/items/ion/82.png b/src/main/resources/assets/miscutils/textures/items/ion/82.png Binary files differindex f321ff1073..f321ff1073 100644 --- a/src/resources/assets/miscutils/textures/items/ion/82.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/82.png diff --git a/src/resources/assets/miscutils/textures/items/ion/83.png b/src/main/resources/assets/miscutils/textures/items/ion/83.png Binary files differindex c219309000..c219309000 100644 --- a/src/resources/assets/miscutils/textures/items/ion/83.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/83.png diff --git a/src/resources/assets/miscutils/textures/items/ion/84.png b/src/main/resources/assets/miscutils/textures/items/ion/84.png Binary files differindex c7be4342ad..c7be4342ad 100644 --- a/src/resources/assets/miscutils/textures/items/ion/84.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/84.png diff --git a/src/resources/assets/miscutils/textures/items/ion/85.png b/src/main/resources/assets/miscutils/textures/items/ion/85.png Binary files differindex f0d9995742..f0d9995742 100644 --- a/src/resources/assets/miscutils/textures/items/ion/85.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/85.png diff --git a/src/resources/assets/miscutils/textures/items/ion/86.png b/src/main/resources/assets/miscutils/textures/items/ion/86.png Binary files differindex df5da1cc2e..df5da1cc2e 100644 --- a/src/resources/assets/miscutils/textures/items/ion/86.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/86.png diff --git a/src/resources/assets/miscutils/textures/items/ion/87.png b/src/main/resources/assets/miscutils/textures/items/ion/87.png Binary files differindex ec37e331ff..ec37e331ff 100644 --- a/src/resources/assets/miscutils/textures/items/ion/87.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/87.png diff --git a/src/resources/assets/miscutils/textures/items/ion/88.png b/src/main/resources/assets/miscutils/textures/items/ion/88.png Binary files differindex 9c53cfa885..9c53cfa885 100644 --- a/src/resources/assets/miscutils/textures/items/ion/88.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/88.png diff --git a/src/resources/assets/miscutils/textures/items/ion/89.png b/src/main/resources/assets/miscutils/textures/items/ion/89.png Binary files differindex 1e7f46a245..1e7f46a245 100644 --- a/src/resources/assets/miscutils/textures/items/ion/89.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/89.png diff --git a/src/resources/assets/miscutils/textures/items/ion/9.png b/src/main/resources/assets/miscutils/textures/items/ion/9.png Binary files differindex 946246b360..946246b360 100644 --- a/src/resources/assets/miscutils/textures/items/ion/9.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/9.png diff --git a/src/resources/assets/miscutils/textures/items/ion/90.png b/src/main/resources/assets/miscutils/textures/items/ion/90.png Binary files differindex 023364b0fb..023364b0fb 100644 --- a/src/resources/assets/miscutils/textures/items/ion/90.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/90.png diff --git a/src/resources/assets/miscutils/textures/items/ion/91.png b/src/main/resources/assets/miscutils/textures/items/ion/91.png Binary files differindex 44f463ff62..44f463ff62 100644 --- a/src/resources/assets/miscutils/textures/items/ion/91.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/91.png diff --git a/src/resources/assets/miscutils/textures/items/ion/92.png b/src/main/resources/assets/miscutils/textures/items/ion/92.png Binary files differindex ef1d21c530..ef1d21c530 100644 --- a/src/resources/assets/miscutils/textures/items/ion/92.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/92.png diff --git a/src/resources/assets/miscutils/textures/items/ion/93.png b/src/main/resources/assets/miscutils/textures/items/ion/93.png Binary files differindex 175f6bf84e..175f6bf84e 100644 --- a/src/resources/assets/miscutils/textures/items/ion/93.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/93.png diff --git a/src/resources/assets/miscutils/textures/items/ion/94.png b/src/main/resources/assets/miscutils/textures/items/ion/94.png Binary files differindex 544749b556..544749b556 100644 --- a/src/resources/assets/miscutils/textures/items/ion/94.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/94.png diff --git a/src/resources/assets/miscutils/textures/items/ion/95.png b/src/main/resources/assets/miscutils/textures/items/ion/95.png Binary files differindex a2d38fa96e..a2d38fa96e 100644 --- a/src/resources/assets/miscutils/textures/items/ion/95.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/95.png diff --git a/src/resources/assets/miscutils/textures/items/ion/96.png b/src/main/resources/assets/miscutils/textures/items/ion/96.png Binary files differindex 12e545a65f..12e545a65f 100644 --- a/src/resources/assets/miscutils/textures/items/ion/96.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/96.png diff --git a/src/resources/assets/miscutils/textures/items/ion/97.png b/src/main/resources/assets/miscutils/textures/items/ion/97.png Binary files differindex ee9ed016dc..ee9ed016dc 100644 --- a/src/resources/assets/miscutils/textures/items/ion/97.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/97.png diff --git a/src/resources/assets/miscutils/textures/items/ion/98.png b/src/main/resources/assets/miscutils/textures/items/ion/98.png Binary files differindex aa8a1bf7ce..aa8a1bf7ce 100644 --- a/src/resources/assets/miscutils/textures/items/ion/98.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/98.png diff --git a/src/resources/assets/miscutils/textures/items/ion/99.png b/src/main/resources/assets/miscutils/textures/items/ion/99.png Binary files differindex b5ba289886..b5ba289886 100644 --- a/src/resources/assets/miscutils/textures/items/ion/99.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/99.png diff --git a/src/resources/assets/miscutils/textures/items/ion/IonBase.png b/src/main/resources/assets/miscutils/textures/items/ion/IonBase.png Binary files differindex fd342f7db2..fd342f7db2 100644 --- a/src/resources/assets/miscutils/textures/items/ion/IonBase.png +++ b/src/main/resources/assets/miscutils/textures/items/ion/IonBase.png diff --git a/src/resources/assets/miscutils/textures/items/item.empty.png b/src/main/resources/assets/miscutils/textures/items/item.empty.png Binary files differindex c054d35cce..c054d35cce 100644 --- a/src/resources/assets/miscutils/textures/items/item.empty.png +++ b/src/main/resources/assets/miscutils/textures/items/item.empty.png diff --git a/src/resources/assets/miscutils/textures/items/itemAirFilter.png b/src/main/resources/assets/miscutils/textures/items/itemAirFilter.png Binary files differindex da4b975517..da4b975517 100644 --- a/src/resources/assets/miscutils/textures/items/itemAirFilter.png +++ b/src/main/resources/assets/miscutils/textures/items/itemAirFilter.png diff --git a/src/resources/assets/miscutils/textures/items/itemAlkalusDisk.png b/src/main/resources/assets/miscutils/textures/items/itemAlkalusDisk.png Binary files differindex 8553a13cfb..8553a13cfb 100644 --- a/src/resources/assets/miscutils/textures/items/itemAlkalusDisk.png +++ b/src/main/resources/assets/miscutils/textures/items/itemAlkalusDisk.png diff --git a/src/resources/assets/miscutils/textures/items/itemAmulet.png b/src/main/resources/assets/miscutils/textures/items/itemAmulet.png Binary files differindex 0009e340ec..0009e340ec 100644 --- a/src/resources/assets/miscutils/textures/items/itemAmulet.png +++ b/src/main/resources/assets/miscutils/textures/items/itemAmulet.png diff --git a/src/resources/assets/miscutils/textures/items/itemBackpack.png b/src/main/resources/assets/miscutils/textures/items/itemBackpack.png Binary files differindex 99add96c2b..99add96c2b 100644 --- a/src/resources/assets/miscutils/textures/items/itemBackpack.png +++ b/src/main/resources/assets/miscutils/textures/items/itemBackpack.png diff --git a/src/resources/assets/miscutils/textures/items/itemBasicTurbine.png b/src/main/resources/assets/miscutils/textures/items/itemBasicTurbine.png Binary files differindex 62de905fb9..62de905fb9 100644 --- a/src/resources/assets/miscutils/textures/items/itemBasicTurbine.png +++ b/src/main/resources/assets/miscutils/textures/items/itemBasicTurbine.png diff --git a/src/resources/assets/miscutils/textures/items/itemBelt.png b/src/main/resources/assets/miscutils/textures/items/itemBelt.png Binary files differindex 93474d12e1..93474d12e1 100644 --- a/src/resources/assets/miscutils/textures/items/itemBelt.png +++ b/src/main/resources/assets/miscutils/textures/items/itemBelt.png diff --git a/src/resources/assets/miscutils/textures/items/itemBigEgg.png b/src/main/resources/assets/miscutils/textures/items/itemBigEgg.png Binary files differindex 54db66b4c5..54db66b4c5 100644 --- a/src/resources/assets/miscutils/textures/items/itemBigEgg.png +++ b/src/main/resources/assets/miscutils/textures/items/itemBigEgg.png diff --git a/src/resources/assets/miscutils/textures/items/itemBlueprint.png b/src/main/resources/assets/miscutils/textures/items/itemBlueprint.png Binary files differindex 593ba0ac17..593ba0ac17 100644 --- a/src/resources/assets/miscutils/textures/items/itemBlueprint.png +++ b/src/main/resources/assets/miscutils/textures/items/itemBlueprint.png diff --git a/src/resources/assets/miscutils/textures/items/itemBoilerChassis.png b/src/main/resources/assets/miscutils/textures/items/itemBoilerChassis.png Binary files differindex 1ac3bff818..1ac3bff818 100644 --- a/src/resources/assets/miscutils/textures/items/itemBoilerChassis.png +++ b/src/main/resources/assets/miscutils/textures/items/itemBoilerChassis.png diff --git a/src/resources/assets/miscutils/textures/items/itemBolt.png b/src/main/resources/assets/miscutils/textures/items/itemBolt.png Binary files differindex 8675564a9b..8675564a9b 100644 --- a/src/resources/assets/miscutils/textures/items/itemBolt.png +++ b/src/main/resources/assets/miscutils/textures/items/itemBolt.png diff --git a/src/resources/assets/miscutils/textures/items/itemBook.png b/src/main/resources/assets/miscutils/textures/items/itemBook.png Binary files differindex f6cdf72bda..f6cdf72bda 100644 --- a/src/resources/assets/miscutils/textures/items/itemBook.png +++ b/src/main/resources/assets/miscutils/textures/items/itemBook.png diff --git a/src/resources/assets/miscutils/textures/items/itemBoots.png b/src/main/resources/assets/miscutils/textures/items/itemBoots.png Binary files differindex 9cd07048cd..9cd07048cd 100644 --- a/src/resources/assets/miscutils/textures/items/itemBoots.png +++ b/src/main/resources/assets/miscutils/textures/items/itemBoots.png diff --git a/src/resources/assets/miscutils/textures/items/itemBottle.png b/src/main/resources/assets/miscutils/textures/items/itemBottle.png Binary files differindex 942a9ffb5f..942a9ffb5f 100644 --- a/src/resources/assets/miscutils/textures/items/itemBottle.png +++ b/src/main/resources/assets/miscutils/textures/items/itemBottle.png diff --git a/src/resources/assets/miscutils/textures/items/itemBread.png b/src/main/resources/assets/miscutils/textures/items/itemBread.png Binary files differindex 332b994342..332b994342 100644 --- a/src/resources/assets/miscutils/textures/items/itemBread.png +++ b/src/main/resources/assets/miscutils/textures/items/itemBread.png diff --git a/src/resources/assets/miscutils/textures/items/itemBufferCore.png b/src/main/resources/assets/miscutils/textures/items/itemBufferCore.png Binary files differindex 3e41cfaa1c..3e41cfaa1c 100644 --- a/src/resources/assets/miscutils/textures/items/itemBufferCore.png +++ b/src/main/resources/assets/miscutils/textures/items/itemBufferCore.png diff --git a/src/resources/assets/miscutils/textures/items/itemCell.png b/src/main/resources/assets/miscutils/textures/items/itemCell.png Binary files differindex 023291b957..023291b957 100644 --- a/src/resources/assets/miscutils/textures/items/itemCell.png +++ b/src/main/resources/assets/miscutils/textures/items/itemCell.png diff --git a/src/resources/assets/miscutils/textures/items/itemCellPlasma.png b/src/main/resources/assets/miscutils/textures/items/itemCellPlasma.png Binary files differindex 1c93293744..1c93293744 100644 --- a/src/resources/assets/miscutils/textures/items/itemCellPlasma.png +++ b/src/main/resources/assets/miscutils/textures/items/itemCellPlasma.png diff --git a/src/resources/assets/miscutils/textures/items/itemCellPlasma_Overlay.png b/src/main/resources/assets/miscutils/textures/items/itemCellPlasma_Overlay.png Binary files differindex ce3c6377c7..ce3c6377c7 100644 --- a/src/resources/assets/miscutils/textures/items/itemCellPlasma_Overlay.png +++ b/src/main/resources/assets/miscutils/textures/items/itemCellPlasma_Overlay.png diff --git a/src/resources/assets/miscutils/textures/items/itemCell_Overlay.png b/src/main/resources/assets/miscutils/textures/items/itemCell_Overlay.png Binary files differindex 35c124ab0c..35c124ab0c 100644 --- a/src/resources/assets/miscutils/textures/items/itemCell_Overlay.png +++ b/src/main/resources/assets/miscutils/textures/items/itemCell_Overlay.png diff --git a/src/resources/assets/miscutils/textures/items/itemCentidust.png b/src/main/resources/assets/miscutils/textures/items/itemCentidust.png Binary files differindex 13658b477f..13658b477f 100644 --- a/src/resources/assets/miscutils/textures/items/itemCentidust.png +++ b/src/main/resources/assets/miscutils/textures/items/itemCentidust.png diff --git a/src/resources/assets/miscutils/textures/items/itemCircuitLFTR.png b/src/main/resources/assets/miscutils/textures/items/itemCircuitLFTR.png Binary files differindex 723f62e278..723f62e278 100644 --- a/src/resources/assets/miscutils/textures/items/itemCircuitLFTR.png +++ b/src/main/resources/assets/miscutils/textures/items/itemCircuitLFTR.png diff --git a/src/resources/assets/miscutils/textures/items/itemDebugShapeSpawner.png b/src/main/resources/assets/miscutils/textures/items/itemDebugShapeSpawner.png Binary files differindex 3fa59812e9..3fa59812e9 100644 --- a/src/resources/assets/miscutils/textures/items/itemDebugShapeSpawner.png +++ b/src/main/resources/assets/miscutils/textures/items/itemDebugShapeSpawner.png diff --git a/src/resources/assets/miscutils/textures/items/itemDecidust.png b/src/main/resources/assets/miscutils/textures/items/itemDecidust.png Binary files differindex 1d7766cca5..1d7766cca5 100644 --- a/src/resources/assets/miscutils/textures/items/itemDecidust.png +++ b/src/main/resources/assets/miscutils/textures/items/itemDecidust.png diff --git a/src/resources/assets/miscutils/textures/items/itemDefault.png b/src/main/resources/assets/miscutils/textures/items/itemDefault.png Binary files differindex 9ed71de6dd..9ed71de6dd 100644 --- a/src/resources/assets/miscutils/textures/items/itemDefault.png +++ b/src/main/resources/assets/miscutils/textures/items/itemDefault.png diff --git a/src/resources/assets/miscutils/textures/items/itemDehydratorCoil.png b/src/main/resources/assets/miscutils/textures/items/itemDehydratorCoil.png Binary files differindex c7a849556f..c7a849556f 100644 --- a/src/resources/assets/miscutils/textures/items/itemDehydratorCoil.png +++ b/src/main/resources/assets/miscutils/textures/items/itemDehydratorCoil.png diff --git a/src/resources/assets/miscutils/textures/items/itemDehydratorCoilWire.png b/src/main/resources/assets/miscutils/textures/items/itemDehydratorCoilWire.png Binary files differindex 8687d1c8ca..8687d1c8ca 100644 --- a/src/resources/assets/miscutils/textures/items/itemDehydratorCoilWire.png +++ b/src/main/resources/assets/miscutils/textures/items/itemDehydratorCoilWire.png diff --git a/src/resources/assets/miscutils/textures/items/itemDroplet.png b/src/main/resources/assets/miscutils/textures/items/itemDroplet.png Binary files differindex 31f30e524a..31f30e524a 100644 --- a/src/resources/assets/miscutils/textures/items/itemDroplet.png +++ b/src/main/resources/assets/miscutils/textures/items/itemDroplet.png diff --git a/src/resources/assets/miscutils/textures/items/itemEnergeticRotorBlade.png b/src/main/resources/assets/miscutils/textures/items/itemEnergeticRotorBlade.png Binary files differindex 7c03ca0ada..7c03ca0ada 100644 --- a/src/resources/assets/miscutils/textures/items/itemEnergeticRotorBlade.png +++ b/src/main/resources/assets/miscutils/textures/items/itemEnergeticRotorBlade.png diff --git a/src/resources/assets/miscutils/textures/items/itemEnergeticShaft.png b/src/main/resources/assets/miscutils/textures/items/itemEnergeticShaft.png Binary files differindex bf9ab22ce2..bf9ab22ce2 100644 --- a/src/resources/assets/miscutils/textures/items/itemEnergeticShaft.png +++ b/src/main/resources/assets/miscutils/textures/items/itemEnergeticShaft.png diff --git a/src/resources/assets/miscutils/textures/items/itemFiber.png b/src/main/resources/assets/miscutils/textures/items/itemFiber.png Binary files differindex c2eb959c6c..c2eb959c6c 100644 --- a/src/resources/assets/miscutils/textures/items/itemFiber.png +++ b/src/main/resources/assets/miscutils/textures/items/itemFiber.png diff --git a/src/resources/assets/miscutils/textures/items/itemFineWire.png b/src/main/resources/assets/miscutils/textures/items/itemFineWire.png Binary files differindex 1804dc358b..1804dc358b 100644 --- a/src/resources/assets/miscutils/textures/items/itemFineWire.png +++ b/src/main/resources/assets/miscutils/textures/items/itemFineWire.png diff --git a/src/resources/assets/miscutils/textures/items/itemFireStarter.png b/src/main/resources/assets/miscutils/textures/items/itemFireStarter.png Binary files differindex e3027edff8..e3027edff8 100644 --- a/src/resources/assets/miscutils/textures/items/itemFireStarter.png +++ b/src/main/resources/assets/miscutils/textures/items/itemFireStarter.png diff --git a/src/resources/assets/miscutils/textures/items/itemFoodCurriedSausages.png b/src/main/resources/assets/miscutils/textures/items/itemFoodCurriedSausages.png Binary files differindex 55a9e7c912..55a9e7c912 100644 --- a/src/resources/assets/miscutils/textures/items/itemFoodCurriedSausages.png +++ b/src/main/resources/assets/miscutils/textures/items/itemFoodCurriedSausages.png diff --git a/src/resources/assets/miscutils/textures/items/itemFoodRaisinToast.png b/src/main/resources/assets/miscutils/textures/items/itemFoodRaisinToast.png Binary files differindex 12a1962cd3..12a1962cd3 100644 --- a/src/resources/assets/miscutils/textures/items/itemFoodRaisinToast.png +++ b/src/main/resources/assets/miscutils/textures/items/itemFoodRaisinToast.png diff --git a/src/resources/assets/miscutils/textures/items/itemGear.png b/src/main/resources/assets/miscutils/textures/items/itemGear.png Binary files differindex 6d0cf3be50..6d0cf3be50 100644 --- a/src/resources/assets/miscutils/textures/items/itemGear.png +++ b/src/main/resources/assets/miscutils/textures/items/itemGear.png diff --git a/src/resources/assets/miscutils/textures/items/itemGem.png b/src/main/resources/assets/miscutils/textures/items/itemGem.png Binary files differindex ad5126851a..ad5126851a 100644 --- a/src/resources/assets/miscutils/textures/items/itemGem.png +++ b/src/main/resources/assets/miscutils/textures/items/itemGem.png diff --git a/src/resources/assets/miscutils/textures/items/itemHatTinFoil.png b/src/main/resources/assets/miscutils/textures/items/itemHatTinFoil.png Binary files differindex 91f1cad62e..91f1cad62e 100644 --- a/src/resources/assets/miscutils/textures/items/itemHatTinFoil.png +++ b/src/main/resources/assets/miscutils/textures/items/itemHatTinFoil.png diff --git a/src/resources/assets/miscutils/textures/items/itemHeavyPlate.png b/src/main/resources/assets/miscutils/textures/items/itemHeavyPlate.png Binary files differindex e09ff6d1df..e09ff6d1df 100644 --- a/src/resources/assets/miscutils/textures/items/itemHeavyPlate.png +++ b/src/main/resources/assets/miscutils/textures/items/itemHeavyPlate.png diff --git a/src/resources/assets/miscutils/textures/items/itemHeavyPlate_Overlay.png b/src/main/resources/assets/miscutils/textures/items/itemHeavyPlate_Overlay.png Binary files differindex c3835b07c1..c3835b07c1 100644 --- a/src/resources/assets/miscutils/textures/items/itemHeavyPlate_Overlay.png +++ b/src/main/resources/assets/miscutils/textures/items/itemHeavyPlate_Overlay.png diff --git a/src/resources/assets/miscutils/textures/items/itemHeliumBlob.png b/src/main/resources/assets/miscutils/textures/items/itemHeliumBlob.png Binary files differindex f86ce276cc..f86ce276cc 100644 --- a/src/resources/assets/miscutils/textures/items/itemHeliumBlob.png +++ b/src/main/resources/assets/miscutils/textures/items/itemHeliumBlob.png diff --git a/src/resources/assets/miscutils/textures/items/itemHelmet.png b/src/main/resources/assets/miscutils/textures/items/itemHelmet.png Binary files differindex d7c34334b2..d7c34334b2 100644 --- a/src/resources/assets/miscutils/textures/items/itemHelmet.png +++ b/src/main/resources/assets/miscutils/textures/items/itemHelmet.png diff --git a/src/resources/assets/miscutils/textures/items/itemHotIngotRaisinBread.png b/src/main/resources/assets/miscutils/textures/items/itemHotIngotRaisinBread.png Binary files differindex 332b994342..332b994342 100644 --- a/src/resources/assets/miscutils/textures/items/itemHotIngotRaisinBread.png +++ b/src/main/resources/assets/miscutils/textures/items/itemHotIngotRaisinBread.png diff --git a/src/resources/assets/miscutils/textures/items/itemHydrogenBlob.png b/src/main/resources/assets/miscutils/textures/items/itemHydrogenBlob.png Binary files differindex 29296faf74..29296faf74 100644 --- a/src/resources/assets/miscutils/textures/items/itemHydrogenBlob.png +++ b/src/main/resources/assets/miscutils/textures/items/itemHydrogenBlob.png diff --git a/src/resources/assets/miscutils/textures/items/itemIngot.png b/src/main/resources/assets/miscutils/textures/items/itemIngot.png Binary files differindex a904365fba..a904365fba 100644 --- a/src/resources/assets/miscutils/textures/items/itemIngot.png +++ b/src/main/resources/assets/miscutils/textures/items/itemIngot.png diff --git a/src/resources/assets/miscutils/textures/items/itemIngotBatteryAlloy.png b/src/main/resources/assets/miscutils/textures/items/itemIngotBatteryAlloy.png Binary files differindex edaac2807f..edaac2807f 100644 --- a/src/resources/assets/miscutils/textures/items/itemIngotBatteryAlloy.png +++ b/src/main/resources/assets/miscutils/textures/items/itemIngotBatteryAlloy.png diff --git a/src/resources/assets/miscutils/textures/items/itemIngotHot.png b/src/main/resources/assets/miscutils/textures/items/itemIngotHot.png Binary files differindex d0f73e2868..d0f73e2868 100644 --- a/src/resources/assets/miscutils/textures/items/itemIngotHot.png +++ b/src/main/resources/assets/miscutils/textures/items/itemIngotHot.png diff --git a/src/resources/assets/miscutils/textures/items/itemIngotRaisinBread.png b/src/main/resources/assets/miscutils/textures/items/itemIngotRaisinBread.png Binary files differindex 332b994342..332b994342 100644 --- a/src/resources/assets/miscutils/textures/items/itemIngotRaisinBread.png +++ b/src/main/resources/assets/miscutils/textures/items/itemIngotRaisinBread.png diff --git a/src/resources/assets/miscutils/textures/items/itemIridiumRotorBlade.png b/src/main/resources/assets/miscutils/textures/items/itemIridiumRotorBlade.png Binary files differindex 73c2cbe026..73c2cbe026 100644 --- a/src/resources/assets/miscutils/textures/items/itemIridiumRotorBlade.png +++ b/src/main/resources/assets/miscutils/textures/items/itemIridiumRotorBlade.png diff --git a/src/resources/assets/miscutils/textures/items/itemIridiumShaft.png b/src/main/resources/assets/miscutils/textures/items/itemIridiumShaft.png Binary files differindex 585b862d12..585b862d12 100644 --- a/src/resources/assets/miscutils/textures/items/itemIridiumShaft.png +++ b/src/main/resources/assets/miscutils/textures/items/itemIridiumShaft.png diff --git a/src/resources/assets/miscutils/textures/items/itemKey.png b/src/main/resources/assets/miscutils/textures/items/itemKey.png Binary files differindex 19527cc2ae..19527cc2ae 100644 --- a/src/resources/assets/miscutils/textures/items/itemKey.png +++ b/src/main/resources/assets/miscutils/textures/items/itemKey.png diff --git a/src/resources/assets/miscutils/textures/items/itemKeyBig.png b/src/main/resources/assets/miscutils/textures/items/itemKeyBig.png Binary files differindex abfefc9aba..abfefc9aba 100644 --- a/src/resources/assets/miscutils/textures/items/itemKeyBig.png +++ b/src/main/resources/assets/miscutils/textures/items/itemKeyBig.png diff --git a/src/resources/assets/miscutils/textures/items/itemKeyGold.png b/src/main/resources/assets/miscutils/textures/items/itemKeyGold.png Binary files differindex 289dac1df6..289dac1df6 100644 --- a/src/resources/assets/miscutils/textures/items/itemKeyGold.png +++ b/src/main/resources/assets/miscutils/textures/items/itemKeyGold.png diff --git a/src/resources/assets/miscutils/textures/items/itemKeyGoldBoss.png b/src/main/resources/assets/miscutils/textures/items/itemKeyGoldBoss.png Binary files differindex 11e8312714..11e8312714 100644 --- a/src/resources/assets/miscutils/textures/items/itemKeyGoldBoss.png +++ b/src/main/resources/assets/miscutils/textures/items/itemKeyGoldBoss.png diff --git a/src/resources/assets/miscutils/textures/items/itemLavaFilter.png b/src/main/resources/assets/miscutils/textures/items/itemLavaFilter.png Binary files differindex 92a06a3a9a..92a06a3a9a 100644 --- a/src/resources/assets/miscutils/textures/items/itemLavaFilter.png +++ b/src/main/resources/assets/miscutils/textures/items/itemLavaFilter.png diff --git a/src/resources/assets/miscutils/textures/items/itemMagnaliumRotorBlade.png b/src/main/resources/assets/miscutils/textures/items/itemMagnaliumRotorBlade.png Binary files differindex d10128babd..d10128babd 100644 --- a/src/resources/assets/miscutils/textures/items/itemMagnaliumRotorBlade.png +++ b/src/main/resources/assets/miscutils/textures/items/itemMagnaliumRotorBlade.png diff --git a/src/resources/assets/miscutils/textures/items/itemMagnaliumShaft.png b/src/main/resources/assets/miscutils/textures/items/itemMagnaliumShaft.png Binary files differindex b93430f732..b93430f732 100644 --- a/src/resources/assets/miscutils/textures/items/itemMagnaliumShaft.png +++ b/src/main/resources/assets/miscutils/textures/items/itemMagnaliumShaft.png diff --git a/src/resources/assets/miscutils/textures/items/itemMushroom.png b/src/main/resources/assets/miscutils/textures/items/itemMushroom.png Binary files differindex d63f079f45..d63f079f45 100644 --- a/src/resources/assets/miscutils/textures/items/itemMushroom.png +++ b/src/main/resources/assets/miscutils/textures/items/itemMushroom.png diff --git a/src/resources/assets/miscutils/textures/items/itemMushroomRed.png b/src/main/resources/assets/miscutils/textures/items/itemMushroomRed.png Binary files differindex 2bbf1bcb00..2bbf1bcb00 100644 --- a/src/resources/assets/miscutils/textures/items/itemMushroomRed.png +++ b/src/main/resources/assets/miscutils/textures/items/itemMushroomRed.png diff --git a/src/resources/assets/miscutils/textures/items/itemNugget.png b/src/main/resources/assets/miscutils/textures/items/itemNugget.png Binary files differindex e4d3e0c89c..e4d3e0c89c 100644 --- a/src/resources/assets/miscutils/textures/items/itemNugget.png +++ b/src/main/resources/assets/miscutils/textures/items/itemNugget.png diff --git a/src/resources/assets/miscutils/textures/items/itemPLACEHOLDER_Circuit.png b/src/main/resources/assets/miscutils/textures/items/itemPLACEHOLDER_Circuit.png Binary files differindex aba5bf6850..aba5bf6850 100644 --- a/src/resources/assets/miscutils/textures/items/itemPLACEHOLDER_Circuit.png +++ b/src/main/resources/assets/miscutils/textures/items/itemPLACEHOLDER_Circuit.png diff --git a/src/resources/assets/miscutils/textures/items/itemPickaxe.png b/src/main/resources/assets/miscutils/textures/items/itemPickaxe.png Binary files differindex d21440bd11..d21440bd11 100644 --- a/src/resources/assets/miscutils/textures/items/itemPickaxe.png +++ b/src/main/resources/assets/miscutils/textures/items/itemPickaxe.png diff --git a/src/resources/assets/miscutils/textures/items/itemPineapple.png b/src/main/resources/assets/miscutils/textures/items/itemPineapple.png Binary files differindex 1185738eb8..1185738eb8 100644 --- a/src/resources/assets/miscutils/textures/items/itemPineapple.png +++ b/src/main/resources/assets/miscutils/textures/items/itemPineapple.png diff --git a/src/resources/assets/miscutils/textures/items/itemPlate.png b/src/main/resources/assets/miscutils/textures/items/itemPlate.png Binary files differindex b5a9ab5214..b5a9ab5214 100644 --- a/src/resources/assets/miscutils/textures/items/itemPlate.png +++ b/src/main/resources/assets/miscutils/textures/items/itemPlate.png diff --git a/src/resources/assets/miscutils/textures/items/itemPlateBatteryAlloy.png b/src/main/resources/assets/miscutils/textures/items/itemPlateBatteryAlloy.png Binary files differindex fb293722f6..fb293722f6 100644 --- a/src/resources/assets/miscutils/textures/items/itemPlateBatteryAlloy.png +++ b/src/main/resources/assets/miscutils/textures/items/itemPlateBatteryAlloy.png diff --git a/src/resources/assets/miscutils/textures/items/itemPlateDouble.png b/src/main/resources/assets/miscutils/textures/items/itemPlateDouble.png Binary files differindex edb7970730..edb7970730 100644 --- a/src/resources/assets/miscutils/textures/items/itemPlateDouble.png +++ b/src/main/resources/assets/miscutils/textures/items/itemPlateDouble.png diff --git a/src/resources/assets/miscutils/textures/items/itemPlatebody.png b/src/main/resources/assets/miscutils/textures/items/itemPlatebody.png Binary files differindex ec472a86a0..ec472a86a0 100644 --- a/src/resources/assets/miscutils/textures/items/itemPlatebody.png +++ b/src/main/resources/assets/miscutils/textures/items/itemPlatebody.png diff --git a/src/resources/assets/miscutils/textures/items/itemPlatelegs.png b/src/main/resources/assets/miscutils/textures/items/itemPlatelegs.png Binary files differindex bcaa1338e6..bcaa1338e6 100644 --- a/src/resources/assets/miscutils/textures/items/itemPlatelegs.png +++ b/src/main/resources/assets/miscutils/textures/items/itemPlatelegs.png diff --git a/src/resources/assets/miscutils/textures/items/itemPotion.png b/src/main/resources/assets/miscutils/textures/items/itemPotion.png Binary files differindex a1ff53ef8d..a1ff53ef8d 100644 --- a/src/resources/assets/miscutils/textures/items/itemPotion.png +++ b/src/main/resources/assets/miscutils/textures/items/itemPotion.png diff --git a/src/resources/assets/miscutils/textures/items/itemPotionBlack.png b/src/main/resources/assets/miscutils/textures/items/itemPotionBlack.png Binary files differindex 07a5951140..07a5951140 100644 --- a/src/resources/assets/miscutils/textures/items/itemPotionBlack.png +++ b/src/main/resources/assets/miscutils/textures/items/itemPotionBlack.png diff --git a/src/resources/assets/miscutils/textures/items/itemPotionRed.png b/src/main/resources/assets/miscutils/textures/items/itemPotionRed.png Binary files differindex b6b611bbbb..b6b611bbbb 100644 --- a/src/resources/assets/miscutils/textures/items/itemPotionRed.png +++ b/src/main/resources/assets/miscutils/textures/items/itemPotionRed.png diff --git a/src/resources/assets/miscutils/textures/items/itemRing.png b/src/main/resources/assets/miscutils/textures/items/itemRing.png Binary files differindex eb9dfd5e21..eb9dfd5e21 100644 --- a/src/resources/assets/miscutils/textures/items/itemRing.png +++ b/src/main/resources/assets/miscutils/textures/items/itemRing.png diff --git a/src/resources/assets/miscutils/textures/items/itemRingWearable.png b/src/main/resources/assets/miscutils/textures/items/itemRingWearable.png Binary files differindex 4601dbbe13..4601dbbe13 100644 --- a/src/resources/assets/miscutils/textures/items/itemRingWearable.png +++ b/src/main/resources/assets/miscutils/textures/items/itemRingWearable.png diff --git a/src/resources/assets/miscutils/textures/items/itemRod.png b/src/main/resources/assets/miscutils/textures/items/itemRod.png Binary files differindex 18c9ee59c1..18c9ee59c1 100644 --- a/src/resources/assets/miscutils/textures/items/itemRod.png +++ b/src/main/resources/assets/miscutils/textures/items/itemRod.png diff --git a/src/resources/assets/miscutils/textures/items/itemRodLong.png b/src/main/resources/assets/miscutils/textures/items/itemRodLong.png Binary files differindex 1580b911f0..1580b911f0 100644 --- a/src/resources/assets/miscutils/textures/items/itemRodLong.png +++ b/src/main/resources/assets/miscutils/textures/items/itemRodLong.png diff --git a/src/resources/assets/miscutils/textures/items/itemRope.png b/src/main/resources/assets/miscutils/textures/items/itemRope.png Binary files differindex 061938234d..061938234d 100644 --- a/src/resources/assets/miscutils/textures/items/itemRope.png +++ b/src/main/resources/assets/miscutils/textures/items/itemRope.png diff --git a/src/resources/assets/miscutils/textures/items/itemRotor.png b/src/main/resources/assets/miscutils/textures/items/itemRotor.png Binary files differindex c593cee35b..c593cee35b 100644 --- a/src/resources/assets/miscutils/textures/items/itemRotor.png +++ b/src/main/resources/assets/miscutils/textures/items/itemRotor.png diff --git a/src/resources/assets/miscutils/textures/items/itemSandstoneHammer.png b/src/main/resources/assets/miscutils/textures/items/itemSandstoneHammer.png Binary files differindex ae8fc32267..ae8fc32267 100644 --- a/src/resources/assets/miscutils/textures/items/itemSandstoneHammer.png +++ b/src/main/resources/assets/miscutils/textures/items/itemSandstoneHammer.png diff --git a/src/resources/assets/miscutils/textures/items/itemScrew.png b/src/main/resources/assets/miscutils/textures/items/itemScrew.png Binary files differindex faca2c6e3d..faca2c6e3d 100644 --- a/src/resources/assets/miscutils/textures/items/itemScrew.png +++ b/src/main/resources/assets/miscutils/textures/items/itemScrew.png diff --git a/src/resources/assets/miscutils/textures/items/itemShard.png b/src/main/resources/assets/miscutils/textures/items/itemShard.png Binary files differindex 104a59d2b3..104a59d2b3 100644 --- a/src/resources/assets/miscutils/textures/items/itemShard.png +++ b/src/main/resources/assets/miscutils/textures/items/itemShard.png diff --git a/src/resources/assets/miscutils/textures/items/itemShovel.png b/src/main/resources/assets/miscutils/textures/items/itemShovel.png Binary files differindex 8e1c0c2826..8e1c0c2826 100644 --- a/src/resources/assets/miscutils/textures/items/itemShovel.png +++ b/src/main/resources/assets/miscutils/textures/items/itemShovel.png diff --git a/src/resources/assets/miscutils/textures/items/itemSlowBuildersRing.png b/src/main/resources/assets/miscutils/textures/items/itemSlowBuildersRing.png Binary files differindex f711563765..f711563765 100644 --- a/src/resources/assets/miscutils/textures/items/itemSlowBuildersRing.png +++ b/src/main/resources/assets/miscutils/textures/items/itemSlowBuildersRing.png diff --git a/src/resources/assets/miscutils/textures/items/itemSmallSpring.png b/src/main/resources/assets/miscutils/textures/items/itemSmallSpring.png Binary files differindex 54b3afb24e..54b3afb24e 100644 --- a/src/resources/assets/miscutils/textures/items/itemSmallSpring.png +++ b/src/main/resources/assets/miscutils/textures/items/itemSmallSpring.png diff --git a/src/resources/assets/miscutils/textures/items/itemSpring.png b/src/main/resources/assets/miscutils/textures/items/itemSpring.png Binary files differindex df442ed454..df442ed454 100644 --- a/src/resources/assets/miscutils/textures/items/itemSpring.png +++ b/src/main/resources/assets/miscutils/textures/items/itemSpring.png diff --git a/src/resources/assets/miscutils/textures/items/itemStaballoyAxe.png b/src/main/resources/assets/miscutils/textures/items/itemStaballoyAxe.png Binary files differindex d7f8ed262f..d7f8ed262f 100644 --- a/src/resources/assets/miscutils/textures/items/itemStaballoyAxe.png +++ b/src/main/resources/assets/miscutils/textures/items/itemStaballoyAxe.png diff --git a/src/resources/assets/miscutils/textures/items/itemStaballoyPickaxe.png b/src/main/resources/assets/miscutils/textures/items/itemStaballoyPickaxe.png Binary files differindex 024f4f384c..024f4f384c 100644 --- a/src/resources/assets/miscutils/textures/items/itemStaballoyPickaxe.png +++ b/src/main/resources/assets/miscutils/textures/items/itemStaballoyPickaxe.png diff --git a/src/resources/assets/miscutils/textures/items/itemStickyRubber.png b/src/main/resources/assets/miscutils/textures/items/itemStickyRubber.png Binary files differindex c95353c892..c95353c892 100644 --- a/src/resources/assets/miscutils/textures/items/itemStickyRubber.png +++ b/src/main/resources/assets/miscutils/textures/items/itemStickyRubber.png diff --git a/src/resources/assets/miscutils/textures/items/itemSulfuricAcidPotion.png b/src/main/resources/assets/miscutils/textures/items/itemSulfuricAcidPotion.png Binary files differindex 5e7201a558..5e7201a558 100644 --- a/src/resources/assets/miscutils/textures/items/itemSulfuricAcidPotion.png +++ b/src/main/resources/assets/miscutils/textures/items/itemSulfuricAcidPotion.png diff --git a/src/resources/assets/miscutils/textures/items/itemSword.png b/src/main/resources/assets/miscutils/textures/items/itemSword.png Binary files differindex 56ac390aa8..56ac390aa8 100644 --- a/src/resources/assets/miscutils/textures/items/itemSword.png +++ b/src/main/resources/assets/miscutils/textures/items/itemSword.png diff --git a/src/resources/assets/miscutils/textures/items/itemTablet.png b/src/main/resources/assets/miscutils/textures/items/itemTablet.png Binary files differindex 8e10b0529a..8e10b0529a 100644 --- a/src/resources/assets/miscutils/textures/items/itemTablet.png +++ b/src/main/resources/assets/miscutils/textures/items/itemTablet.png diff --git a/src/resources/assets/miscutils/textures/items/itemTungstenSteelRotorBlade.png b/src/main/resources/assets/miscutils/textures/items/itemTungstenSteelRotorBlade.png Binary files differindex cd376cb5cb..cd376cb5cb 100644 --- a/src/resources/assets/miscutils/textures/items/itemTungstenSteelRotorBlade.png +++ b/src/main/resources/assets/miscutils/textures/items/itemTungstenSteelRotorBlade.png diff --git a/src/resources/assets/miscutils/textures/items/itemTungstenSteelShaft.png b/src/main/resources/assets/miscutils/textures/items/itemTungstenSteelShaft.png Binary files differindex f08ba26585..f08ba26585 100644 --- a/src/resources/assets/miscutils/textures/items/itemTungstenSteelShaft.png +++ b/src/main/resources/assets/miscutils/textures/items/itemTungstenSteelShaft.png diff --git a/src/resources/assets/miscutils/textures/items/itemUltimetRotorBlade.png b/src/main/resources/assets/miscutils/textures/items/itemUltimetRotorBlade.png Binary files differindex 89f7b9474a..89f7b9474a 100644 --- a/src/resources/assets/miscutils/textures/items/itemUltimetRotorBlade.png +++ b/src/main/resources/assets/miscutils/textures/items/itemUltimetRotorBlade.png diff --git a/src/resources/assets/miscutils/textures/items/itemUltimetShaft.png b/src/main/resources/assets/miscutils/textures/items/itemUltimetShaft.png Binary files differindex df6c9b9c49..df6c9b9c49 100644 --- a/src/resources/assets/miscutils/textures/items/itemUltimetShaft.png +++ b/src/main/resources/assets/miscutils/textures/items/itemUltimetShaft.png diff --git a/src/resources/assets/miscutils/textures/items/itemVibrantRotorBlade.png b/src/main/resources/assets/miscutils/textures/items/itemVibrantRotorBlade.png Binary files differindex 5dea2ec1e5..5dea2ec1e5 100644 --- a/src/resources/assets/miscutils/textures/items/itemVibrantRotorBlade.png +++ b/src/main/resources/assets/miscutils/textures/items/itemVibrantRotorBlade.png diff --git a/src/resources/assets/miscutils/textures/items/itemVibrantShaft.png b/src/main/resources/assets/miscutils/textures/items/itemVibrantShaft.png Binary files differindex 3a1fe64176..3a1fe64176 100644 --- a/src/resources/assets/miscutils/textures/items/itemVibrantShaft.png +++ b/src/main/resources/assets/miscutils/textures/items/itemVibrantShaft.png diff --git a/src/resources/assets/miscutils/textures/items/itemWaterBottle.png b/src/main/resources/assets/miscutils/textures/items/itemWaterBottle.png Binary files differindex 942a9ffb5f..942a9ffb5f 100644 --- a/src/resources/assets/miscutils/textures/items/itemWaterBottle.png +++ b/src/main/resources/assets/miscutils/textures/items/itemWaterBottle.png diff --git a/src/resources/assets/miscutils/textures/items/material/DustBlizz.png b/src/main/resources/assets/miscutils/textures/items/material/DustBlizz.png Binary files differindex e253eea6de..e253eea6de 100644 --- a/src/resources/assets/miscutils/textures/items/material/DustBlizz.png +++ b/src/main/resources/assets/miscutils/textures/items/material/DustBlizz.png diff --git a/src/resources/assets/miscutils/textures/items/material/DustBlizz.png.mcmeta b/src/main/resources/assets/miscutils/textures/items/material/DustBlizz.png.mcmeta index c5d457f93d..c5d457f93d 100644 --- a/src/resources/assets/miscutils/textures/items/material/DustBlizz.png.mcmeta +++ b/src/main/resources/assets/miscutils/textures/items/material/DustBlizz.png.mcmeta diff --git a/src/resources/assets/miscutils/textures/items/material/DustCryotheum.png b/src/main/resources/assets/miscutils/textures/items/material/DustCryotheum.png Binary files differindex 960b304439..960b304439 100644 --- a/src/resources/assets/miscutils/textures/items/material/DustCryotheum.png +++ b/src/main/resources/assets/miscutils/textures/items/material/DustCryotheum.png diff --git a/src/resources/assets/miscutils/textures/items/material/DustCryotheum.png.mcmeta b/src/main/resources/assets/miscutils/textures/items/material/DustCryotheum.png.mcmeta index c5d457f93d..c5d457f93d 100644 --- a/src/resources/assets/miscutils/textures/items/material/DustCryotheum.png.mcmeta +++ b/src/main/resources/assets/miscutils/textures/items/material/DustCryotheum.png.mcmeta diff --git a/src/resources/assets/miscutils/textures/items/material/DustPyrotheum.png b/src/main/resources/assets/miscutils/textures/items/material/DustPyrotheum.png Binary files differindex eaf605e762..eaf605e762 100644 --- a/src/resources/assets/miscutils/textures/items/material/DustPyrotheum.png +++ b/src/main/resources/assets/miscutils/textures/items/material/DustPyrotheum.png diff --git a/src/resources/assets/miscutils/textures/items/material/DustPyrotheum.png.mcmeta b/src/main/resources/assets/miscutils/textures/items/material/DustPyrotheum.png.mcmeta index c5d457f93d..c5d457f93d 100644 --- a/src/resources/assets/miscutils/textures/items/material/DustPyrotheum.png.mcmeta +++ b/src/main/resources/assets/miscutils/textures/items/material/DustPyrotheum.png.mcmeta diff --git a/src/resources/assets/miscutils/textures/items/material/RodBlizz.png b/src/main/resources/assets/miscutils/textures/items/material/RodBlizz.png Binary files differindex d813e6b746..d813e6b746 100644 --- a/src/resources/assets/miscutils/textures/items/material/RodBlizz.png +++ b/src/main/resources/assets/miscutils/textures/items/material/RodBlizz.png diff --git a/src/resources/assets/miscutils/textures/items/particle/0.PNG b/src/main/resources/assets/miscutils/textures/items/particle/0.PNG Binary files differindex a0a32d4508..a0a32d4508 100644 --- a/src/resources/assets/miscutils/textures/items/particle/0.PNG +++ b/src/main/resources/assets/miscutils/textures/items/particle/0.PNG diff --git a/src/resources/assets/miscutils/textures/items/particle/1.png b/src/main/resources/assets/miscutils/textures/items/particle/1.png Binary files differindex 4eddfa1727..4eddfa1727 100644 --- a/src/resources/assets/miscutils/textures/items/particle/1.png +++ b/src/main/resources/assets/miscutils/textures/items/particle/1.png diff --git a/src/resources/assets/miscutils/textures/items/particle/10.PNG b/src/main/resources/assets/miscutils/textures/items/particle/10.PNG Binary files differindex 09eee049a9..09eee049a9 100644 --- a/src/resources/assets/miscutils/textures/items/particle/10.PNG +++ b/src/main/resources/assets/miscutils/textures/items/particle/10.PNG diff --git a/src/resources/assets/miscutils/textures/items/particle/11.PNG b/src/main/resources/assets/miscutils/textures/items/particle/11.PNG Binary files differindex 7f636919b6..7f636919b6 100644 --- a/src/resources/assets/miscutils/textures/items/particle/11.PNG +++ b/src/main/resources/assets/miscutils/textures/items/particle/11.PNG diff --git a/src/resources/assets/miscutils/textures/items/particle/12.PNG b/src/main/resources/assets/miscutils/textures/items/particle/12.PNG Binary files differindex 4e9504b03f..4e9504b03f 100644 --- a/src/resources/assets/miscutils/textures/items/particle/12.PNG +++ b/src/main/resources/assets/miscutils/textures/items/particle/12.PNG diff --git a/src/resources/assets/miscutils/textures/items/particle/13.PNG b/src/main/resources/assets/miscutils/textures/items/particle/13.PNG Binary files differindex d929480c16..d929480c16 100644 --- a/src/resources/assets/miscutils/textures/items/particle/13.PNG +++ b/src/main/resources/assets/miscutils/textures/items/particle/13.PNG diff --git a/src/resources/assets/miscutils/textures/items/particle/14.PNG b/src/main/resources/assets/miscutils/textures/items/particle/14.PNG Binary files differindex 7338066c1a..7338066c1a 100644 --- a/src/resources/assets/miscutils/textures/items/particle/14.PNG +++ b/src/main/resources/assets/miscutils/textures/items/particle/14.PNG diff --git a/src/resources/assets/miscutils/textures/items/particle/15.PNG b/src/main/resources/assets/miscutils/textures/items/particle/15.PNG Binary files differindex 189a3127d9..189a3127d9 100644 --- a/src/resources/assets/miscutils/textures/items/particle/15.PNG +++ b/src/main/resources/assets/miscutils/textures/items/particle/15.PNG diff --git a/src/resources/assets/miscutils/textures/items/particle/16.PNG b/src/main/resources/assets/miscutils/textures/items/particle/16.PNG Binary files differindex 8824201ff3..8824201ff3 100644 --- a/src/resources/assets/miscutils/textures/items/particle/16.PNG +++ b/src/main/resources/assets/miscutils/textures/items/particle/16.PNG diff --git a/src/resources/assets/miscutils/textures/items/particle/17.PNG b/src/main/resources/assets/miscutils/textures/items/particle/17.PNG Binary files differindex edea5115c0..edea5115c0 100644 --- a/src/resources/assets/miscutils/textures/items/particle/17.PNG +++ b/src/main/resources/assets/miscutils/textures/items/particle/17.PNG diff --git a/src/resources/assets/miscutils/textures/items/particle/18.PNG b/src/main/resources/assets/miscutils/textures/items/particle/18.PNG Binary files differindex d3e63562d7..d3e63562d7 100644 --- a/src/resources/assets/miscutils/textures/items/particle/18.PNG +++ b/src/main/resources/assets/miscutils/textures/items/particle/18.PNG diff --git a/src/resources/assets/miscutils/textures/items/particle/19.PNG b/src/main/resources/assets/miscutils/textures/items/particle/19.PNG Binary files differindex 43f9278b2c..43f9278b2c 100644 --- a/src/resources/assets/miscutils/textures/items/particle/19.PNG +++ b/src/main/resources/assets/miscutils/textures/items/particle/19.PNG diff --git a/src/resources/assets/miscutils/textures/items/particle/2.png b/src/main/resources/assets/miscutils/textures/items/particle/2.png Binary files differindex 292207ae7e..292207ae7e 100644 --- a/src/resources/assets/miscutils/textures/items/particle/2.png +++ b/src/main/resources/assets/miscutils/textures/items/particle/2.png diff --git a/src/resources/assets/miscutils/textures/items/particle/20.PNG b/src/main/resources/assets/miscutils/textures/items/particle/20.PNG Binary files differindex 0e2ce23565..0e2ce23565 100644 --- a/src/resources/assets/miscutils/textures/items/particle/20.PNG +++ b/src/main/resources/assets/miscutils/textures/items/particle/20.PNG diff --git a/src/resources/assets/miscutils/textures/items/particle/21.PNG b/src/main/resources/assets/miscutils/textures/items/particle/21.PNG Binary files differindex 758fa46941..758fa46941 100644 --- a/src/resources/assets/miscutils/textures/items/particle/21.PNG +++ b/src/main/resources/assets/miscutils/textures/items/particle/21.PNG diff --git a/src/resources/assets/miscutils/textures/items/particle/22.PNG b/src/main/resources/assets/miscutils/textures/items/particle/22.PNG Binary files differindex 08bda97b66..08bda97b66 100644 --- a/src/resources/assets/miscutils/textures/items/particle/22.PNG +++ b/src/main/resources/assets/miscutils/textures/items/particle/22.PNG diff --git a/src/resources/assets/miscutils/textures/items/particle/23.PNG b/src/main/resources/assets/miscutils/textures/items/particle/23.PNG Binary files differindex 9ba21b22eb..9ba21b22eb 100644 --- a/src/resources/assets/miscutils/textures/items/particle/23.PNG +++ b/src/main/resources/assets/miscutils/textures/items/particle/23.PNG diff --git a/src/resources/assets/miscutils/textures/items/particle/24.PNG b/src/main/resources/assets/miscutils/textures/items/particle/24.PNG Binary files differindex bc6aec8854..bc6aec8854 100644 --- a/src/resources/assets/miscutils/textures/items/particle/24.PNG +++ b/src/main/resources/assets/miscutils/textures/items/particle/24.PNG diff --git a/src/resources/assets/miscutils/textures/items/particle/3.png b/src/main/resources/assets/miscutils/textures/items/particle/3.png Binary files differindex d085b86507..d085b86507 100644 --- a/src/resources/assets/miscutils/textures/items/particle/3.png +++ b/src/main/resources/assets/miscutils/textures/items/particle/3.png diff --git a/src/resources/assets/miscutils/textures/items/particle/4.png b/src/main/resources/assets/miscutils/textures/items/particle/4.png Binary files differindex faf8db0576..faf8db0576 100644 --- a/src/resources/assets/miscutils/textures/items/particle/4.png +++ b/src/main/resources/assets/miscutils/textures/items/particle/4.png diff --git a/src/resources/assets/miscutils/textures/items/particle/5.png b/src/main/resources/assets/miscutils/textures/items/particle/5.png Binary files differindex 3a30274238..3a30274238 100644 --- a/src/resources/assets/miscutils/textures/items/particle/5.png +++ b/src/main/resources/assets/miscutils/textures/items/particle/5.png diff --git a/src/resources/assets/miscutils/textures/items/particle/6.png b/src/main/resources/assets/miscutils/textures/items/particle/6.png Binary files differindex 8930ce52ef..8930ce52ef 100644 --- a/src/resources/assets/miscutils/textures/items/particle/6.png +++ b/src/main/resources/assets/miscutils/textures/items/particle/6.png diff --git a/src/resources/assets/miscutils/textures/items/particle/7.PNG b/src/main/resources/assets/miscutils/textures/items/particle/7.PNG Binary files differindex 0581d47446..0581d47446 100644 --- a/src/resources/assets/miscutils/textures/items/particle/7.PNG +++ b/src/main/resources/assets/miscutils/textures/items/particle/7.PNG diff --git a/src/resources/assets/miscutils/textures/items/particle/8.PNG b/src/main/resources/assets/miscutils/textures/items/particle/8.PNG Binary files differindex 6bd3c2c682..6bd3c2c682 100644 --- a/src/resources/assets/miscutils/textures/items/particle/8.PNG +++ b/src/main/resources/assets/miscutils/textures/items/particle/8.PNG diff --git a/src/resources/assets/miscutils/textures/items/particle/9.PNG b/src/main/resources/assets/miscutils/textures/items/particle/9.PNG Binary files differindex 430f1aed3d..430f1aed3d 100644 --- a/src/resources/assets/miscutils/textures/items/particle/9.PNG +++ b/src/main/resources/assets/miscutils/textures/items/particle/9.PNG diff --git a/src/resources/assets/miscutils/textures/items/particle/new/0.png b/src/main/resources/assets/miscutils/textures/items/particle/new/0.png Binary files differindex 3fe49c3a57..3fe49c3a57 100644 --- a/src/resources/assets/miscutils/textures/items/particle/new/0.png +++ b/src/main/resources/assets/miscutils/textures/items/particle/new/0.png diff --git a/src/resources/assets/miscutils/textures/items/particle/new/1.png b/src/main/resources/assets/miscutils/textures/items/particle/new/1.png Binary files differindex 39ffa85711..39ffa85711 100644 --- a/src/resources/assets/miscutils/textures/items/particle/new/1.png +++ b/src/main/resources/assets/miscutils/textures/items/particle/new/1.png diff --git a/src/resources/assets/miscutils/textures/items/particle/new/10.png b/src/main/resources/assets/miscutils/textures/items/particle/new/10.png Binary files differindex 18ded814cf..18ded814cf 100644 --- a/src/resources/assets/miscutils/textures/items/particle/new/10.png +++ b/src/main/resources/assets/miscutils/textures/items/particle/new/10.png diff --git a/src/resources/assets/miscutils/textures/items/particle/new/11.png b/src/main/resources/assets/miscutils/textures/items/particle/new/11.png Binary files differindex b7e191c79f..b7e191c79f 100644 --- a/src/resources/assets/miscutils/textures/items/particle/new/11.png +++ b/src/main/resources/assets/miscutils/textures/items/particle/new/11.png diff --git a/src/resources/assets/miscutils/textures/items/particle/new/12.png b/src/main/resources/assets/miscutils/textures/items/particle/new/12.png Binary files differindex 49feb199e0..49feb199e0 100644 --- a/src/resources/assets/miscutils/textures/items/particle/new/12.png +++ b/src/main/resources/assets/miscutils/textures/items/particle/new/12.png diff --git a/src/resources/assets/miscutils/textures/items/particle/new/13.png b/src/main/resources/assets/miscutils/textures/items/particle/new/13.png Binary files differindex b70178d315..b70178d315 100644 --- a/src/resources/assets/miscutils/textures/items/particle/new/13.png +++ b/src/main/resources/assets/miscutils/textures/items/particle/new/13.png diff --git a/src/resources/assets/miscutils/textures/items/particle/new/14.png b/src/main/resources/assets/miscutils/textures/items/particle/new/14.png Binary files differindex 77741644ed..77741644ed 100644 --- a/src/resources/assets/miscutils/textures/items/particle/new/14.png +++ b/src/main/resources/assets/miscutils/textures/items/particle/new/14.png diff --git a/src/resources/assets/miscutils/textures/items/particle/new/15.png b/src/main/resources/assets/miscutils/textures/items/particle/new/15.png Binary files differindex d48096c85c..d48096c85c 100644 --- a/src/resources/assets/miscutils/textures/items/particle/new/15.png +++ b/src/main/resources/assets/miscutils/textures/items/particle/new/15.png diff --git a/src/resources/assets/miscutils/textures/items/particle/new/16.png b/src/main/resources/assets/miscutils/textures/items/particle/new/16.png Binary files differindex cef33d17fd..cef33d17fd 100644 --- a/src/resources/assets/miscutils/textures/items/particle/new/16.png +++ b/src/main/resources/assets/miscutils/textures/items/particle/new/16.png diff --git a/src/resources/assets/miscutils/textures/items/particle/new/17.png b/src/main/resources/assets/miscutils/textures/items/particle/new/17.png Binary files differindex 4b752e7a9a..4b752e7a9a 100644 --- a/src/resources/assets/miscutils/textures/items/particle/new/17.png +++ b/src/main/resources/assets/miscutils/textures/items/particle/new/17.png diff --git a/src/resources/assets/miscutils/textures/items/particle/new/18.png b/src/main/resources/assets/miscutils/textures/items/particle/new/18.png Binary files differindex 23fdb190c7..23fdb190c7 100644 --- a/src/resources/assets/miscutils/textures/items/particle/new/18.png +++ b/src/main/resources/assets/miscutils/textures/items/particle/new/18.png diff --git a/src/resources/assets/miscutils/textures/items/particle/new/19.png b/src/main/resources/assets/miscutils/textures/items/particle/new/19.png Binary files differindex 94e2a856c9..94e2a856c9 100644 --- a/src/resources/assets/miscutils/textures/items/particle/new/19.png +++ b/src/main/resources/assets/miscutils/textures/items/particle/new/19.png diff --git a/src/resources/assets/miscutils/textures/items/particle/new/2.png b/src/main/resources/assets/miscutils/textures/items/particle/new/2.png Binary files differindex d86b5b357d..d86b5b357d 100644 --- a/src/resources/assets/miscutils/textures/items/particle/new/2.png +++ b/src/main/resources/assets/miscutils/textures/items/particle/new/2.png diff --git a/src/resources/assets/miscutils/textures/items/particle/new/20.png b/src/main/resources/assets/miscutils/textures/items/particle/new/20.png Binary files differindex d7cbdb8f45..d7cbdb8f45 100644 --- a/src/resources/assets/miscutils/textures/items/particle/new/20.png +++ b/src/main/resources/assets/miscutils/textures/items/particle/new/20.png diff --git a/src/resources/assets/miscutils/textures/items/particle/new/21.png b/src/main/resources/assets/miscutils/textures/items/particle/new/21.png Binary files differindex 2531eaff52..2531eaff52 100644 --- a/src/resources/assets/miscutils/textures/items/particle/new/21.png +++ b/src/main/resources/assets/miscutils/textures/items/particle/new/21.png diff --git a/src/resources/assets/miscutils/textures/items/particle/new/22.png b/src/main/resources/assets/miscutils/textures/items/particle/new/22.png Binary files differindex d594dc4be8..d594dc4be8 100644 --- a/src/resources/assets/miscutils/textures/items/particle/new/22.png +++ b/src/main/resources/assets/miscutils/textures/items/particle/new/22.png diff --git a/src/resources/assets/miscutils/textures/items/particle/new/23.png b/src/main/resources/assets/miscutils/textures/items/particle/new/23.png Binary files differindex d96dd2b000..d96dd2b000 100644 --- a/src/resources/assets/miscutils/textures/items/particle/new/23.png +++ b/src/main/resources/assets/miscutils/textures/items/particle/new/23.png diff --git a/src/resources/assets/miscutils/textures/items/particle/new/24.png b/src/main/resources/assets/miscutils/textures/items/particle/new/24.png Binary files differindex 56067466ad..56067466ad 100644 --- a/src/resources/assets/miscutils/textures/items/particle/new/24.png +++ b/src/main/resources/assets/miscutils/textures/items/particle/new/24.png diff --git a/src/resources/assets/miscutils/textures/items/particle/new/3.png b/src/main/resources/assets/miscutils/textures/items/particle/new/3.png Binary files differindex 43438c4ce5..43438c4ce5 100644 --- a/src/resources/assets/miscutils/textures/items/particle/new/3.png +++ b/src/main/resources/assets/miscutils/textures/items/particle/new/3.png diff --git a/src/resources/assets/miscutils/textures/items/particle/new/4.png b/src/main/resources/assets/miscutils/textures/items/particle/new/4.png Binary files differindex 8f0db073cd..8f0db073cd 100644 --- a/src/resources/assets/miscutils/textures/items/particle/new/4.png +++ b/src/main/resources/assets/miscutils/textures/items/particle/new/4.png diff --git a/src/resources/assets/miscutils/textures/items/particle/new/5.png b/src/main/resources/assets/miscutils/textures/items/particle/new/5.png Binary files differindex 40ec84db70..40ec84db70 100644 --- a/src/resources/assets/miscutils/textures/items/particle/new/5.png +++ b/src/main/resources/assets/miscutils/textures/items/particle/new/5.png diff --git a/src/resources/assets/miscutils/textures/items/particle/new/6.png b/src/main/resources/assets/miscutils/textures/items/particle/new/6.png Binary files differindex c63ad0ba19..c63ad0ba19 100644 --- a/src/resources/assets/miscutils/textures/items/particle/new/6.png +++ b/src/main/resources/assets/miscutils/textures/items/particle/new/6.png diff --git a/src/resources/assets/miscutils/textures/items/particle/new/7.png b/src/main/resources/assets/miscutils/textures/items/particle/new/7.png Binary files differindex aad8c7ca62..aad8c7ca62 100644 --- a/src/resources/assets/miscutils/textures/items/particle/new/7.png +++ b/src/main/resources/assets/miscutils/textures/items/particle/new/7.png diff --git a/src/resources/assets/miscutils/textures/items/particle/new/8.png b/src/main/resources/assets/miscutils/textures/items/particle/new/8.png Binary files differindex c9b908ec61..c9b908ec61 100644 --- a/src/resources/assets/miscutils/textures/items/particle/new/8.png +++ b/src/main/resources/assets/miscutils/textures/items/particle/new/8.png diff --git a/src/resources/assets/miscutils/textures/items/particle/new/9.png b/src/main/resources/assets/miscutils/textures/items/particle/new/9.png Binary files differindex b8e02c82ea..b8e02c82ea 100644 --- a/src/resources/assets/miscutils/textures/items/particle/new/9.png +++ b/src/main/resources/assets/miscutils/textures/items/particle/new/9.png diff --git a/src/resources/assets/miscutils/textures/items/personalCloakingDevice.png b/src/main/resources/assets/miscutils/textures/items/personalCloakingDevice.png Binary files differindex 2d196cb9ed..2d196cb9ed 100644 --- a/src/resources/assets/miscutils/textures/items/personalCloakingDevice.png +++ b/src/main/resources/assets/miscutils/textures/items/personalCloakingDevice.png diff --git a/src/resources/assets/miscutils/textures/items/processing/MilledOre/milled.png b/src/main/resources/assets/miscutils/textures/items/processing/MilledOre/milled.png Binary files differindex 2c56204a7e..2c56204a7e 100644 --- a/src/resources/assets/miscutils/textures/items/processing/MilledOre/milled.png +++ b/src/main/resources/assets/miscutils/textures/items/processing/MilledOre/milled.png diff --git a/src/resources/assets/miscutils/textures/items/processing/MilledOre/milled_OVERLAY.png b/src/main/resources/assets/miscutils/textures/items/processing/MilledOre/milled_OVERLAY.png Binary files differindex cfec0f5d8e..cfec0f5d8e 100644 --- a/src/resources/assets/miscutils/textures/items/processing/MilledOre/milled_OVERLAY.png +++ b/src/main/resources/assets/miscutils/textures/items/processing/MilledOre/milled_OVERLAY.png diff --git a/src/resources/assets/miscutils/textures/items/research/note.png b/src/main/resources/assets/miscutils/textures/items/research/note.png Binary files differindex 795eaeb193..795eaeb193 100644 --- a/src/resources/assets/miscutils/textures/items/research/note.png +++ b/src/main/resources/assets/miscutils/textures/items/research/note.png diff --git a/src/resources/assets/miscutils/textures/items/science/Atom.png b/src/main/resources/assets/miscutils/textures/items/science/Atom.png Binary files differindex eec0344eda..eec0344eda 100644 --- a/src/resources/assets/miscutils/textures/items/science/Atom.png +++ b/src/main/resources/assets/miscutils/textures/items/science/Atom.png diff --git a/src/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit.png b/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit.png Binary files differindex 8bcfa62ae4..8bcfa62ae4 100644 --- a/src/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit.png +++ b/src/main/resources/assets/miscutils/textures/items/science/general/AdvancedCircuit.png diff --git a/src/resources/assets/miscutils/textures/items/science/general/MetaItem1/0.png b/src/main/resources/assets/miscutils/textures/items/science/general/MetaItem1/0.png Binary files differindex f4ba0a2f0a..f4ba0a2f0a 100644 --- a/src/resources/assets/miscutils/textures/items/science/general/MetaItem1/0.png +++ b/src/main/resources/assets/miscutils/textures/items/science/general/MetaItem1/0.png diff --git a/src/resources/assets/miscutils/textures/items/science/general/MetaItem1/1.png b/src/main/resources/assets/miscutils/textures/items/science/general/MetaItem1/1.png Binary files differindex db59db96e3..db59db96e3 100644 --- a/src/resources/assets/miscutils/textures/items/science/general/MetaItem1/1.png +++ b/src/main/resources/assets/miscutils/textures/items/science/general/MetaItem1/1.png diff --git a/src/resources/assets/miscutils/textures/items/science/general/MetaItem1/10.png b/src/main/resources/assets/miscutils/textures/items/science/general/MetaItem1/10.png Binary files differindex b50c781c6d..b50c781c6d 100644 --- a/src/resources/assets/miscutils/textures/items/science/general/MetaItem1/10.png +++ b/src/main/resources/assets/miscutils/textures/items/science/general/MetaItem1/10.png diff --git a/src/resources/assets/miscutils/textures/items/science/general/MetaItem1/11.png b/src/main/resources/assets/miscutils/textures/items/science/general/MetaItem1/11.png Binary files differindex 0656c10957..0656c10957 100644 --- a/src/resources/assets/miscutils/textures/items/science/general/MetaItem1/11.png +++ b/src/main/resources/assets/miscutils/textures/items/science/general/MetaItem1/11.png diff --git a/src/resources/assets/miscutils/textures/items/science/general/MetaItem1/12.png b/src/main/resources/assets/miscutils/textures/items/science/general/MetaItem1/12.png Binary files differindex 3a32ed06fc..3a32ed06fc 100644 --- a/src/resources/assets/miscutils/textures/items/science/general/MetaItem1/12.png +++ b/src/main/resources/assets/miscutils/textures/items/science/general/MetaItem1/12.png diff --git a/src/main/resources/assets/miscutils/textures/items/science/general/MetaItem1/13.png b/src/main/resources/assets/miscutils/textures/items/science/general/MetaItem1/13.png Binary files differnew file mode 100644 index 0000000000..475f8dadfb --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/items/science/general/MetaItem1/13.png diff --git a/src/resources/assets/miscutils/textures/items/science/general/MetaItem1/2.png b/src/main/resources/assets/miscutils/textures/items/science/general/MetaItem1/2.png Binary files differindex 4649393bb2..4649393bb2 100644 --- a/src/resources/assets/miscutils/textures/items/science/general/MetaItem1/2.png +++ b/src/main/resources/assets/miscutils/textures/items/science/general/MetaItem1/2.png diff --git a/src/resources/assets/miscutils/textures/items/science/general/MetaItem1/3.png b/src/main/resources/assets/miscutils/textures/items/science/general/MetaItem1/3.png Binary files differindex 5b47d172be..5b47d172be 100644 --- a/src/resources/assets/miscutils/textures/items/science/general/MetaItem1/3.png +++ b/src/main/resources/assets/miscutils/textures/items/science/general/MetaItem1/3.png diff --git a/src/resources/assets/miscutils/textures/items/science/general/MetaItem1/4.png b/src/main/resources/assets/miscutils/textures/items/science/general/MetaItem1/4.png Binary files differindex 995b19953c..995b19953c 100644 --- a/src/resources/assets/miscutils/textures/items/science/general/MetaItem1/4.png +++ b/src/main/resources/assets/miscutils/textures/items/science/general/MetaItem1/4.png diff --git a/src/resources/assets/miscutils/textures/items/science/general/MetaItem1/5.png b/src/main/resources/assets/miscutils/textures/items/science/general/MetaItem1/5.png Binary files differindex 3ec2502da2..3ec2502da2 100644 --- a/src/resources/assets/miscutils/textures/items/science/general/MetaItem1/5.png +++ b/src/main/resources/assets/miscutils/textures/items/science/general/MetaItem1/5.png diff --git a/src/resources/assets/miscutils/textures/items/science/general/MetaItem1/6.png b/src/main/resources/assets/miscutils/textures/items/science/general/MetaItem1/6.png Binary files differindex aa65838418..aa65838418 100644 --- a/src/resources/assets/miscutils/textures/items/science/general/MetaItem1/6.png +++ b/src/main/resources/assets/miscutils/textures/items/science/general/MetaItem1/6.png diff --git a/src/resources/assets/miscutils/textures/items/science/general/MetaItem1/7.png b/src/main/resources/assets/miscutils/textures/items/science/general/MetaItem1/7.png Binary files differindex 985954250c..985954250c 100644 --- a/src/resources/assets/miscutils/textures/items/science/general/MetaItem1/7.png +++ b/src/main/resources/assets/miscutils/textures/items/science/general/MetaItem1/7.png diff --git a/src/resources/assets/miscutils/textures/items/science/general/MetaItem1/8.png b/src/main/resources/assets/miscutils/textures/items/science/general/MetaItem1/8.png Binary files differindex 9b857a9277..9b857a9277 100644 --- a/src/resources/assets/miscutils/textures/items/science/general/MetaItem1/8.png +++ b/src/main/resources/assets/miscutils/textures/items/science/general/MetaItem1/8.png diff --git a/src/resources/assets/miscutils/textures/items/science/general/MetaItem1/9.png b/src/main/resources/assets/miscutils/textures/items/science/general/MetaItem1/9.png Binary files differindex 0c165f3e59..0c165f3e59 100644 --- a/src/resources/assets/miscutils/textures/items/science/general/MetaItem1/9.png +++ b/src/main/resources/assets/miscutils/textures/items/science/general/MetaItem1/9.png diff --git a/src/main/resources/assets/miscutils/textures/items/science/nuclear/MetaItem1/0.png b/src/main/resources/assets/miscutils/textures/items/science/nuclear/MetaItem1/0.png Binary files differnew file mode 100644 index 0000000000..7adcc6adcf --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/items/science/nuclear/MetaItem1/0.png diff --git a/src/main/resources/assets/miscutils/textures/items/science/nuclear/MetaItem1/1.png b/src/main/resources/assets/miscutils/textures/items/science/nuclear/MetaItem1/1.png Binary files differnew file mode 100644 index 0000000000..2064052fa5 --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/items/science/nuclear/MetaItem1/1.png diff --git a/src/main/resources/assets/miscutils/textures/items/science/nuclear/MetaItem1/2.png b/src/main/resources/assets/miscutils/textures/items/science/nuclear/MetaItem1/2.png Binary files differnew file mode 100644 index 0000000000..a974943866 --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/items/science/nuclear/MetaItem1/2.png diff --git a/src/main/resources/assets/miscutils/textures/items/science/nuclear/MetaItem1/3.png b/src/main/resources/assets/miscutils/textures/items/science/nuclear/MetaItem1/3.png Binary files differnew file mode 100644 index 0000000000..97a796c871 --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/items/science/nuclear/MetaItem1/3.png diff --git a/src/main/resources/assets/miscutils/textures/items/science/nuclear/MetaItem1/4.png b/src/main/resources/assets/miscutils/textures/items/science/nuclear/MetaItem1/4.png Binary files differnew file mode 100644 index 0000000000..b50c781c6d --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/items/science/nuclear/MetaItem1/4.png diff --git a/src/main/resources/assets/miscutils/textures/items/science/nuclear/MetaItem1/5.png b/src/main/resources/assets/miscutils/textures/items/science/nuclear/MetaItem1/5.png Binary files differnew file mode 100644 index 0000000000..b50c781c6d --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/items/science/nuclear/MetaItem1/5.png diff --git a/src/main/resources/assets/miscutils/textures/items/science/nuclear/MetaItem1/6.png b/src/main/resources/assets/miscutils/textures/items/science/nuclear/MetaItem1/6.png Binary files differnew file mode 100644 index 0000000000..b50c781c6d --- /dev/null +++ b/src/main/resources/assets/miscutils/textures/items/science/nuclear/MetaItem1/6.png diff --git a/src/resources/assets/miscutils/textures/items/spawn_egg.png b/src/main/resources/assets/miscutils/textures/items/spawn_egg.png Binary files differindex 23259c71f5..23259c71f5 100644 --- a/src/resources/assets/miscutils/textures/items/spawn_egg.png +++ b/src/main/resources/assets/miscutils/textures/items/spawn_egg.png diff --git a/src/resources/assets/miscutils/textures/items/spawn_egg_overlay.png b/src/main/resources/assets/miscutils/textures/items/spawn_egg_overlay.png Binary files differindex 83ec78f172..83ec78f172 100644 --- a/src/resources/assets/miscutils/textures/items/spawn_egg_overlay.png +++ b/src/main/resources/assets/miscutils/textures/items/spawn_egg_overlay.png diff --git a/src/resources/assets/miscutils/textures/items/token/0.png b/src/main/resources/assets/miscutils/textures/items/token/0.png Binary files differindex 7947f30bb6..7947f30bb6 100644 --- a/src/resources/assets/miscutils/textures/items/token/0.png +++ b/src/main/resources/assets/miscutils/textures/items/token/0.png diff --git a/src/resources/assets/miscutils/textures/items/token/1.png b/src/main/resources/assets/miscutils/textures/items/token/1.png Binary files differindex 850acc3e71..850acc3e71 100644 --- a/src/resources/assets/miscutils/textures/items/token/1.png +++ b/src/main/resources/assets/miscutils/textures/items/token/1.png diff --git a/src/resources/assets/miscutils/textures/items/token/2.png b/src/main/resources/assets/miscutils/textures/items/token/2.png Binary files differindex fa619dd1ed..fa619dd1ed 100644 --- a/src/resources/assets/miscutils/textures/items/token/2.png +++ b/src/main/resources/assets/miscutils/textures/items/token/2.png diff --git a/src/resources/assets/miscutils/textures/items/token/3.png b/src/main/resources/assets/miscutils/textures/items/token/3.png Binary files differindex 3ba45ed7af..3ba45ed7af 100644 --- a/src/resources/assets/miscutils/textures/items/token/3.png +++ b/src/main/resources/assets/miscutils/textures/items/token/3.png diff --git a/src/resources/assets/miscutils/textures/items/token/4.png b/src/main/resources/assets/miscutils/textures/items/token/4.png Binary files differindex 81af6a91c8..81af6a91c8 100644 --- a/src/resources/assets/miscutils/textures/items/token/4.png +++ b/src/main/resources/assets/miscutils/textures/items/token/4.png diff --git a/src/resources/assets/miscutils/textures/models/TinFoil.png b/src/main/resources/assets/miscutils/textures/models/TinFoil.png Binary files differindex 6c8e967db5..6c8e967db5 100644 --- a/src/resources/assets/miscutils/textures/models/TinFoil.png +++ b/src/main/resources/assets/miscutils/textures/models/TinFoil.png diff --git a/src/resources/assets/miscutils/textures/space/RocketGui.png b/src/main/resources/assets/miscutils/textures/space/RocketGui.png Binary files differindex 2aa4a893ed..2aa4a893ed 100644 --- a/src/resources/assets/miscutils/textures/space/RocketGui.png +++ b/src/main/resources/assets/miscutils/textures/space/RocketGui.png diff --git a/src/resources/assets/miscutils/textures/space/hd10180/A.png b/src/main/resources/assets/miscutils/textures/space/hd10180/A.png Binary files differindex b3499184b5..b3499184b5 100644 --- a/src/resources/assets/miscutils/textures/space/hd10180/A.png +++ b/src/main/resources/assets/miscutils/textures/space/hd10180/A.png diff --git a/src/resources/assets/miscutils/textures/space/hd10180/B.png b/src/main/resources/assets/miscutils/textures/space/hd10180/B.png Binary files differindex 659aacbba7..659aacbba7 100644 --- a/src/resources/assets/miscutils/textures/space/hd10180/B.png +++ b/src/main/resources/assets/miscutils/textures/space/hd10180/B.png diff --git a/src/resources/assets/miscutils/textures/space/hd10180/C.png b/src/main/resources/assets/miscutils/textures/space/hd10180/C.png Binary files differindex 659aacbba7..659aacbba7 100644 --- a/src/resources/assets/miscutils/textures/space/hd10180/C.png +++ b/src/main/resources/assets/miscutils/textures/space/hd10180/C.png diff --git a/src/resources/assets/miscutils/textures/space/hd10180/D.png b/src/main/resources/assets/miscutils/textures/space/hd10180/D.png Binary files differindex 61e5d6b520..61e5d6b520 100644 --- a/src/resources/assets/miscutils/textures/space/hd10180/D.png +++ b/src/main/resources/assets/miscutils/textures/space/hd10180/D.png diff --git a/src/resources/assets/spiceoflife/lang/de_DE.lang b/src/main/resources/assets/spiceoflife/lang/de_DE.lang index 63ad1e2a98..63ad1e2a98 100644 --- a/src/resources/assets/spiceoflife/lang/de_DE.lang +++ b/src/main/resources/assets/spiceoflife/lang/de_DE.lang diff --git a/src/resources/assets/spiceoflife/lang/en_US.lang b/src/main/resources/assets/spiceoflife/lang/en_US.lang index bf16f4dc93..bf16f4dc93 100644 --- a/src/resources/assets/spiceoflife/lang/en_US.lang +++ b/src/main/resources/assets/spiceoflife/lang/en_US.lang diff --git a/src/resources/assets/spiceoflife/lang/es_ES.lang b/src/main/resources/assets/spiceoflife/lang/es_ES.lang index 02fe4c8806..02fe4c8806 100644 --- a/src/resources/assets/spiceoflife/lang/es_ES.lang +++ b/src/main/resources/assets/spiceoflife/lang/es_ES.lang diff --git a/src/resources/assets/spiceoflife/lang/fr_FR.lang b/src/main/resources/assets/spiceoflife/lang/fr_FR.lang index 418c2b7053..418c2b7053 100644 --- a/src/resources/assets/spiceoflife/lang/fr_FR.lang +++ b/src/main/resources/assets/spiceoflife/lang/fr_FR.lang diff --git a/src/resources/assets/spiceoflife/lang/it_IT.lang b/src/main/resources/assets/spiceoflife/lang/it_IT.lang index 841b97c63f..841b97c63f 100644 --- a/src/resources/assets/spiceoflife/lang/it_IT.lang +++ b/src/main/resources/assets/spiceoflife/lang/it_IT.lang diff --git a/src/resources/assets/spiceoflife/lang/ko_KR.lang b/src/main/resources/assets/spiceoflife/lang/ko_KR.lang index 7e9973e936..7e9973e936 100644 --- a/src/resources/assets/spiceoflife/lang/ko_KR.lang +++ b/src/main/resources/assets/spiceoflife/lang/ko_KR.lang diff --git a/src/resources/assets/spiceoflife/lang/ru_RU.lang b/src/main/resources/assets/spiceoflife/lang/ru_RU.lang index e167a0ae03..e167a0ae03 100644 --- a/src/resources/assets/spiceoflife/lang/ru_RU.lang +++ b/src/main/resources/assets/spiceoflife/lang/ru_RU.lang diff --git a/src/resources/assets/spiceoflife/lang/zh_CN.lang b/src/main/resources/assets/spiceoflife/lang/zh_CN.lang index bb211e7b57..bb211e7b57 100644 --- a/src/resources/assets/spiceoflife/lang/zh_CN.lang +++ b/src/main/resources/assets/spiceoflife/lang/zh_CN.lang diff --git a/src/resources/assets/spiceoflife/textures/items/foodcrate.png b/src/main/resources/assets/spiceoflife/textures/items/foodcrate.png Binary files differindex b717dd0318..b717dd0318 100644 --- a/src/resources/assets/spiceoflife/textures/items/foodcrate.png +++ b/src/main/resources/assets/spiceoflife/textures/items/foodcrate.png diff --git a/src/resources/assets/spiceoflife/textures/items/foodcrate_open_empty.png b/src/main/resources/assets/spiceoflife/textures/items/foodcrate_open_empty.png Binary files differindex 4dbfd54ea7..4dbfd54ea7 100644 --- a/src/resources/assets/spiceoflife/textures/items/foodcrate_open_empty.png +++ b/src/main/resources/assets/spiceoflife/textures/items/foodcrate_open_empty.png diff --git a/src/resources/assets/spiceoflife/textures/items/foodcrate_open_full.png b/src/main/resources/assets/spiceoflife/textures/items/foodcrate_open_full.png Binary files differindex 0284bd29ad..0284bd29ad 100644 --- a/src/resources/assets/spiceoflife/textures/items/foodcrate_open_full.png +++ b/src/main/resources/assets/spiceoflife/textures/items/foodcrate_open_full.png diff --git a/src/resources/assets/stevescarts/lang/en_US.lang b/src/main/resources/assets/stevescarts/lang/en_US.lang index 56dc8390a6..56dc8390a6 100644 --- a/src/resources/assets/stevescarts/lang/en_US.lang +++ b/src/main/resources/assets/stevescarts/lang/en_US.lang diff --git a/src/resources/assets/stevescarts/lang/zh_CN.lang b/src/main/resources/assets/stevescarts/lang/zh_CN.lang index 84ce64f528..84ce64f528 100644 --- a/src/resources/assets/stevescarts/lang/zh_CN.lang +++ b/src/main/resources/assets/stevescarts/lang/zh_CN.lang diff --git a/src/resources/assets/stevescarts/textures/items/crop_exotic_seeds_icon.png b/src/main/resources/assets/stevescarts/textures/items/crop_exotic_seeds_icon.png Binary files differindex 63e0593119..63e0593119 100644 --- a/src/resources/assets/stevescarts/textures/items/crop_exotic_seeds_icon.png +++ b/src/main/resources/assets/stevescarts/textures/items/crop_exotic_seeds_icon.png diff --git a/src/resources/mcmod.info b/src/main/resources/mcmod.info index 626949452a..f9465a0258 100644 --- a/src/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -1,12 +1,12 @@ [ { - "modid": "miscutils", - "name": "GT++", + "modid": "${modId}", + "name": "${modName}", "description": "Adds over 100 new Multiblocks, Machines, etc to Gregtech.", "credits": "", "logoFile": "", - "version": "1.7.03.01", - "mcversion": "1.7.10", + "version": "${modVersion}", + "mcversion": "${minecraftVersion}", "url": "https://github.com/draknyte1/GTplusplus/wiki", "updateUrl": "https://github.com/draknyte1/GTplusplus/releases/latest", "authorList": [ "Alkalus/Draknyte1" ], diff --git a/src/resources/GradleStartClient.java b/src/resources/GradleStartClient.java deleted file mode 100644 index 97edde8b04..0000000000 --- a/src/resources/GradleStartClient.java +++ /dev/null @@ -1,103 +0,0 @@ -import java.io.File; -import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.util.Arrays; - -import com.google.common.base.Strings; - -import net.minecraftforge.gradle.GradleStartCommon; - -public class GradleStartClient extends GradleStart { - - public static void main(String[] args) { - - // hack natives. - try { - GradleStartCommon.LOGGER.info("Injecting Natives!"); - hack(); - GradleStartCommon.LOGGER.info("Natives Injected!"); - // launch - Method launch = GradleStartCommon.class.getDeclaredMethod("launch", String[].class); - if (launch != null) { - launch.setAccessible(true); - GradleStart aStart = new GradleStart(); - GradleStartCommon.LOGGER.info("Launching!"); - launch.invoke(aStart, new Object[]{args}); - } - } - catch (NoSuchMethodException | SecurityException | IllegalAccessException | IllegalArgumentException | InvocationTargetException e) { - e.printStackTrace(); - } - } - - private static final void hack() { - GradleStartCommon.LOGGER.info("[FG_1.3] Doing Classloader hack."); - String paths = System.getProperty("java.library.path"); - String nativesDir = "@@NATIVESDIR@@"; - - if (Strings.isNullOrEmpty(paths)) - paths = nativesDir; - else - paths += File.pathSeparator + nativesDir; - - hackNativesFixed(paths); - //addLibraryPath(nativesDir); - //addLibraryPath(paths); - } - - private static final void hackNativesFixed(String paths) { - System.setProperty("java.library.path", paths); - // hack the classloader now. - try - { - String aPathData = System.getProperty("java.library.path"); - final Method initializePathMethod = ClassLoader.class.getDeclaredMethod("initializePath", String.class); - GradleStartCommon.LOGGER.info("[FG_1.3] Setting private method 'initializePath' to be accessible."); - initializePathMethod.setAccessible(true); - GradleStartCommon.LOGGER.info("[FG_1.3] Invoking 'initializePath' with arg 'java.library.path'."); - GradleStartCommon.LOGGER.info("[FG_1.3] Path Value: "+aPathData); - final Object usrPathsValue = initializePathMethod.invoke(null, "java.library.path"); - final Field usrPathsField = ClassLoader.class.getDeclaredField("usr_paths"); - GradleStartCommon.LOGGER.info("[FG_1.3] Setting private field 'usr_paths' to be accessible."); - usrPathsField.setAccessible(true); - GradleStartCommon.LOGGER.info("[FG_1.3] Injecting path data."); - usrPathsField.set(null, usrPathsValue); - GradleStartCommon.LOGGER.info("[FG_1.3] Finished Classloader hack."); - } - catch(Throwable t) { - GradleStartCommon.LOGGER.info("[FG_1.3] Error handling Classloader hack, printing stack trace."); - t.printStackTrace(); - }; - } - - public static void addLibraryPath(String pathToAdd){ - Field usrPathsField; - try { - usrPathsField = ClassLoader.class.getDeclaredField("usr_paths"); - usrPathsField.setAccessible(true); - - //get array of paths - final String[] paths = (String[])usrPathsField.get(null); - - //check if the path to add is already present - for(String path : paths) { - if(path.equals(pathToAdd)) { - GradleStartCommon.LOGGER.info("[FG_1.3] Found existing PATH data, skipping."); - return; - } - } - GradleStartCommon.LOGGER.info("[FG_1.3] Injecting path data. ["+pathToAdd+"]"); - //add the new path - final String[] newPaths = Arrays.copyOf(paths, paths.length + 1); - newPaths[newPaths.length-1] = pathToAdd; - usrPathsField.set(null, newPaths); - } - catch (NoSuchFieldException | SecurityException | IllegalArgumentException | IllegalAccessException e) { - GradleStartCommon.LOGGER.info("[FG_1.3] Error handling Classloader hack, printing stack trace."); - e.printStackTrace(); - } - - } - -} diff --git a/src/resources/assets/gregtech/textures/gui/basicmachines/FissionFuel.png b/src/resources/assets/gregtech/textures/gui/basicmachines/FissionFuel.png Binary files differdeleted file mode 100644 index 163dd0d4a0..0000000000 --- a/src/resources/assets/gregtech/textures/gui/basicmachines/FissionFuel.png +++ /dev/null diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_GRINDING_FACTORY.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_GRINDING_FACTORY.png Binary files differdeleted file mode 100644 index d8677eda87..0000000000 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_GRINDING_FACTORY.png +++ /dev/null diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_PIPE_T1.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_PIPE_T1.png Binary files differdeleted file mode 100644 index c0065f8379..0000000000 --- a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_PIPE_T1.png +++ /dev/null |