aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorBlueHero233 <87818077+BlueHero233@users.noreply.github.com>2024-10-01 11:23:33 -0300
committerGitHub <noreply@github.com>2024-10-01 16:23:33 +0200
commitcf7a83475652871bf6c63af2f621d8f45d9d32cf (patch)
tree3b5a4152611f455a04cfee797e651313dd66f573 /src/main
parent49ca0b84b0262e1c9389d2dd073baffe405778c4 (diff)
downloadGT5-Unofficial-cf7a83475652871bf6c63af2f621d8f45d9d32cf.tar.gz
GT5-Unofficial-cf7a83475652871bf6c63af2f621d8f45d9d32cf.tar.bz2
GT5-Unofficial-cf7a83475652871bf6c63af2f621d8f45d9d32cf.zip
Remove 32x textures (#3276)
Co-authored-by: Martin Robertz <dream-master@gmx.net>
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/gregtech/common/blocks/BlockCasings8.java2
-rw-r--r--src/main/java/gtPlusPlus/core/item/chemistry/IonParticles.java35
-rw-r--r--src/main/java/gtPlusPlus/core/item/chemistry/StandardBaseParticles.java10
-rw-r--r--src/main/java/gtPlusPlus/core/item/general/ItemAirFilter.java28
-rw-r--r--src/main/java/gtPlusPlus/core/item/general/chassis/ItemBoilerChassis.java24
-rw-r--r--src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoil.java8
-rw-r--r--src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoilWire.java17
-rw-r--r--src/main/java/gtPlusPlus/core/material/MaterialsElements.java2
-rw-r--r--src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAlgaeBase.java14
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/MTETreeFarmerBase.java2
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMachineCasings.java10
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings.java10
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaTieredCasingBlocks1.java10
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler2.java2
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesCentrifugeMultiblock.java50
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java57
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineGas.java13
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineSCSteam.java13
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineSHSteam.java13
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineSteam.java13
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbineBase.java119
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbinePlasma.java13
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_DEEP_DARK_RAW.pngbin3300 -> 634 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_QUARK_PIPE.pngbin1029 -> 1154 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_QUARK_PIPE.png.mcmeta2
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/HIDDEN_FACE.pngbin113 -> 539 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_ACIDHAZARD.pngbin680 -> 915 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_BIOHAZARD.pngbin954 -> 947 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_EXPLOSIONHAZARD.pngbin736 -> 938 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_FIREHAZARD.pngbin682 -> 909 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_FROSTHAZARD.pngbin694 -> 918 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_MAGICHAZARD.pngbin652 -> 899 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_NOISEHAZARD.pngbin651 -> 894 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_RADIOACTIVEHAZARD.pngbin682 -> 911 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/RADIATOR_MS160.pngbin2207 -> 813 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.Volumetric_Flask.pngbin511 -> 246 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.Volumetric_Flask.window.pngbin251 -> 114 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.Volumetric_Flask_32k.pngbin1013 -> 258 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.Volumetric_Flask_32k.window.pngbin399 -> 129 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.Volumetric_Flask_8k.pngbin1010 -> 255 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.Volumetric_Flask_8k.window.pngbin398 -> 129 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/stickLong_OVERLAY.pngbin305 -> 524 bytes
-rw-r--r--src/main/resources/assets/gtnhlanth/textures/items/particle/alpha.pngbin1243 -> 747 bytes
-rw-r--r--src/main/resources/assets/gtnhlanth/textures/items/particle/electron.pngbin1180 -> 657 bytes
-rw-r--r--src/main/resources/assets/gtnhlanth/textures/items/particle/neutron.pngbin1169 -> 669 bytes
-rw-r--r--src/main/resources/assets/gtnhlanth/textures/items/particle/photon.pngbin1089 -> 725 bytes
-rw-r--r--src/main/resources/assets/gtnhlanth/textures/items/particle/proton.pngbin1331 -> 681 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/Blank.pngbin75 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/CosmicFabricManipulator.pngbin1131 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/CosmicFabricManipulator.png.mcmeta6
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/CosmicFabricManipulatorStatic.pngbin492 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/CosmicFabricShieldingCore.pngbin1222 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/CosmicFabricShieldingCore.png.mcmeta6
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/CosmicFabricShieldingCoreStatic.pngbin645 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/ForceFieldGlass.pngbin249 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/InfinityInfusedManipulator.pngbin1627 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/InfinityInfusedManipulator.png.mcmeta6
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/InfinityInfusedManipulatorStatic.pngbin557 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/InfinityInfusedShieldingCore.pngbin1869 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/InfinityInfusedShieldingCore.png.mcmeta6
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/InfinityInfusedShieldingCoreStatic.pngbin613 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/Manipulator_Top.pngbin511 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/NeutronPulseManipulator.pngbin1309 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/NeutronPulseManipulator.png.mcmeta6
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/NeutronPulseManipulatorStatic.pngbin492 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/NeutronShieldingCore.pngbin1617 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/NeutronShieldingCore.png.mcmeta6
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/NeutronShieldingCoreStatic.pngbin607 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/SpaceTimeBendingCore.pngbin2084 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/SpaceTimeBendingCore.png.mcmeta6
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/SpaceTimeBendingCoreStatic.pngbin624 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/SpaceTimeContinuumRipper.pngbin1593 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/SpaceTimeContinuumRipper.png.mcmeta6
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/SpaceTimeContinuumRipperStatic.pngbin562 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/TileEntities/CASING_AMAZON.pngbin677 -> 812 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_FLOTATION.pngbin647 -> 642 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_ROCKETDYNE.pngbin643 -> 647 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/TileEntities/sterileCasing.pngbin0 -> 446 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/chrono/MetalFunnel.pngbin378 -> 777 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet8.pngbin834 -> 748 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet9.pngbin941 -> 773 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_MUFFLER_ADV.pngbin754 -> 691 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_EV.pngbin2035 -> 623 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_HV.pngbin2048 -> 610 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_IV.pngbin2039 -> 642 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_LV.pngbin1887 -> 561 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_LuV.pngbin1929 -> 648 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_MV.pngbin2060 -> 575 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_ULV.pngbin1952 -> 533 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_ZPM.pngbin2112 -> 655 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_MAGIC_A.pngbin1156 -> 609 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_MAGIC_A.png.mcmeta6
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_MAGIC_B.pngbin2174 -> 677 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_MAGIC_B.png.mcmeta6
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_A.pngbin533 -> 653 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_B.pngbin569 -> 700 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_C.pngbin447 -> 671 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_D.pngbin448 -> 641 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_F.pngbin453 -> 612 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_G.pngbin1220 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_H.pngbin312 -> 664 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_I.pngbin493 -> 739 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_ORGANIC_PANEL_A_GLOWING.pngbin2503 -> 770 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_ORGANIC_PANEL_A_GLOWING.png.mcmeta6
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_RED_A.pngbin532 -> 600 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_STONE_RED_B.pngbin367 -> 585 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_A.pngbin266 -> 635 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_B.pngbin285 -> 691 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_PANEL_A.pngbin513 -> 599 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_PANEL_B.pngbin474 -> 741 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_PANEL_C.pngbin469 -> 757 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_PANEL_D.pngbin360 -> 639 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_PANEL_H.pngbin668 -> 684 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/qft/blank.pngbin0 -> 511 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/qft/forceFieldGlassTop.pngbin655 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/rendering/ForceField.pngbin3676 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/special/block_3.pngbin535 -> 713 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/special/block_7.pngbin716 -> 602 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/100.pngbin2112 -> 1275 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/100.png.mcmeta72
-rw-r--r--src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/41.pngbin750 -> 614 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/42.pngbin834 -> 638 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/43.pngbin936 -> 637 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/44.pngbin764 -> 669 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/55.pngbin24039 -> 1035 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/baubles/itemFireProtectGlovesBetter.pngbin1326 -> 798 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/bioscience/BasicAlgae.pngbin1122 -> 646 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/bioscience/BasicAlgae_Overlay.pngbin1045 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/0.pngbin605 -> 648 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/1.pngbin627 -> 651 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/2.pngbin633 -> 634 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/3.pngbin646 -> 652 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/4.pngbin622 -> 652 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/chargepack/1.pngbin1327 -> 631 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/chargepack/2.pngbin1335 -> 625 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/chargepack/3.pngbin1340 -> 620 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/chargepack/4.pngbin1306 -> 625 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/chargepack/5.pngbin1302 -> 625 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/chargepack/6.pngbin1338 -> 625 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/chargepack/7.pngbin1317 -> 625 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/chargepack/8.pngbin1402 -> 624 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/chargepack/9.pngbin1183 -> 621 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/ion/0.pngbin112 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/ion/1.pngbin146 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/ion/IonBase.pngbin1789 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/ion0.pngbin0 -> 684 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/ion1.pngbin0 -> 761 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/itemAirFilter.pngbin1469 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/itemAirFilter1.pngbin0 -> 591 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/itemAirFilter2.pngbin0 -> 588 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/itemBasicTurbine.pngbin475 -> 718 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/itemBlueprint.pngbin782 -> 762 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/itemBoilerChassis.pngbin1821 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/itemBoilerChassis1.pngbin0 -> 372 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/itemBoilerChassis2.pngbin0 -> 375 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/itemBoilerChassis3.pngbin0 -> 357 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/itemDehydratorCoil.pngbin653 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/itemDehydratorCoilWire.pngbin735 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/itemDehydratorCoilWire_0.png (renamed from src/main/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoilWire_0.png)bin309 -> 309 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/itemDehydratorCoilWire_1.png (renamed from src/main/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoilWire_1.png)bin302 -> 302 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/itemDehydratorCoilWire_2.png (renamed from src/main/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoilWire_2.png)bin288 -> 288 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/itemDehydratorCoilWire_3.png (renamed from src/main/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoilWire_3.png)bin286 -> 286 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/itemDehydratorCoil_0.png (renamed from src/main/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoil_0.png)bin461 -> 461 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/itemDehydratorCoil_1.png (renamed from src/main/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoil_1.png)bin459 -> 459 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/itemDehydratorCoil_2.png (renamed from src/main/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoil_2.png)bin386 -> 386 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/itemDehydratorCoil_3.png (renamed from src/main/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoil_3.png)bin388 -> 388 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/particle/0.pngbin1672 -> 717 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/particle/1.pngbin1669 -> 786 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/particle/10.pngbin1644 -> 725 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/particle/11.pngbin1678 -> 767 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/particle/12.pngbin1658 -> 741 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/particle/13.pngbin1668 -> 786 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/particle/14.pngbin1676 -> 2538 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/particle/14.png.mcmeta1
-rw-r--r--src/main/resources/assets/miscutils/textures/items/particle/15.pngbin1675 -> 777 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/particle/16.pngbin1679 -> 776 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/particle/17.pngbin1674 -> 738 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/particle/18.pngbin1674 -> 689 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/particle/19.pngbin1685 -> 676 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/particle/2.pngbin1683 -> 779 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/particle/20.pngbin1663 -> 698 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/particle/21.pngbin1653 -> 764 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/particle/22.pngbin1665 -> 759 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/particle/23.pngbin1680 -> 729 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/particle/24.pngbin1673 -> 728 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/particle/3.pngbin1681 -> 740 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/particle/4.pngbin1682 -> 762 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/particle/5.pngbin1675 -> 776 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/particle/6.pngbin1674 -> 760 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/particle/7.pngbin1667 -> 675 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/particle/8.pngbin1656 -> 763 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/particle/9.pngbin1663 -> 702 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/particle/new/0.pngbin1217 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/particle/new/1.pngbin1493 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/particle/new/10.pngbin1616 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/particle/new/11.pngbin1450 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/particle/new/12.pngbin1635 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/particle/new/13.pngbin1601 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/particle/new/14.pngbin1522 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/particle/new/15.pngbin1710 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/particle/new/16.pngbin1647 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/particle/new/17.pngbin1569 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/particle/new/18.pngbin1451 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/particle/new/19.pngbin1404 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/particle/new/2.pngbin1561 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/particle/new/20.pngbin1517 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/particle/new/21.pngbin1498 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/particle/new/22.pngbin1554 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/particle/new/23.pngbin1196 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/particle/new/24.pngbin1323 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/particle/new/3.pngbin1465 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/particle/new/4.pngbin1501 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/particle/new/5.pngbin1487 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/particle/new/6.pngbin1512 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/particle/new/7.pngbin1485 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/particle/new/8.pngbin1595 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/particle/new/9.pngbin1567 -> 0 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/personalCloakingDevice.pngbin245 -> 756 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/token/0.pngbin3345 -> 779 bytes
219 files changed, 223 insertions, 383 deletions
diff --git a/src/main/java/gregtech/common/blocks/BlockCasings8.java b/src/main/java/gregtech/common/blocks/BlockCasings8.java
index 2e8781bca1..400f1aadac 100644
--- a/src/main/java/gregtech/common/blocks/BlockCasings8.java
+++ b/src/main/java/gregtech/common/blocks/BlockCasings8.java
@@ -183,6 +183,6 @@ public class BlockCasings8 extends BlockCasingsAbstract {
}
}
- return Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.getIcon();
+ return Textures.BlockIcons.MACHINE_CASING_ADVANCEDGAS.getIcon();
}
}
diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/IonParticles.java b/src/main/java/gtPlusPlus/core/item/chemistry/IonParticles.java
index c7738751c2..95213c2930 100644
--- a/src/main/java/gtPlusPlus/core/item/chemistry/IonParticles.java
+++ b/src/main/java/gtPlusPlus/core/item/chemistry/IonParticles.java
@@ -15,7 +15,6 @@ import net.minecraft.util.IIcon;
import gregtech.api.enums.Materials;
import gtPlusPlus.core.item.base.misc.BaseItemParticle;
-import gtPlusPlus.core.material.MaterialsElements;
import gtPlusPlus.core.util.Utils;
public class IonParticles extends BaseItemParticle {
@@ -24,16 +23,17 @@ public class IonParticles extends BaseItemParticle {
public static HashMap<Integer, String> MetaToNameMap = new HashMap<>();
public IonParticles() {
- super("Ion", MaterialsElements.NAMES.length, EnumRarity.rare);
+ super("Ion", ions.length, EnumRarity.rare);
}
- public static IIcon[] overlays = new IIcon[MaterialsElements.NAMES.length];
- public static IIcon baseTexture;
+ public static final String[] ions = new String[] { "Hydrogen", "Helium" };
+
+ public IIcon[] texture = new IIcon[ions.length];
static {
// Generate Ions
int key = 0;
- for (String s : MaterialsElements.NAMES) {
+ for (String s : ions) {
// Map names to Meta
NameToMetaMap.put(Utils.sanitizeString(s.toLowerCase()), key);
MetaToNameMap.put(key, Utils.sanitizeString(s.toLowerCase()));
@@ -60,7 +60,7 @@ public class IonParticles extends BaseItemParticle {
@Override
public String getUnlocalizedName(final ItemStack itemStack) {
- return "item.particle.ion" + "." + MaterialsElements.NAMES[itemStack.getItemDamage()];
+ return "item.particle.ion." + ions[itemStack.getItemDamage()];
}
private static boolean createNBT(ItemStack rStack) {
@@ -72,7 +72,7 @@ public class IonParticles extends BaseItemParticle {
return true;
}
- public static final long getChargeState(final ItemStack aStack) {
+ public static long getChargeState(final ItemStack aStack) {
NBTTagCompound aNBT = aStack.getTagCompound();
if (aNBT != null) {
aNBT = aNBT.getCompoundTag("Ion");
@@ -85,7 +85,7 @@ public class IonParticles extends BaseItemParticle {
return 0L;
}
- public static final boolean setChargeState(final ItemStack aStack, final long aCharge) {
+ public static boolean setChargeState(final ItemStack aStack, final long aCharge) {
NBTTagCompound aNBT = aStack.getTagCompound();
if (aNBT != null) {
aNBT = aNBT.getCompoundTag("Ion");
@@ -102,8 +102,7 @@ public class IonParticles extends BaseItemParticle {
if (stack.getTagCompound() == null) {
createNBT(stack);
}
- double chargeState = getChargeState(stack);
- return chargeState;
+ return (double) getChargeState(stack);
}
@Override
@@ -131,23 +130,21 @@ public class IonParticles extends BaseItemParticle {
+ " Ion with a "
+ aState
+ " charge state of "
- + aCharge
- + "");
+ + aCharge);
}
super.addInformation(stack, player, list, bool);
}
@Override
public void registerIcons(IIconRegister reg) {
- for (int i = 0; i < IonParticles.overlays.length; i++) {
- IonParticles.overlays[i] = reg.registerIcon(GTPlusPlus.ID + ":" + "ion/" + i);
+ for (int i = 0; i < this.texture.length; i++) {
+ this.texture[i] = reg.registerIcon(GTPlusPlus.ID + ":ion" + i);
}
- IonParticles.baseTexture = reg.registerIcon(GTPlusPlus.ID + ":" + "ion/IonBase");
}
@Override
public IIcon getIconFromDamage(int meta) {
- return IonParticles.overlays[meta];
+ return this.texture[meta];
}
@Override
@@ -157,11 +154,7 @@ public class IonParticles extends BaseItemParticle {
@Override
public IIcon getIconFromDamageForRenderPass(int aMeta, int aPass) {
- if (aPass == 0) {
- return IonParticles.baseTexture;
- } else {
- return IonParticles.overlays[aMeta];
- }
+ return this.texture[aMeta];
}
@Override
diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/StandardBaseParticles.java b/src/main/java/gtPlusPlus/core/item/chemistry/StandardBaseParticles.java
index 0c3d481fd7..7e6f57eecd 100644
--- a/src/main/java/gtPlusPlus/core/item/chemistry/StandardBaseParticles.java
+++ b/src/main/java/gtPlusPlus/core/item/chemistry/StandardBaseParticles.java
@@ -43,8 +43,7 @@ public class StandardBaseParticles extends BaseItemParticle {
MetaToNameMap.put(key, Utils.sanitizeString(s.toLowerCase()));
for (Particle o : Particle.aMap) {
int aColour = 0;
- if (o.mParticleName.toLowerCase()
- .equals(s.toLowerCase())) {
+ if (o.mParticleName.equalsIgnoreCase(s)) {
if (o.mParticleType == ElementaryGroup.BARYON) {
aColour = Utils.rgbtoHexValue(174, 226, 156);
aColourMap.put(key++, aColour);
@@ -109,7 +108,6 @@ public class StandardBaseParticles extends BaseItemParticle {
public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean bool) {
Particle aCharge = getParticle(stack);
EnumChatFormatting aColour = EnumChatFormatting.GRAY;
- String aState = aColour + "Unknown" + EnumChatFormatting.RESET;
if (aCharge != null) {
String aGroup = aCharge.mParticleType.name()
.toLowerCase();
@@ -130,13 +128,11 @@ public class StandardBaseParticles extends BaseItemParticle {
} else if (aGroup.toLowerCase()
.contains("meson")) {
aColour = EnumChatFormatting.WHITE;
- } else {
- aColour = EnumChatFormatting.GRAY;
}
String aFirstLet = aGroup.substring(0, 1)
.toUpperCase();
aGroup = aGroup.replaceFirst(aGroup.substring(0, 1), aFirstLet);
- aState = aColour + aGroup + EnumChatFormatting.RESET;
+ String aState = aColour + aGroup + EnumChatFormatting.RESET;
list.add(EnumChatFormatting.GRAY + "Type: " + aState);
}
super.addInformation(stack, player, list, bool);
@@ -145,7 +141,7 @@ public class StandardBaseParticles extends BaseItemParticle {
@Override
public void registerIcons(IIconRegister reg) {
for (int i = 0; i < this.icons.length; i++) {
- this.icons[i] = reg.registerIcon(GTPlusPlus.ID + ":" + "particle/new/" + i);
+ this.icons[i] = reg.registerIcon(GTPlusPlus.ID + ":particle/" + i);
}
}
diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemAirFilter.java b/src/main/java/gtPlusPlus/core/item/general/ItemAirFilter.java
index e82e6f1b44..84cb087e1c 100644
--- a/src/main/java/gtPlusPlus/core/item/general/ItemAirFilter.java
+++ b/src/main/java/gtPlusPlus/core/item/general/ItemAirFilter.java
@@ -15,11 +15,10 @@ import net.minecraft.util.IIcon;
import cpw.mods.fml.common.registry.GameRegistry;
import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.util.Utils;
public class ItemAirFilter extends Item {
- public IIcon[] icons = new IIcon[1];
+ public IIcon[] icons = new IIcon[2];
public ItemAirFilter() {
super();
@@ -33,12 +32,13 @@ public class ItemAirFilter extends Item {
@Override
public void registerIcons(IIconRegister reg) {
- this.icons[0] = reg.registerIcon(GTPlusPlus.ID + ":" + "itemAirFilter");
+ this.icons[0] = reg.registerIcon(GTPlusPlus.ID + ":itemAirFilter1");
+ this.icons[1] = reg.registerIcon(GTPlusPlus.ID + ":itemAirFilter2");
}
@Override
public IIcon getIconFromDamage(int meta) {
- return this.icons[0];
+ return this.icons[meta];
}
@Override
@@ -60,7 +60,7 @@ public class ItemAirFilter extends Item {
return "Air Filter";
}
- String itemName = tItem == null ? "Air Filter" : super.getItemStackDisplayName(tItem);
+ String itemName = "Air Filter";
String suffixName = "";
if (tItem.getItemDamage() == 0) {
suffixName = " [Tier 1]";
@@ -70,15 +70,6 @@ public class ItemAirFilter extends Item {
return (itemName + suffixName);
}
- @Override
- public int getColorFromItemStack(final ItemStack stack, int HEX_OxFFFFFF) {
- int meta = stack.getItemDamage();
- if (meta == 1) {
- HEX_OxFFFFFF = Utils.rgbtoHexValue(150, 180, 35);
- }
- return HEX_OxFFFFFF;
- }
-
private static boolean createNBT(ItemStack rStack) {
final NBTTagCompound tagMain = new NBTTagCompound();
final NBTTagCompound tagNBT = new NBTTagCompound();
@@ -88,11 +79,11 @@ public class ItemAirFilter extends Item {
return true;
}
- public static final long getFilterMaxDamage(final ItemStack aStack) {
+ public static long getFilterMaxDamage(final ItemStack aStack) {
return aStack.getItemDamage() == 0 ? 50 : 2500;
}
- public static final long getFilterDamage(final ItemStack aStack) {
+ public static long getFilterDamage(final ItemStack aStack) {
NBTTagCompound aNBT = aStack.getTagCompound();
if (aNBT != null) {
aNBT = aNBT.getCompoundTag("AirFilter");
@@ -105,7 +96,7 @@ public class ItemAirFilter extends Item {
return 0L;
}
- public static final boolean setFilterDamage(final ItemStack aStack, final long aDamage) {
+ public static boolean setFilterDamage(final ItemStack aStack, final long aDamage) {
NBTTagCompound aNBT = aStack.getTagCompound();
if (aNBT != null) {
aNBT = aNBT.getCompoundTag("AirFilter");
@@ -124,8 +115,7 @@ public class ItemAirFilter extends Item {
}
double currentDamage = getFilterDamage(stack);
double meta = getFilterMaxDamage(stack);
- double durabilitypercent = currentDamage / meta;
- return durabilitypercent;
+ return currentDamage / meta;
}
@Override
diff --git a/src/main/java/gtPlusPlus/core/item/general/chassis/ItemBoilerChassis.java b/src/main/java/gtPlusPlus/core/item/general/chassis/ItemBoilerChassis.java
index 8efcfe6912..abba629e27 100644
--- a/src/main/java/gtPlusPlus/core/item/general/chassis/ItemBoilerChassis.java
+++ b/src/main/java/gtPlusPlus/core/item/general/chassis/ItemBoilerChassis.java
@@ -13,11 +13,10 @@ import net.minecraft.util.StatCollector;
import cpw.mods.fml.common.registry.GameRegistry;
import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.util.Utils;
public class ItemBoilerChassis extends Item {
- public IIcon[] icons = new IIcon[1];
+ public IIcon[] icons = new IIcon[3];
public ItemBoilerChassis() {
super();
@@ -30,12 +29,14 @@ public class ItemBoilerChassis extends Item {
@Override
public void registerIcons(IIconRegister reg) {
- this.icons[0] = reg.registerIcon(GTPlusPlus.ID + ":" + "itemBoilerChassis");
+ this.icons[0] = reg.registerIcon(GTPlusPlus.ID + ":itemBoilerChassis1");
+ this.icons[1] = reg.registerIcon(GTPlusPlus.ID + ":itemBoilerChassis2");
+ this.icons[2] = reg.registerIcon(GTPlusPlus.ID + ":itemBoilerChassis3");
}
@Override
public IIcon getIconFromDamage(int meta) {
- return this.icons[0];
+ return this.icons[meta];
}
@Override
@@ -54,19 +55,4 @@ public class ItemBoilerChassis extends Item {
public String getItemStackDisplayName(final ItemStack tItem) {
return StatCollector.translateToLocalFormatted("item.itemBoilerChassis.name", tItem.getItemDamage());
}
-
- @Override // TODO
- public int getColorFromItemStack(final ItemStack stack, int HEX_OxFFFFFF) {
- int meta = stack.getItemDamage();
- if (meta == 0) {
- HEX_OxFFFFFF = Utils.rgbtoHexValue(10, 110, 30);
- } else if (meta == 1) {
- HEX_OxFFFFFF = Utils.rgbtoHexValue(150, 180, 35);
- } else if (meta == 2) {
- HEX_OxFFFFFF = Utils.rgbtoHexValue(200, 85, 40);
- } else if (meta == 3) {
- HEX_OxFFFFFF = Utils.rgbtoHexValue(255, 100, 50);
- }
- return HEX_OxFFFFFF;
- }
}
diff --git a/src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoil.java b/src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoil.java
index f23f4c8dce..9f0370d993 100644
--- a/src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoil.java
+++ b/src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoil.java
@@ -30,10 +30,10 @@ public class ItemDehydratorCoil extends Item {
@Override
public void registerIcons(IIconRegister reg) {
- this.icons[0] = reg.registerIcon(GTPlusPlus.ID + ":" + "dehydrator/itemDehydratorCoil_0");
- this.icons[1] = reg.registerIcon(GTPlusPlus.ID + ":" + "dehydrator/itemDehydratorCoil_1");
- this.icons[2] = reg.registerIcon(GTPlusPlus.ID + ":" + "dehydrator/itemDehydratorCoil_2");
- this.icons[3] = reg.registerIcon(GTPlusPlus.ID + ":" + "dehydrator/itemDehydratorCoil_3");
+ this.icons[0] = reg.registerIcon(GTPlusPlus.ID + ":itemDehydratorCoil_0");
+ this.icons[1] = reg.registerIcon(GTPlusPlus.ID + ":itemDehydratorCoil_1");
+ this.icons[2] = reg.registerIcon(GTPlusPlus.ID + ":itemDehydratorCoil_2");
+ this.icons[3] = reg.registerIcon(GTPlusPlus.ID + ":itemDehydratorCoil_3");
}
@Override
diff --git a/src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoilWire.java b/src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoilWire.java
index 820486b742..6d22766c87 100644
--- a/src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoilWire.java
+++ b/src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoilWire.java
@@ -30,10 +30,10 @@ public class ItemDehydratorCoilWire extends Item {
@Override
public void registerIcons(IIconRegister reg) {
- this.icons[0] = reg.registerIcon(GTPlusPlus.ID + ":" + "dehydrator/itemDehydratorCoilWire_0");
- this.icons[1] = reg.registerIcon(GTPlusPlus.ID + ":" + "dehydrator/itemDehydratorCoilWire_1");
- this.icons[2] = reg.registerIcon(GTPlusPlus.ID + ":" + "dehydrator/itemDehydratorCoilWire_2");
- this.icons[3] = reg.registerIcon(GTPlusPlus.ID + ":" + "dehydrator/itemDehydratorCoilWire_3");
+ this.icons[0] = reg.registerIcon(GTPlusPlus.ID + ":itemDehydratorCoilWire_0");
+ this.icons[1] = reg.registerIcon(GTPlusPlus.ID + ":itemDehydratorCoilWire_1");
+ this.icons[2] = reg.registerIcon(GTPlusPlus.ID + ":itemDehydratorCoilWire_2");
+ this.icons[3] = reg.registerIcon(GTPlusPlus.ID + ":itemDehydratorCoilWire_3");
}
@Override
@@ -58,13 +58,4 @@ public class ItemDehydratorCoilWire extends Item {
return StatCollector
.translateToLocalFormatted("item.itemDehydratorCoilWire.name", GTValues.VN[tItem.getItemDamage() + 4]);
}
-
- /*
- * @Override public int getColorFromItemStack(final ItemStack stack, int HEX_OxFFFFFF) { int meta =
- * stack.getItemDamage(); if (meta == 0){ HEX_OxFFFFFF = Utils.rgbtoHexValue(10,110,30); } else if (meta == 1){
- * HEX_OxFFFFFF = Utils.rgbtoHexValue(150,180,35); } else if (meta == 2){ HEX_OxFFFFFF =
- * Utils.rgbtoHexValue(200,85,40); } else if (meta == 3){ HEX_OxFFFFFF = Utils.rgbtoHexValue(255,150,50); } return
- * HEX_OxFFFFFF; }
- */
-
}
diff --git a/src/main/java/gtPlusPlus/core/material/MaterialsElements.java b/src/main/java/gtPlusPlus/core/material/MaterialsElements.java
index d1fcf3f5c5..e8cc6ee8f7 100644
--- a/src/main/java/gtPlusPlus/core/material/MaterialsElements.java
+++ b/src/main/java/gtPlusPlus/core/material/MaterialsElements.java
@@ -10,8 +10,6 @@ import gtPlusPlus.core.util.minecraft.MaterialUtils;
public final class MaterialsElements {
- public static final String[] NAMES = new String[] { "Hydrogen", "Helium" };
-
// First 50 Elements
public final Material HYDROGEN = MaterialUtils.generateMaterialFromGtENUM(Materials.Hydrogen);
public final Material HELIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Helium);
diff --git a/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAlgaeBase.java b/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAlgaeBase.java
index 213ee6b47e..29c88ca5f4 100644
--- a/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAlgaeBase.java
+++ b/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAlgaeBase.java
@@ -17,6 +17,7 @@ import net.minecraft.util.IIcon;
import net.minecraft.world.World;
import cpw.mods.fml.common.registry.GameRegistry;
+import gregtech.api.util.GTLog;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.plugin.agrichem.AlgaeDefinition;
import gtPlusPlus.plugin.agrichem.IAlgalItem;
@@ -25,7 +26,6 @@ import gtPlusPlus.plugin.agrichem.logic.AlgaeGeneticData;
public class ItemAlgaeBase extends Item implements IAlgalItem {
protected IIcon base;
- protected IIcon overlay;
public ItemAlgaeBase() {
this.setHasSubtypes(true);
@@ -89,8 +89,8 @@ public class ItemAlgaeBase extends Item implements IAlgalItem {
aList.add("Lifespan in days: " + mLifespan);
aList.add("Generation: " + mGeneration);
}
- } catch (Throwable t) {
- t.printStackTrace();
+ } catch (Exception e) {
+ e.printStackTrace(GTLog.err);
}
super.addInformation(aStack, p_77624_2_, aList, p_77624_4_);
}
@@ -149,16 +149,12 @@ public class ItemAlgaeBase extends Item implements IAlgalItem {
@Override
public IIcon getIconFromDamageForRenderPass(final int damage, final int pass) {
- if (pass == 0) {
- return this.base;
- }
- return this.overlay;
+ return this.base;
}
@Override
public void registerIcons(final IIconRegister i) {
- this.base = i.registerIcon(GTPlusPlus.ID + ":" + "bioscience/BasicAlgae");
- this.overlay = i.registerIcon(GTPlusPlus.ID + ":" + "bioscience/BasicAlgae_Overlay");
+ this.base = i.registerIcon(GTPlusPlus.ID + ":bioscience/BasicAlgae");
}
public static ItemStack initNBT(ItemStack aFreshAlgae) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/MTETreeFarmerBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/MTETreeFarmerBase.java
index dc0b4a5dd6..e3f264ee84 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/MTETreeFarmerBase.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/MTETreeFarmerBase.java
@@ -147,7 +147,7 @@ public abstract class MTETreeFarmerBase extends MTETieredMachineBlock {
}
public ITexture[] getBottom(final byte aColor) {
- return new ITexture[] { new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Acacia_Log) };
+ return new ITexture[] { new GTRenderedTexture(TexturesGtBlock.Sterile_Casing) };
}
public ITexture[] getTop(final byte aColor) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMachineCasings.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMachineCasings.java
index 7c65de73bd..96fad17286 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMachineCasings.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMachineCasings.java
@@ -4,7 +4,6 @@ import java.util.List;
import net.minecraft.block.Block;
import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
@@ -31,15 +30,6 @@ public class GregtechMetaSpecialMachineCasings extends GregtechMetaCasingBlocksA
public SpecialCasingItemBlock(Block par1) {
super(par1);
}
-
- @Override
- public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) {
- int aMeta = aStack.getItemDamage();
- if (aMeta < 10) {
- // aList.add("Tier: "+GT_Values.VN[aMeta]);
- }
- super.addInformation(aStack, aPlayer, aList, aF3_H);
- }
}
public GregtechMetaSpecialMachineCasings() {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings.java
index dba95455c8..d383809972 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings.java
@@ -30,10 +30,6 @@ public class GregtechMetaSpecialMultiCasings extends GregtechMetaCasingBlocksAbs
@Override
public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) {
- int aMeta = aStack.getItemDamage();
- if (aMeta < 10) {
- // aList.add("Tier: "+GT_Values.VN[aMeta]);
- }
super.addInformation(aStack, aPlayer, aList, aF3_H);
}
}
@@ -97,9 +93,9 @@ public class GregtechMetaSpecialMultiCasings extends GregtechMetaCasingBlocksAbs
return switch (aMeta) {
case 0 -> TexturesGtBlock.Casing_Redox_1.getIcon();
case 1 -> Textures.BlockIcons.MACHINE_CASING_TURBINE.getIcon();
- case 2 -> Textures.BlockIcons.MACHINE_CASING_STABLE_TITANIUM.getIcon();
- case 3 -> Textures.BlockIcons.MACHINE_CASING_CLEAN_STAINLESSSTEEL.getIcon();
- case 4 -> Textures.BlockIcons.MACHINE_CASING_ROBUST_TUNGSTENSTEEL.getIcon();
+ case 2 -> Textures.BlockIcons.MACHINE_CASING_TURBINE_TITANIUM.getIcon();
+ case 3 -> Textures.BlockIcons.MACHINE_CASING_TURBINE_STAINLESSSTEEL.getIcon();
+ case 4 -> Textures.BlockIcons.MACHINE_CASING_TURBINE_TUNGSTENSTEEL.getIcon();
case 5 -> TexturesGtBlock.Casing_Material_RedSteel.getIcon();
case 6 -> TexturesGtBlock.Casing_Material_MaragingSteel.getIcon();
case 7 -> TexturesGtBlock.Casing_Material_Stellite.getIcon();
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaTieredCasingBlocks1.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaTieredCasingBlocks1.java
index 50780c5809..100b7833d6 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaTieredCasingBlocks1.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaTieredCasingBlocks1.java
@@ -71,14 +71,6 @@ public class GregtechMetaTieredCasingBlocks1 extends GregtechMetaCasingBlocksAbs
if (aMeta < 10) {
return TexturesGtBlock.TIERED_MACHINE_HULLS[aMeta].getIcon();
}
- return switch (aMeta) {
- case 10 -> Textures.BlockIcons.RENDERING_ERROR.getIcon();
- case 11 -> Textures.BlockIcons.RENDERING_ERROR.getIcon();
- case 12 -> Textures.BlockIcons.RENDERING_ERROR.getIcon();
- case 13 -> Textures.BlockIcons.RENDERING_ERROR.getIcon();
- case 14 -> Textures.BlockIcons.RENDERING_ERROR.getIcon();
- case 15 -> Textures.BlockIcons.RENDERING_ERROR.getIcon();
- default -> Textures.BlockIcons.RENDERING_ERROR.getIcon();
- };
+ return Textures.BlockIcons.RENDERING_ERROR.getIcon();
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler2.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler2.java
index 1da572fb35..dd205136bf 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler2.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler2.java
@@ -59,7 +59,7 @@ public class CasingTextureHandler2 {
return Textures.BlockIcons.RENDERING_ERROR.getIcon();
}
case 15 -> {
- return TexturesGtBlock.Casing_Machine_Acacia_Log.getIcon();
+ return TexturesGtBlock.Sterile_Casing.getIcon();
}
default -> {
return TexturesGtBlock.Overlay_UU_Matter.getIcon();
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesCentrifugeMultiblock.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesCentrifugeMultiblock.java
index f4d3d22aba..0defa80e6c 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesCentrifugeMultiblock.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesCentrifugeMultiblock.java
@@ -8,56 +8,10 @@ import net.minecraftforge.common.util.ForgeDirection;
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gtPlusPlus.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks;
-import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock.CustomIcon;
import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MTEIndustrialCentrifuge;
public class TexturesCentrifugeMultiblock {
- private static CustomIcon GT8_1_Active = new CustomIcon("iconsets/LARGECENTRIFUGE_ACTIVE1");
- private static CustomIcon GT8_1 = new CustomIcon("iconsets/LARGECENTRIFUGE1");
- private static CustomIcon GT8_2_Active = new CustomIcon("iconsets/LARGECENTRIFUGE_ACTIVE2");
- private static CustomIcon GT8_2 = new CustomIcon("iconsets/LARGECENTRIFUGE2");
- private static CustomIcon GT8_3_Active = new CustomIcon("iconsets/LARGECENTRIFUGE_ACTIVE3");
- private static CustomIcon GT8_3 = new CustomIcon("iconsets/LARGECENTRIFUGE3");
- private static CustomIcon GT8_4_Active = new CustomIcon("iconsets/LARGECENTRIFUGE_ACTIVE4");
- private static CustomIcon GT8_4 = new CustomIcon("iconsets/LARGECENTRIFUGE4");
- private static CustomIcon GT8_5_Active = new CustomIcon("iconsets/LARGECENTRIFUGE_ACTIVE5");
- private static CustomIcon GT8_5 = new CustomIcon("iconsets/LARGECENTRIFUGE5");
- private static CustomIcon GT8_6_Active = new CustomIcon("iconsets/LARGECENTRIFUGE_ACTIVE6");
- private static CustomIcon GT8_6 = new CustomIcon("iconsets/LARGECENTRIFUGE6");
- private static CustomIcon GT8_7_Active = new CustomIcon("iconsets/LARGECENTRIFUGE_ACTIVE7");
- private static CustomIcon GT8_7 = new CustomIcon("iconsets/LARGECENTRIFUGE7");
- private static CustomIcon GT8_8_Active = new CustomIcon("iconsets/LARGECENTRIFUGE_ACTIVE8");
- private static CustomIcon GT8_8 = new CustomIcon("iconsets/LARGECENTRIFUGE8");
- private static CustomIcon GT8_9_Active = new CustomIcon("iconsets/LARGECENTRIFUGE_ACTIVE9");
- private static CustomIcon GT8_9 = new CustomIcon("iconsets/LARGECENTRIFUGE9");
-
- private static CustomIcon frontFace_0 = (GT8_1);
- private static CustomIcon frontFaceActive_0 = (GT8_1_Active);
- private static CustomIcon frontFace_1 = (GT8_2);
- private static CustomIcon frontFaceActive_1 = (GT8_2_Active);
- private static CustomIcon frontFace_2 = (GT8_3);
- private static CustomIcon frontFaceActive_2 = (GT8_3_Active);
- private static CustomIcon frontFace_3 = (GT8_4);
- private static CustomIcon frontFaceActive_3 = (GT8_4_Active);
- private static CustomIcon frontFace_4 = (GT8_5);
- private static CustomIcon frontFaceActive_4 = (GT8_5_Active);
- private static CustomIcon frontFace_5 = (GT8_6);
- private static CustomIcon frontFaceActive_5 = (GT8_6_Active);
- private static CustomIcon frontFace_6 = (GT8_7);
- private static CustomIcon frontFaceActive_6 = (GT8_7_Active);
- private static CustomIcon frontFace_7 = (GT8_8);
- private static CustomIcon frontFaceActive_7 = (GT8_8_Active);
- private static CustomIcon frontFace_8 = (GT8_9);
- private static CustomIcon frontFaceActive_8 = (GT8_9_Active);
-
- CustomIcon[] CENTRIFUGE = new CustomIcon[] { frontFace_0, frontFace_1, frontFace_2, frontFace_3, frontFace_4,
- frontFace_5, frontFace_6, frontFace_7, frontFace_8 };
-
- CustomIcon[] CENTRIFUGE_ACTIVE = new CustomIcon[] { frontFaceActive_0, frontFaceActive_1, frontFaceActive_2,
- frontFaceActive_3, frontFaceActive_4, frontFaceActive_5, frontFaceActive_6, frontFaceActive_7,
- frontFaceActive_8 };
-
public IIcon handleCasingsGT(final IBlockAccess aWorld, final int xCoord, final int yCoord, final int zCoord,
final ForgeDirection side, final GregtechMetaCasingBlocks thisBlock) {
return this.handleCasingsGT58(aWorld, xCoord, yCoord, zCoord, side, thisBlock);
@@ -143,9 +97,9 @@ public class TexturesCentrifugeMultiblock {
public IIcon getIconByIndex(IMetaTileEntity aMetaTileEntity, int aIndex) {
if (isUsingAnimatedTexture(aMetaTileEntity)) {
if (isCentrifugeRunning(aMetaTileEntity)) {
- return this.CENTRIFUGE_ACTIVE[aIndex].getIcon();
+ return TexturesGtBlock.CENTRIFUGEACTIVE[aIndex].getIcon();
}
}
- return this.CENTRIFUGE[aIndex].getIcon();
+ return TexturesGtBlock.CENTRIFUGE[aIndex].getIcon();
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java
index a0ee2891a2..2f87a3b6fb 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java
@@ -157,33 +157,33 @@ public class TexturesGtBlock {
// spotless:off
public static final CustomIcon Casing_Coil_QFT = new CustomIcon("TileEntities/MACHINE_CASING_QFT_COIL");
public static final CustomIcon NeutronPulseManipulator = mAnimated ? new CustomIcon(
- "NeutronPulseManipulator") : new CustomIcon("NeutronPulseManipulatorStatic");
+ "qft/NeutronPulseManipulator") : new CustomIcon("qft/NeutronPulseManipulatorStatic");
public static final CustomIcon CosmicFabricManipulator = mAnimated ? new CustomIcon(
- "CosmicFabricManipulator") : new CustomIcon("CosmicFabricManipulatorStatic");
+ "qft/CosmicFabricManipulator") : new CustomIcon("qft/CosmicFabricManipulatorStatic");
public static final CustomIcon InfinityInfusedManipulator = mAnimated ? new CustomIcon(
- "InfinityInfusedManipulator") : new CustomIcon("InfinityInfusedManipulatorStatic");
+ "qft/InfinityInfusedManipulator") : new CustomIcon("qft/InfinityInfusedManipulatorStatic");
public static final CustomIcon SpaceTimeContinuumRipper = mAnimated ? new CustomIcon(
- "SpaceTimeContinuumRipper") : new CustomIcon("SpaceTimeContinuumRipperStatic");
- public static final CustomIcon Manipulator_Top = new CustomIcon("Manipulator_Top");
+ "qft/SpaceTimeContinuumRipper") : new CustomIcon("qft/SpaceTimeContinuumRipperStatic");
+ public static final CustomIcon Manipulator_Top = new CustomIcon("qft/Manipulator_Top");
public static final CustomIcon NeutronShieldingCore = mAnimated ? new CustomIcon(
- "NeutronShieldingCore") : new CustomIcon("NeutronShieldingCoreStatic");
+ "qft/NeutronShieldingCore") : new CustomIcon("qft/NeutronShieldingCoreStatic");
public static final CustomIcon CosmicFabricShieldingCore = mAnimated ? new CustomIcon(
- "CosmicFabricShieldingCore") : new CustomIcon("CosmicFabricShieldingCoreStatic");
+ "qft/CosmicFabricShieldingCore") : new CustomIcon("qft/CosmicFabricShieldingCoreStatic");
public static final CustomIcon InfinityInfusedShieldingCore = mAnimated ? new CustomIcon(
- "InfinityInfusedShieldingCore") : new CustomIcon("InfinityInfusedShieldingCoreStatic");
+ "qft/InfinityInfusedShieldingCore") : new CustomIcon("qft/InfinityInfusedShieldingCoreStatic");
public static final CustomIcon SpaceTimeBendingCore = mAnimated ? new CustomIcon(
- "SpaceTimeBendingCore") : new CustomIcon("SpaceTimeBendingCoreStatic");
- public static final CustomIcon ForceFieldGlass = new CustomIcon("ForceFieldGlass");
- public static final CustomIcon ForceField = new CustomIcon("rendering/ForceField");
- public static final CustomIcon Blank = new CustomIcon("Blank");
+ "qft/SpaceTimeBendingCore") : new CustomIcon("qft/SpaceTimeBendingCoreStatic");
+ public static final CustomIcon ForceFieldGlass = new CustomIcon("qft/ForceFieldGlass");
+ public static final CustomIcon ForceField = new CustomIcon("qft/ForceField");
+ public static final CustomIcon Blank = new CustomIcon("qft/blank");
//spotless:on
// MACHINE_CASING_FARM_MANAGER_STRUCTURAL
// Farm Manager Casings
public static final CustomIcon Casing_Machine_Farm_Manager = new CustomIcon(
"TileEntities/MACHINE_CASING_FARM_MANAGER_STRUCTURAL");
- // Acacia_Log
- public static final CustomIcon Casing_Machine_Acacia_Log = new CustomIcon("TileEntities/log_acacia_top");
+ // Sterile Casing
+ public static final CustomIcon Sterile_Casing = new CustomIcon("TileEntities/sterileCasing");
// Podzol Top
public static final CustomIcon Casing_Machine_Podzol = new CustomIcon("TileEntities/dirt_podzol_top");
@@ -310,10 +310,6 @@ public class TexturesGtBlock {
public static final CustomIcon Overlay_Machine_Screen_Logo = new CustomIcon("TileEntities/adv_machine_screen_logo");
// Machine Controller Overlays
- // public static final CustomIcon Overlay_Machine_Controller_Default = new CustomIcon(
- // "iconsets/OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ANIMATED");
- // public static final CustomIcon Overlay_Machine_Controller_Default_Active = new CustomIcon(
- // "iconsets/OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ANIMATED_ACTIVE");
// oMCD = Overlay_Machine_Controller_Default
public static final CustomIcon oMCDSolarTower = new CustomIcon("iconsets/controllerFaces/solarTower");
@@ -562,6 +558,25 @@ public class TexturesGtBlock {
public static final CustomIcon TEXTURE_TECH_B = new CustomIcon("metro/TEXTURE_TECH_B");
public static final CustomIcon TEXTURE_TECH_C = new CustomIcon("metro/TEXTURE_TECH_C");
+ private static final CustomIcon GT8_1_Active = new CustomIcon("iconsets/LARGECENTRIFUGE_ACTIVE1");
+ private static final CustomIcon GT8_1 = new CustomIcon("iconsets/LARGECENTRIFUGE1");
+ private static final CustomIcon GT8_2_Active = new CustomIcon("iconsets/LARGECENTRIFUGE_ACTIVE2");
+ private static final CustomIcon GT8_2 = new CustomIcon("iconsets/LARGECENTRIFUGE2");
+ private static final CustomIcon GT8_3_Active = new CustomIcon("iconsets/LARGECENTRIFUGE_ACTIVE3");
+ private static final CustomIcon GT8_3 = new CustomIcon("iconsets/LARGECENTRIFUGE3");
+ private static final CustomIcon GT8_4_Active = new CustomIcon("iconsets/LARGECENTRIFUGE_ACTIVE4");
+ private static final CustomIcon GT8_4 = new CustomIcon("iconsets/LARGECENTRIFUGE4");
+ private static final CustomIcon GT8_5_Active = new CustomIcon("iconsets/LARGECENTRIFUGE_ACTIVE5");
+ private static final CustomIcon GT8_5 = new CustomIcon("iconsets/LARGECENTRIFUGE5");
+ private static final CustomIcon GT8_6_Active = new CustomIcon("iconsets/LARGECENTRIFUGE_ACTIVE6");
+ private static final CustomIcon GT8_6 = new CustomIcon("iconsets/LARGECENTRIFUGE6");
+ private static final CustomIcon GT8_7_Active = new CustomIcon("iconsets/LARGECENTRIFUGE_ACTIVE7");
+ private static final CustomIcon GT8_7 = new CustomIcon("iconsets/LARGECENTRIFUGE7");
+ private static final CustomIcon GT8_8_Active = new CustomIcon("iconsets/LARGECENTRIFUGE_ACTIVE8");
+ private static final CustomIcon GT8_8 = new CustomIcon("iconsets/LARGECENTRIFUGE8");
+ private static final CustomIcon GT8_9_Active = new CustomIcon("iconsets/LARGECENTRIFUGE_ACTIVE9");
+ private static final CustomIcon GT8_9 = new CustomIcon("iconsets/LARGECENTRIFUGE9");
+
public static final CustomIcon TEXTURE_TECH_PANEL_D = new CustomIcon("metro/TEXTURE_TECH_PANEL_D");
public static final CustomIcon TEXTURE_TECH_PANEL_H = new CustomIcon("metro/TEXTURE_TECH_PANEL_H");
@@ -593,4 +608,10 @@ public class TexturesGtBlock {
TEXTURE_CASING_TIERED_LV, TEXTURE_CASING_TIERED_MV, TEXTURE_CASING_TIERED_HV, TEXTURE_CASING_TIERED_EV,
TEXTURE_CASING_TIERED_IV, TEXTURE_CASING_TIERED_LuV, TEXTURE_CASING_TIERED_ZPM, TEXTURE_CASING_TIERED_UV,
TEXTURE_CASING_TIERED_MAX };
+
+ public static IIconContainer[] CENTRIFUGE = new IIconContainer[] { GT8_1, GT8_2, GT8_3, GT8_4, GT8_5, GT8_6, GT8_7,
+ GT8_8, GT8_9 };
+
+ public static IIconContainer[] CENTRIFUGEACTIVE = new IIconContainer[] { GT8_1_Active, GT8_2_Active, GT8_3_Active,
+ GT8_4_Active, GT8_5_Active, GT8_6_Active, GT8_7_Active, GT8_8_Active, GT8_9_Active };
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineGas.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineGas.java
index 31450cc303..93ec17e6ea 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineGas.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineGas.java
@@ -14,10 +14,8 @@ import net.minecraftforge.fluids.FluidStack;
import org.jetbrains.annotations.NotNull;
import gregtech.api.enums.Materials;
-import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.objects.GTRenderedTexture;
import gregtech.api.recipe.RecipeMap;
import gregtech.api.recipe.RecipeMaps;
import gregtech.api.recipe.check.CheckRecipeResult;
@@ -26,7 +24,6 @@ import gregtech.api.recipe.maps.FuelBackend;
import gregtech.api.util.GTRecipe;
import gregtech.api.util.GTUtility;
import gregtech.api.util.TurbineStatCalculator;
-import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
@SuppressWarnings("deprecation")
public class MTELargeTurbineGas extends MTELargerTurbineBase {
@@ -200,14 +197,4 @@ public class MTELargeTurbineGas extends MTELargerTurbineBase {
protected String getCasingName() {
return "Reinforced Gas Turbine Casing";
}
-
- @Override
- protected ITexture getTextureFrontFace() {
- return new GTRenderedTexture(TexturesGtBlock.Overlay_Machine_Controller_Advanced);
- }
-
- @Override
- protected ITexture getTextureFrontFaceActive() {
- return new GTRenderedTexture(TexturesGtBlock.Overlay_Machine_Controller_Advanced_Active);
- }
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineSCSteam.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineSCSteam.java
index a608cbfc07..fddacc5662 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineSCSteam.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineSCSteam.java
@@ -7,16 +7,13 @@ import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import gregtech.api.enums.Materials;
-import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.render.TextureFactory;
import gregtech.api.util.GTModHandler;
import gregtech.api.util.GTUtility;
import gregtech.api.util.TurbineStatCalculator;
import gtPlusPlus.core.lib.GTPPCore;
import gtPlusPlus.core.util.math.MathUtils;
-import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
public class MTELargeTurbineSCSteam extends MTELargerTurbineBase {
@@ -160,14 +157,4 @@ public class MTELargeTurbineSCSteam extends MTELargerTurbineBase {
protected String getCasingName() {
return "Reinforced SC Turbine Casing";
}
-
- @Override
- protected ITexture getTextureFrontFace() {
- return TextureFactory.of(TexturesGtBlock.Overlay_Machine_Controller_Advanced);
- }
-
- @Override
- protected ITexture getTextureFrontFaceActive() {
- return TextureFactory.of(TexturesGtBlock.Overlay_Machine_Controller_Advanced_Active);
- }
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineSHSteam.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineSHSteam.java
index afa13de0be..25650fad08 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineSHSteam.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineSHSteam.java
@@ -7,15 +7,12 @@ import net.minecraftforge.fluids.FluidStack;
import gregtech.GTMod;
import gregtech.api.enums.Materials;
-import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.objects.GTRenderedTexture;
import gregtech.api.util.GTModHandler;
import gregtech.api.util.TurbineStatCalculator;
import gtPlusPlus.core.lib.GTPPCore;
import gtPlusPlus.core.util.math.MathUtils;
-import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
@SuppressWarnings("deprecation")
public class MTELargeTurbineSHSteam extends MTELargerTurbineBase {
@@ -176,14 +173,4 @@ public class MTELargeTurbineSHSteam extends MTELargerTurbineBase {
protected String getCasingName() {
return "Reinforced HP Steam Turbine Casing";
}
-
- @Override
- protected ITexture getTextureFrontFace() {
- return new GTRenderedTexture(TexturesGtBlock.Overlay_Machine_Controller_Advanced);
- }
-
- @Override
- protected ITexture getTextureFrontFaceActive() {
- return new GTRenderedTexture(TexturesGtBlock.Overlay_Machine_Controller_Advanced_Active);
- }
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineSteam.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineSteam.java
index 72a50cacf3..0de134950c 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineSteam.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineSteam.java
@@ -8,14 +8,11 @@ import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidStack;
import gregtech.GTMod;
-import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.objects.GTRenderedTexture;
import gregtech.api.util.GTModHandler;
import gregtech.api.util.TurbineStatCalculator;
import gtPlusPlus.core.util.math.MathUtils;
-import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
@SuppressWarnings("deprecation")
public class MTELargeTurbineSteam extends MTELargerTurbineBase {
@@ -187,14 +184,4 @@ public class MTELargeTurbineSteam extends MTELargerTurbineBase {
protected String getCasingName() {
return "Reinforced Steam Turbine Casing";
}
-
- @Override
- protected ITexture getTextureFrontFace() {
- return new GTRenderedTexture(TexturesGtBlock.Overlay_Machine_Controller_Advanced);
- }
-
- @Override
- protected ITexture getTextureFrontFaceActive() {
- return new GTRenderedTexture(TexturesGtBlock.Overlay_Machine_Controller_Advanced_Active);
- }
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbineBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbineBase.java
index 6e471c2829..dc2f105bbb 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbineBase.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbineBase.java
@@ -57,10 +57,64 @@ import gtPlusPlus.core.util.math.MathUtils;
import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.MTEHatchTurbine;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
+import gtPlusPlus.xmod.gregtech.api.objects.GTPPRenderedTexture;
+import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
public abstract class MTELargerTurbineBase extends GTPPMultiBlockBase<MTELargerTurbineBase>
implements ISurvivalConstructable {
+ private static final String STRUCTURE_PIECE_MAIN = "main";
+ private static final ClassValue<IStructureDefinition<MTELargerTurbineBase>> STRUCTURE_DEFINITION = new ClassValue<>() {
+
+ @Override
+ @SuppressWarnings("SpellCheckingInspection")
+ protected IStructureDefinition<MTELargerTurbineBase> computeValue(Class<?> type) {
+ return StructureDefinition.<MTELargerTurbineBase>builder()
+ // c = turbine casing
+ // s = turbine shaft
+ // t = turbine housing
+ // h = dynamo/maint
+ // m = muffler
+ .addShape(
+ STRUCTURE_PIECE_MAIN,
+ (new String[][] { { "ccchccc", "ccccccc", "ccmmmcc", "ccm~mcc", "ccmmmcc", "ccccccc", "ccchccc" },
+ { "ctchctc", "cscccsc", "cscccsc", "cscccsc", "cscccsc", "cscccsc", "ctchctc" },
+ { "ccchccc", "ccccccc", "ccccccc", "ccccccc", "ccccccc", "ccccccc", "ccchccc" },
+ { "ccchccc", "ccccccc", "ccccccc", "ccccccc", "ccccccc", "ccccccc", "ccchccc" },
+ { "ctchctc", "cscccsc", "cscccsc", "cscccsc", "cscccsc", "cscccsc", "ctchctc" },
+ { "ccchccc", "ccccccc", "ccccccc", "ccccccc", "ccccccc", "ccccccc", "ccchccc" },
+ { "ccchccc", "ccccccc", "ccccccc", "ccccccc", "ccccccc", "ccccccc", "ccchccc" },
+ { "ctchctc", "cscccsc", "cscccsc", "cscccsc", "cscccsc", "cscccsc", "ctchctc" },
+ { "ccchccc", "ccccccc", "ccccccc", "ccccccc", "ccccccc", "ccccccc", "ccchccc" }, }))
+ .addElement('c', lazy(t -> ofBlock(t.getCasingBlock(), t.getCasingMeta())))
+ .addElement('s', lazy(t -> ofBlock(t.getShaftBlock(), t.getTurbineShaftMeta())))
+ .addElement(
+ 't',
+ lazy(
+ t -> buildHatchAdder(MTELargerTurbineBase.class).adder(MTELargerTurbineBase::addTurbineHatch)
+ .hatchClass(MTEHatchTurbine.class)
+ .casingIndex(t.getCasingTextureIndex())
+ .dot(1)
+ .build()))
+ .addElement(
+ 'h',
+ lazy(
+ t -> buildHatchAdder(MTELargerTurbineBase.class)
+ .atLeast(InputBus, InputHatch, OutputHatch, Dynamo.or(TTDynamo), Maintenance)
+ .casingIndex(t.getCasingTextureIndex())
+ .dot(4)
+ .buildAndChain(t.getCasingBlock(), t.getCasingMeta())))
+ .addElement(
+ 'm',
+ lazy(
+ t -> buildHatchAdder(MTELargerTurbineBase.class).atLeast(Muffler)
+ .casingIndex(t.getCasingTextureIndex())
+ .dot(7)
+ .buildAndChain(t.getCasingBlock(), t.getCasingMeta())))
+ .build();
+ }
+ };
+
protected int baseEff = 0;
protected long optFlow = 0;
protected long euPerTurbine = 0;
@@ -71,27 +125,20 @@ public abstract class MTELargerTurbineBase extends GTPPMultiBlockBase<MTELargerT
protected double mufflerReduction = 1;
protected float[] flowMultipliers = new float[] { 1, 1, 1 };
- public ITexture frontFace;
- public ITexture frontFaceActive;
+ public ITexture frontFace = new GTPPRenderedTexture(TexturesGtBlock.Overlay_Machine_Controller_Advanced);
+ public ITexture frontFaceActive = new GTPPRenderedTexture(
+ TexturesGtBlock.Overlay_Machine_Controller_Advanced_Active);
public ArrayList<MTEHatchTurbine> mTurbineRotorHatches = new ArrayList<>();
public MTELargerTurbineBase(int aID, String aName, String aNameRegional) {
super(aID, aName, aNameRegional);
- frontFace = getTextureFrontFace();
- frontFaceActive = getTextureFrontFaceActive();
}
public MTELargerTurbineBase(String aName) {
super(aName);
- frontFace = getTextureFrontFace();
- frontFaceActive = getTextureFrontFaceActive();
}
- protected abstract ITexture getTextureFrontFace();
-
- protected abstract ITexture getTextureFrontFaceActive();
-
protected abstract String getTurbineType();
protected abstract String getCasingName();
@@ -135,58 +182,6 @@ public abstract class MTELargerTurbineBase extends GTPPMultiBlockBase<MTELargerT
return tt;
}
- private static final String STRUCTURE_PIECE_MAIN = "main";
- private static final ClassValue<IStructureDefinition<MTELargerTurbineBase>> STRUCTURE_DEFINITION = new ClassValue<>() {
-
- @Override
- @SuppressWarnings("SpellCheckingInspection")
- protected IStructureDefinition<MTELargerTurbineBase> computeValue(Class<?> type) {
- return StructureDefinition.<MTELargerTurbineBase>builder()
- // c = turbine casing
- // s = turbine shaft
- // t = turbine housing
- // h = dynamo/maint
- // m = muffler
- .addShape(
- STRUCTURE_PIECE_MAIN,
- (new String[][] { { "ccchccc", "ccccccc", "ccmmmcc", "ccm~mcc", "ccmmmcc", "ccccccc", "ccchccc" },
- { "ctchctc", "cscccsc", "cscccsc", "cscccsc", "cscccsc", "cscccsc", "ctchctc" },
- { "ccchccc", "ccccccc", "ccccccc", "ccccccc", "ccccccc", "ccccccc", "ccchccc" },
- { "ccchccc", "ccccccc", "ccccccc", "ccccccc", "ccccccc", "ccccccc", "ccchccc" },
- { "ctchctc", "cscccsc", "cscccsc", "cscccsc", "cscccsc", "cscccsc", "ctchctc" },
- { "ccchccc", "ccccccc", "ccccccc", "ccccccc", "ccccccc", "ccccccc", "ccchccc" },
- { "ccchccc", "ccccccc", "ccccccc", "ccccccc", "ccccccc", "ccccccc", "ccchccc" },
- { "ctchctc", "cscccsc", "cscccsc", "cscccsc", "cscccsc", "cscccsc", "ctchctc" },
- { "ccchccc", "ccccccc", "ccccccc", "ccccccc", "ccccccc", "ccccccc", "ccchccc" }, }))
- .addElement('c', lazy(t -> ofBlock(t.getCasingBlock(), t.getCasingMeta())))
- .addElement('s', lazy(t -> ofBlock(t.getShaftBlock(), t.getTurbineShaftMeta())))
- .addElement(
- 't',
- lazy(
- t -> buildHatchAdder(MTELargerTurbineBase.class).adder(MTELargerTurbineBase::addTurbineHatch)
- .hatchClass(MTEHatchTurbine.class)
- .casingIndex(t.getCasingTextureIndex())
- .dot(1)
- .build()))
- .addElement(
- 'h',
- lazy(
- t -> buildHatchAdder(MTELargerTurbineBase.class)
- .atLeast(InputBus, InputHatch, OutputHatch, Dynamo.or(TTDynamo), Maintenance)
- .casingIndex(t.getCasingTextureIndex())
- .dot(4)
- .buildAndChain(t.getCasingBlock(), t.getCasingMeta())))
- .addElement(
- 'm',
- lazy(
- t -> buildHatchAdder(MTELargerTurbineBase.class).atLeast(Muffler)
- .casingIndex(t.getCasingTextureIndex())
- .dot(7)
- .buildAndChain(t.getCasingBlock(), t.getCasingMeta())))
- .build();
- }
- };
-
@Override
public IStructureDefinition<MTELargerTurbineBase> getStructureDefinition() {
return STRUCTURE_DEFINITION.get(getClass());
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbinePlasma.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbinePlasma.java
index 2fa2c1aed9..3385125bb7 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbinePlasma.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbinePlasma.java
@@ -8,11 +8,9 @@ import net.minecraftforge.fluids.FluidStack;
import org.jetbrains.annotations.NotNull;
-import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.items.MetaGeneratedTool;
-import gregtech.api.objects.GTRenderedTexture;
import gregtech.api.recipe.RecipeMap;
import gregtech.api.recipe.RecipeMaps;
import gregtech.api.recipe.check.CheckRecipeResult;
@@ -24,7 +22,6 @@ import gregtech.api.util.TurbineStatCalculator;
import gregtech.api.util.shutdown.ShutDownReasonRegistry;
import gtPlusPlus.core.util.math.MathUtils;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.MTEHatchTurbine;
-import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
@SuppressWarnings("deprecation")
public class MTELargerTurbinePlasma extends MTELargerTurbineBase {
@@ -295,14 +292,4 @@ public class MTELargerTurbinePlasma extends MTELargerTurbineBase {
protected String getCasingName() {
return "Reinforced Plasma Turbine Casing";
}
-
- @Override
- protected ITexture getTextureFrontFace() {
- return new GTRenderedTexture(TexturesGtBlock.Overlay_Machine_Controller_Advanced);
- }
-
- @Override
- protected ITexture getTextureFrontFaceActive() {
- return new GTRenderedTexture(TexturesGtBlock.Overlay_Machine_Controller_Advanced_Active);
- }
}
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_DEEP_DARK_RAW.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_DEEP_DARK_RAW.png
index baa8c91218..789bea621a 100644
--- a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_DEEP_DARK_RAW.png
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_DEEP_DARK_RAW.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_QUARK_PIPE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_QUARK_PIPE.png
index 2e7e8274e1..71fe8aba7f 100644
--- a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_QUARK_PIPE.png
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_QUARK_PIPE.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_QUARK_PIPE.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_QUARK_PIPE.png.mcmeta
index 24c3794bf6..f3da053bce 100644
--- a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_QUARK_PIPE.png.mcmeta
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_QUARK_PIPE.png.mcmeta
@@ -1,5 +1,5 @@
{
"animation":{
- "frametime": 3
+ "frametime": 2
}
} \ No newline at end of file
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/HIDDEN_FACE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/HIDDEN_FACE.png
index a9c630ccf5..05d3e69b96 100644
--- a/src/main/resources/assets/gregtech/textures/blocks/iconsets/HIDDEN_FACE.png
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/HIDDEN_FACE.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_ACIDHAZARD.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_ACIDHAZARD.png
index 3c0e297f26..de0aa413d8 100644
--- a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_ACIDHAZARD.png
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_ACIDHAZARD.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_BIOHAZARD.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_BIOHAZARD.png
index a096022dfa..0b03d52a01 100644
--- a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_BIOHAZARD.png
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_BIOHAZARD.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_EXPLOSIONHAZARD.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_EXPLOSIONHAZARD.png
index bb884669df..a432c30f21 100644
--- a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_EXPLOSIONHAZARD.png
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_EXPLOSIONHAZARD.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_FIREHAZARD.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_FIREHAZARD.png
index 41176cfb6c..2a9b1b2b79 100644
--- a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_FIREHAZARD.png
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_FIREHAZARD.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_FROSTHAZARD.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_FROSTHAZARD.png
index d7db363020..1d9c34d4e6 100644
--- a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_FROSTHAZARD.png
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_FROSTHAZARD.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_MAGICHAZARD.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_MAGICHAZARD.png
index 71e7f3a956..b7a0305073 100644
--- a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_MAGICHAZARD.png
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_MAGICHAZARD.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_NOISEHAZARD.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_NOISEHAZARD.png
index 7189ed4bd7..17f02c2639 100644
--- a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_NOISEHAZARD.png
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_NOISEHAZARD.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_RADIOACTIVEHAZARD.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_RADIOACTIVEHAZARD.png
index e19d365d19..205dac6804 100644
--- a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_RADIOACTIVEHAZARD.png
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_RADIOACTIVEHAZARD.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/RADIATOR_MS160.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/RADIATOR_MS160.png
index 432fc4a021..ca3d2686ea 100644
--- a/src/main/resources/assets/gregtech/textures/blocks/iconsets/RADIATOR_MS160.png
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/RADIATOR_MS160.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.Volumetric_Flask.png b/src/main/resources/assets/gregtech/textures/items/gt.Volumetric_Flask.png
index f24a6a173b..da288cc60d 100644
--- a/src/main/resources/assets/gregtech/textures/items/gt.Volumetric_Flask.png
+++ b/src/main/resources/assets/gregtech/textures/items/gt.Volumetric_Flask.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.Volumetric_Flask.window.png b/src/main/resources/assets/gregtech/textures/items/gt.Volumetric_Flask.window.png
index ed91d3d591..db498f9f45 100644
--- a/src/main/resources/assets/gregtech/textures/items/gt.Volumetric_Flask.window.png
+++ b/src/main/resources/assets/gregtech/textures/items/gt.Volumetric_Flask.window.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.Volumetric_Flask_32k.png b/src/main/resources/assets/gregtech/textures/items/gt.Volumetric_Flask_32k.png
index 13b37c999d..5494291826 100644
--- a/src/main/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 differ
diff --git a/src/main/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
index 3fd5382926..3c84610fe0 100644
--- a/src/main/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 differ
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.Volumetric_Flask_8k.png b/src/main/resources/assets/gregtech/textures/items/gt.Volumetric_Flask_8k.png
index ffd9d4893b..11488d4f04 100644
--- a/src/main/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 differ
diff --git a/src/main/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
index a08018f561..01ccda10a6 100644
--- a/src/main/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 differ
diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/stickLong_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/stickLong_OVERLAY.png
index 99a3fb2e2b..b647c567e5 100644
--- a/src/main/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 differ
diff --git a/src/main/resources/assets/gtnhlanth/textures/items/particle/alpha.png b/src/main/resources/assets/gtnhlanth/textures/items/particle/alpha.png
index 24fcb6cfb7..1c22f3cffa 100644
--- a/src/main/resources/assets/gtnhlanth/textures/items/particle/alpha.png
+++ b/src/main/resources/assets/gtnhlanth/textures/items/particle/alpha.png
Binary files differ
diff --git a/src/main/resources/assets/gtnhlanth/textures/items/particle/electron.png b/src/main/resources/assets/gtnhlanth/textures/items/particle/electron.png
index 8c7dac8bfe..f3dc20a0aa 100644
--- a/src/main/resources/assets/gtnhlanth/textures/items/particle/electron.png
+++ b/src/main/resources/assets/gtnhlanth/textures/items/particle/electron.png
Binary files differ
diff --git a/src/main/resources/assets/gtnhlanth/textures/items/particle/neutron.png b/src/main/resources/assets/gtnhlanth/textures/items/particle/neutron.png
index 8a865844d1..ebd56be814 100644
--- a/src/main/resources/assets/gtnhlanth/textures/items/particle/neutron.png
+++ b/src/main/resources/assets/gtnhlanth/textures/items/particle/neutron.png
Binary files differ
diff --git a/src/main/resources/assets/gtnhlanth/textures/items/particle/photon.png b/src/main/resources/assets/gtnhlanth/textures/items/particle/photon.png
index de92250071..9231a212f9 100644
--- a/src/main/resources/assets/gtnhlanth/textures/items/particle/photon.png
+++ b/src/main/resources/assets/gtnhlanth/textures/items/particle/photon.png
Binary files differ
diff --git a/src/main/resources/assets/gtnhlanth/textures/items/particle/proton.png b/src/main/resources/assets/gtnhlanth/textures/items/particle/proton.png
index b081e83dfa..13afe32ffa 100644
--- a/src/main/resources/assets/gtnhlanth/textures/items/particle/proton.png
+++ b/src/main/resources/assets/gtnhlanth/textures/items/particle/proton.png
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/blocks/Blank.png b/src/main/resources/assets/miscutils/textures/blocks/Blank.png
deleted file mode 100644
index 4d7beb8065..0000000000
--- a/src/main/resources/assets/miscutils/textures/blocks/Blank.png
+++ /dev/null
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/blocks/CosmicFabricManipulator.png b/src/main/resources/assets/miscutils/textures/blocks/CosmicFabricManipulator.png
deleted file mode 100644
index 6514089c64..0000000000
--- a/src/main/resources/assets/miscutils/textures/blocks/CosmicFabricManipulator.png
+++ /dev/null
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/blocks/CosmicFabricManipulator.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/CosmicFabricManipulator.png.mcmeta
deleted file mode 100644
index cba1c43271..0000000000
--- a/src/main/resources/assets/miscutils/textures/blocks/CosmicFabricManipulator.png.mcmeta
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "animation":{
- "frametime":2,
- "frames": [0,1,2,3,4,5,6, 7, 8, 9, 10, 11, 12, 13, 14, 15]
- }
-} \ No newline at end of file
diff --git a/src/main/resources/assets/miscutils/textures/blocks/CosmicFabricManipulatorStatic.png b/src/main/resources/assets/miscutils/textures/blocks/CosmicFabricManipulatorStatic.png
deleted file mode 100644
index 29b3a74f34..0000000000
--- a/src/main/resources/assets/miscutils/textures/blocks/CosmicFabricManipulatorStatic.png
+++ /dev/null
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/blocks/CosmicFabricShieldingCore.png b/src/main/resources/assets/miscutils/textures/blocks/CosmicFabricShieldingCore.png
deleted file mode 100644
index 14b5e673d0..0000000000
--- a/src/main/resources/assets/miscutils/textures/blocks/CosmicFabricShieldingCore.png
+++ /dev/null
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/blocks/CosmicFabricShieldingCore.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/CosmicFabricShieldingCore.png.mcmeta
deleted file mode 100644
index 10cf8c6afd..0000000000
--- a/src/main/resources/assets/miscutils/textures/blocks/CosmicFabricShieldingCore.png.mcmeta
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "animation":{
- "frametime":1,
- "frames": [0, 0, 0, 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
- }
-} \ No newline at end of file
diff --git a/src/main/resources/assets/miscutils/textures/blocks/CosmicFabricShieldingCoreStatic.png b/src/main/resources/assets/miscutils/textures/blocks/CosmicFabricShieldingCoreStatic.png
deleted file mode 100644
index 53e0e51c06..0000000000
--- a/src/main/resources/assets/miscutils/textures/blocks/CosmicFabricShieldingCoreStatic.png
+++ /dev/null
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/blocks/ForceFieldGlass.png b/src/main/resources/assets/miscutils/textures/blocks/ForceFieldGlass.png
deleted file mode 100644
index ad6502026e..0000000000
--- a/src/main/resources/assets/miscutils/textures/blocks/ForceFieldGlass.png
+++ /dev/null
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/blocks/InfinityInfusedManipulator.png b/src/main/resources/assets/miscutils/textures/blocks/InfinityInfusedManipulator.png
deleted file mode 100644
index c5d7fe80b2..0000000000
--- a/src/main/resources/assets/miscutils/textures/blocks/InfinityInfusedManipulator.png
+++ /dev/null
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/blocks/InfinityInfusedManipulator.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/InfinityInfusedManipulator.png.mcmeta
deleted file mode 100644
index b0c531fa79..0000000000
--- a/src/main/resources/assets/miscutils/textures/blocks/InfinityInfusedManipulator.png.mcmeta
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "animation":{
- "frametime":1,
- "frames": [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15]
- }
-} \ No newline at end of file
diff --git a/src/main/resources/assets/miscutils/textures/blocks/InfinityInfusedManipulatorStatic.png b/src/main/resources/assets/miscutils/textures/blocks/InfinityInfusedManipulatorStatic.png
deleted file mode 100644
index 40d9b8f31b..0000000000
--- a/src/main/resources/assets/miscutils/textures/blocks/InfinityInfusedManipulatorStatic.png
+++ /dev/null
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/blocks/InfinityInfusedShieldingCore.png b/src/main/resources/assets/miscutils/textures/blocks/InfinityInfusedShieldingCore.png
deleted file mode 100644
index 4e2e761fa8..0000000000
--- a/src/main/resources/assets/miscutils/textures/blocks/InfinityInfusedShieldingCore.png
+++ /dev/null
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/blocks/InfinityInfusedShieldingCore.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/InfinityInfusedShieldingCore.png.mcmeta
deleted file mode 100644
index 9720a23866..0000000000
--- a/src/main/resources/assets/miscutils/textures/blocks/InfinityInfusedShieldingCore.png.mcmeta
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "animation":{
- "frametime":1,
- "frames": [0, 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19]
- }
-} \ No newline at end of file
diff --git a/src/main/resources/assets/miscutils/textures/blocks/InfinityInfusedShieldingCoreStatic.png b/src/main/resources/assets/miscutils/textures/blocks/InfinityInfusedShieldingCoreStatic.png
deleted file mode 100644
index c822112126..0000000000
--- a/src/main/resources/assets/miscutils/textures/blocks/InfinityInfusedShieldingCoreStatic.png
+++ /dev/null
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/blocks/Manipulator_Top.png b/src/main/resources/assets/miscutils/textures/blocks/Manipulator_Top.png
deleted file mode 100644
index 2a5b8aec95..0000000000
--- a/src/main/resources/assets/miscutils/textures/blocks/Manipulator_Top.png
+++ /dev/null
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/blocks/NeutronPulseManipulator.png b/src/main/resources/assets/miscutils/textures/blocks/NeutronPulseManipulator.png
deleted file mode 100644
index 97c32e5988..0000000000
--- a/src/main/resources/assets/miscutils/textures/blocks/NeutronPulseManipulator.png
+++ /dev/null
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/blocks/NeutronPulseManipulator.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/NeutronPulseManipulator.png.mcmeta
deleted file mode 100644
index cba1c43271..0000000000
--- a/src/main/resources/assets/miscutils/textures/blocks/NeutronPulseManipulator.png.mcmeta
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "animation":{
- "frametime":2,
- "frames": [0,1,2,3,4,5,6, 7, 8, 9, 10, 11, 12, 13, 14, 15]
- }
-} \ No newline at end of file
diff --git a/src/main/resources/assets/miscutils/textures/blocks/NeutronPulseManipulatorStatic.png b/src/main/resources/assets/miscutils/textures/blocks/NeutronPulseManipulatorStatic.png
deleted file mode 100644
index 29b3a74f34..0000000000
--- a/src/main/resources/assets/miscutils/textures/blocks/NeutronPulseManipulatorStatic.png
+++ /dev/null
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/blocks/NeutronShieldingCore.png b/src/main/resources/assets/miscutils/textures/blocks/NeutronShieldingCore.png
deleted file mode 100644
index 9c14ae0abf..0000000000
--- a/src/main/resources/assets/miscutils/textures/blocks/NeutronShieldingCore.png
+++ /dev/null
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/blocks/NeutronShieldingCore.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/NeutronShieldingCore.png.mcmeta
deleted file mode 100644
index 163c81b6a1..0000000000
--- a/src/main/resources/assets/miscutils/textures/blocks/NeutronShieldingCore.png.mcmeta
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "animation":{
- "frametime":1,
- "frames": [0, 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]
- }
-} \ No newline at end of file
diff --git a/src/main/resources/assets/miscutils/textures/blocks/NeutronShieldingCoreStatic.png b/src/main/resources/assets/miscutils/textures/blocks/NeutronShieldingCoreStatic.png
deleted file mode 100644
index d4cd1c1dee..0000000000
--- a/src/main/resources/assets/miscutils/textures/blocks/NeutronShieldingCoreStatic.png
+++ /dev/null
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/blocks/SpaceTimeBendingCore.png b/src/main/resources/assets/miscutils/textures/blocks/SpaceTimeBendingCore.png
deleted file mode 100644
index bb8bee0ce7..0000000000
--- a/src/main/resources/assets/miscutils/textures/blocks/SpaceTimeBendingCore.png
+++ /dev/null
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/blocks/SpaceTimeBendingCore.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/SpaceTimeBendingCore.png.mcmeta
deleted file mode 100644
index 163c81b6a1..0000000000
--- a/src/main/resources/assets/miscutils/textures/blocks/SpaceTimeBendingCore.png.mcmeta
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "animation":{
- "frametime":1,
- "frames": [0, 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]
- }
-} \ No newline at end of file
diff --git a/src/main/resources/assets/miscutils/textures/blocks/SpaceTimeBendingCoreStatic.png b/src/main/resources/assets/miscutils/textures/blocks/SpaceTimeBendingCoreStatic.png
deleted file mode 100644
index ca38aad14f..0000000000
--- a/src/main/resources/assets/miscutils/textures/blocks/SpaceTimeBendingCoreStatic.png
+++ /dev/null
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/blocks/SpaceTimeContinuumRipper.png b/src/main/resources/assets/miscutils/textures/blocks/SpaceTimeContinuumRipper.png
deleted file mode 100644
index bb21d8af98..0000000000
--- a/src/main/resources/assets/miscutils/textures/blocks/SpaceTimeContinuumRipper.png
+++ /dev/null
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/blocks/SpaceTimeContinuumRipper.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/SpaceTimeContinuumRipper.png.mcmeta
deleted file mode 100644
index c8988534a9..0000000000
--- a/src/main/resources/assets/miscutils/textures/blocks/SpaceTimeContinuumRipper.png.mcmeta
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "animation":{
- "frametime":1,
- "frames": [0,1,2,3,4,5,6,7]
- }
-} \ No newline at end of file
diff --git a/src/main/resources/assets/miscutils/textures/blocks/SpaceTimeContinuumRipperStatic.png b/src/main/resources/assets/miscutils/textures/blocks/SpaceTimeContinuumRipperStatic.png
deleted file mode 100644
index c54c56daaf..0000000000
--- a/src/main/resources/assets/miscutils/textures/blocks/SpaceTimeContinuumRipperStatic.png
+++ /dev/null
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/CASING_AMAZON.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/CASING_AMAZON.png
index 88d5cb9c72..de6f943c9f 100644
--- a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/CASING_AMAZON.png
+++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/CASING_AMAZON.png
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_FLOTATION.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_FLOTATION.png
index 5965bfce89..7e02fcdab1 100644
--- a/src/main/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 differ
diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_ROCKETDYNE.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_ROCKETDYNE.png
index 89fed025b4..f24266c323 100644
--- a/src/main/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 differ
diff --git a/src/main/resources/assets/miscutils/textures/blocks/TileEntities/sterileCasing.png b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/sterileCasing.png
new file mode 100644
index 0000000000..5291474da5
--- /dev/null
+++ b/src/main/resources/assets/miscutils/textures/blocks/TileEntities/sterileCasing.png
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalFunnel.png b/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalFunnel.png
index e52a1b11dc..d0a66ed92b 100644
--- a/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalFunnel.png
+++ b/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalFunnel.png
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet8.png b/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet8.png
index 5307adb9f5..7f2b017049 100644
--- a/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet8.png
+++ b/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet8.png
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet9.png b/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet9.png
index 4862094cbd..bfc0586c60 100644
--- a/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet9.png
+++ b/src/main/resources/assets/miscutils/textures/blocks/chrono/MetalSheet9.png
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_MUFFLER_ADV.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/OVERLAY_MUFFLER_ADV.png
index ce88198867..801e50441c 100644
--- a/src/main/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 differ
diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_EV.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_EV.png
index d70927f140..5ca5b1e62b 100644
--- a/src/main/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 differ
diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_HV.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_HV.png
index 13310d6f57..cf89f9f8db 100644
--- a/src/main/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 differ
diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_IV.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_IV.png
index 7ef41870d4..8027f34aa4 100644
--- a/src/main/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 differ
diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_LV.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_LV.png
index e42acc5c01..52bdcf90d1 100644
--- a/src/main/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 differ
diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_LuV.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_LuV.png
index 440c987d6e..a22dab2acf 100644
--- a/src/main/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 differ
diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_MV.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_MV.png
index b1f29058ec..1468ac6127 100644
--- a/src/main/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 differ
diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_ULV.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_ULV.png
index 747adeb2e5..be94004d80 100644
--- a/src/main/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 differ
diff --git a/src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_ZPM.png b/src/main/resources/assets/miscutils/textures/blocks/iconsets/TieredHulls/CASING_ZPM.png
index 230e78fe96..5cbafde821 100644
--- a/src/main/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 differ
diff --git a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_MAGIC_A.png b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_MAGIC_A.png
index 1f53895490..1120574210 100644
--- a/src/main/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 differ
diff --git a/src/main/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
deleted file mode 100644
index 0285ac2f3b..0000000000
--- a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_MAGIC_A.png.mcmeta
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "animation":{
- "frametime":2,
- "frames": [0, 2, 3, 3, 4, 5, 6, 7, 7, 6, 5, 4, 3, 2, 1, 0]
- }
-} \ No newline at end of file
diff --git a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_MAGIC_B.png b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_MAGIC_B.png
index 265d18b0f7..e71a22d39f 100644
--- a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_MAGIC_B.png
+++ b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_MAGIC_B.png
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_MAGIC_B.png.mcmeta b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_MAGIC_B.png.mcmeta
deleted file mode 100644
index d0b9e70fe5..0000000000
--- a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_MAGIC_B.png.mcmeta
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "animation":{
- "frametime":4,
- "frames": [0, 2, 3, 3, 4, 5, 6, 7, 7, 6, 5, 4, 3, 2, 1, 0]
- }
-} \ No newline at end of file
diff --git a/src/main/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
index 8eeb0179d7..c5c1e72313 100644
--- a/src/main/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 differ
diff --git a/src/main/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
index ffac706bbd..b40e77a354 100644
--- a/src/main/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 differ
diff --git a/src/main/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
index 87c6017569..096cde5777 100644
--- a/src/main/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 differ
diff --git a/src/main/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
index 61d1f49a12..c77a32e02e 100644
--- a/src/main/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 differ
diff --git a/src/main/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
index 548c0ec283..5e19b6ae8c 100644
--- a/src/main/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 differ
diff --git a/src/main/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
deleted file mode 100644
index 172fab4657..0000000000
--- a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_METAL_PANEL_G.png
+++ /dev/null
Binary files differ
diff --git a/src/main/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
index 68ab46a03d..5f0dc4bae5 100644
--- a/src/main/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 differ
diff --git a/src/main/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
index 4443dc8024..d0a7d7c50a 100644
--- a/src/main/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 differ
diff --git a/src/main/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
index ed8ad55ba2..df053703c5 100644
--- a/src/main/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 differ
diff --git a/src/main/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
deleted file mode 100644
index ba9119c7ad..0000000000
--- a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_ORGANIC_PANEL_A_GLOWING.png.mcmeta
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "animation":{
- "frametime":1,
- "frames": [0, 2, 3, 3, 4, 5, 6, 7, 7, 6, 5, 4, 3, 2, 1, 0]
- }
-} \ No newline at end of file
diff --git a/src/main/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
index eb3257c754..beac1c9e13 100644
--- a/src/main/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 differ
diff --git a/src/main/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
index 3a1b683837..9a428fed61 100644
--- a/src/main/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 differ
diff --git a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_A.png b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_A.png
index 5bc352238f..0e25ad293b 100644
--- a/src/main/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 differ
diff --git a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_B.png b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_B.png
index 32b6735a0d..734f727c60 100644
--- a/src/main/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 differ
diff --git a/src/main/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
index 196600afdb..0c2c0bdab8 100644
--- a/src/main/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 differ
diff --git a/src/main/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
index 1bcd1ec78f..56138d0ba8 100644
--- a/src/main/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 differ
diff --git a/src/main/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
index 54381fcf21..9d5147bb61 100644
--- a/src/main/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 differ
diff --git a/src/main/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
index 0cf3f40762..9f8e6742cd 100644
--- a/src/main/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 differ
diff --git a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_PANEL_H.png b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_PANEL_H.png
index b4bc37fbda..b57be980e1 100644
--- a/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_PANEL_H.png
+++ b/src/main/resources/assets/miscutils/textures/blocks/metro/TEXTURE_TECH_PANEL_H.png
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/blocks/qft/blank.png b/src/main/resources/assets/miscutils/textures/blocks/qft/blank.png
new file mode 100644
index 0000000000..d93ed2dca3
--- /dev/null
+++ b/src/main/resources/assets/miscutils/textures/blocks/qft/blank.png
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/blocks/qft/forceFieldGlassTop.png b/src/main/resources/assets/miscutils/textures/blocks/qft/forceFieldGlassTop.png
deleted file mode 100644
index 97dbb4049e..0000000000
--- a/src/main/resources/assets/miscutils/textures/blocks/qft/forceFieldGlassTop.png
+++ /dev/null
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/blocks/rendering/ForceField.png b/src/main/resources/assets/miscutils/textures/blocks/rendering/ForceField.png
deleted file mode 100644
index 32254623d1..0000000000
--- a/src/main/resources/assets/miscutils/textures/blocks/rendering/ForceField.png
+++ /dev/null
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/blocks/special/block_3.png b/src/main/resources/assets/miscutils/textures/blocks/special/block_3.png
index c6376014e2..467d442352 100644
--- a/src/main/resources/assets/miscutils/textures/blocks/special/block_3.png
+++ b/src/main/resources/assets/miscutils/textures/blocks/special/block_3.png
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/blocks/special/block_7.png b/src/main/resources/assets/miscutils/textures/blocks/special/block_7.png
index a8f51c0b68..141c969fd7 100644
--- a/src/main/resources/assets/miscutils/textures/blocks/special/block_7.png
+++ b/src/main/resources/assets/miscutils/textures/blocks/special/block_7.png
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/100.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/100.png
index cedee004e4..f6031f32c6 100644
--- a/src/main/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 differ
diff --git a/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/100.png.mcmeta b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/100.png.mcmeta
new file mode 100644
index 0000000000..a4e44a4090
--- /dev/null
+++ b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/100.png.mcmeta
@@ -0,0 +1,72 @@
+{
+ "animation": { "frametime": 1, "frames": [
+ 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ 1,
+ 1,
+ 1,
+ 1,
+ 1,
+ 1,
+ 1,
+ 1,
+ 2,
+ 2,
+ 2,
+ 2,
+ 3,
+ 3,
+ 3,
+ 3,
+ 4,
+ 4,
+ 4,
+ 4,
+ 5,
+ 5,
+ 5,
+ 5,
+ 5,
+ 5,
+ 6,
+ 6,
+ 6,
+ 6,
+ 7,
+ 7,
+ 7,
+ 7,
+ 8,
+ 8,
+ 8,
+ 8,
+ 8,
+ 8,
+ 9,
+ 9,
+ 9,
+ 9,
+ 10,
+ 10,
+ 10,
+ 10,
+ 11,
+ 11,
+ 11,
+ 11,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 12,
+ 13,
+ 13,
+ 13,
+ 13
+ ]
+ }
+}
diff --git a/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/41.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/41.png
index 9b9c314475..e8f3b0d518 100644
--- a/src/main/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 differ
diff --git a/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/42.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/42.png
index b3f174ebd4..3dd5c5c4a7 100644
--- a/src/main/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 differ
diff --git a/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/43.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/43.png
index 0939c7eb87..5d0895e82f 100644
--- a/src/main/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 differ
diff --git a/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/44.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/44.png
index 23cc1deb66..4c1b4c1222 100644
--- a/src/main/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 differ
diff --git a/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/55.png b/src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/55.png
index 23e0a10e06..7336e19c22 100644
--- a/src/main/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 differ
diff --git a/src/main/resources/assets/miscutils/textures/items/baubles/itemFireProtectGlovesBetter.png b/src/main/resources/assets/miscutils/textures/items/baubles/itemFireProtectGlovesBetter.png
index 8576ae1b7a..5edd2b3721 100644
--- a/src/main/resources/assets/miscutils/textures/items/baubles/itemFireProtectGlovesBetter.png
+++ b/src/main/resources/assets/miscutils/textures/items/baubles/itemFireProtectGlovesBetter.png
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/bioscience/BasicAlgae.png b/src/main/resources/assets/miscutils/textures/items/bioscience/BasicAlgae.png
index efa1a6e0ca..7e198c1e6a 100644
--- a/src/main/resources/assets/miscutils/textures/items/bioscience/BasicAlgae.png
+++ b/src/main/resources/assets/miscutils/textures/items/bioscience/BasicAlgae.png
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/bioscience/BasicAlgae_Overlay.png b/src/main/resources/assets/miscutils/textures/items/bioscience/BasicAlgae_Overlay.png
deleted file mode 100644
index aaea7803b5..0000000000
--- a/src/main/resources/assets/miscutils/textures/items/bioscience/BasicAlgae_Overlay.png
+++ /dev/null
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/0.png b/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/0.png
index 57d77be16a..55b4decad1 100644
--- a/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/0.png
+++ b/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/0.png
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/1.png b/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/1.png
index 51bb4587d9..677ef9c645 100644
--- a/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/1.png
+++ b/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/1.png
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/2.png b/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/2.png
index 2cdf37adad..e6b0c062eb 100644
--- a/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/2.png
+++ b/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/2.png
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/3.png b/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/3.png
index c98e2d6319..11104196f5 100644
--- a/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/3.png
+++ b/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/3.png
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/4.png b/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/4.png
index af0bcc7064..01ff0173df 100644
--- a/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/4.png
+++ b/src/main/resources/assets/miscutils/textures/items/bioscience/MetaItem1/4.png
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/chargepack/1.png b/src/main/resources/assets/miscutils/textures/items/chargepack/1.png
index 9039d443c3..8f9abc21dc 100644
--- a/src/main/resources/assets/miscutils/textures/items/chargepack/1.png
+++ b/src/main/resources/assets/miscutils/textures/items/chargepack/1.png
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/chargepack/2.png b/src/main/resources/assets/miscutils/textures/items/chargepack/2.png
index 7023e7ce82..eaa2c6e16d 100644
--- a/src/main/resources/assets/miscutils/textures/items/chargepack/2.png
+++ b/src/main/resources/assets/miscutils/textures/items/chargepack/2.png
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/chargepack/3.png b/src/main/resources/assets/miscutils/textures/items/chargepack/3.png
index 4d787e7aa8..f17fe051d9 100644
--- a/src/main/resources/assets/miscutils/textures/items/chargepack/3.png
+++ b/src/main/resources/assets/miscutils/textures/items/chargepack/3.png
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/chargepack/4.png b/src/main/resources/assets/miscutils/textures/items/chargepack/4.png
index 9320de0611..5a2b5fd76d 100644
--- a/src/main/resources/assets/miscutils/textures/items/chargepack/4.png
+++ b/src/main/resources/assets/miscutils/textures/items/chargepack/4.png
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/chargepack/5.png b/src/main/resources/assets/miscutils/textures/items/chargepack/5.png
index ab8771c89c..59f16cb936 100644
--- a/src/main/resources/assets/miscutils/textures/items/chargepack/5.png
+++ b/src/main/resources/assets/miscutils/textures/items/chargepack/5.png
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/chargepack/6.png b/src/main/resources/assets/miscutils/textures/items/chargepack/6.png
index a01f435e72..60b233ecd0 100644
--- a/src/main/resources/assets/miscutils/textures/items/chargepack/6.png
+++ b/src/main/resources/assets/miscutils/textures/items/chargepack/6.png
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/chargepack/7.png b/src/main/resources/assets/miscutils/textures/items/chargepack/7.png
index fb5a5fba43..065cdfe465 100644
--- a/src/main/resources/assets/miscutils/textures/items/chargepack/7.png
+++ b/src/main/resources/assets/miscutils/textures/items/chargepack/7.png
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/chargepack/8.png b/src/main/resources/assets/miscutils/textures/items/chargepack/8.png
index aff1ec693f..be3c549823 100644
--- a/src/main/resources/assets/miscutils/textures/items/chargepack/8.png
+++ b/src/main/resources/assets/miscutils/textures/items/chargepack/8.png
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/chargepack/9.png b/src/main/resources/assets/miscutils/textures/items/chargepack/9.png
index 0b9cf4d18e..da1ef00af7 100644
--- a/src/main/resources/assets/miscutils/textures/items/chargepack/9.png
+++ b/src/main/resources/assets/miscutils/textures/items/chargepack/9.png
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/ion/0.png b/src/main/resources/assets/miscutils/textures/items/ion/0.png
deleted file mode 100644
index c56a04238f..0000000000
--- a/src/main/resources/assets/miscutils/textures/items/ion/0.png
+++ /dev/null
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/ion/1.png b/src/main/resources/assets/miscutils/textures/items/ion/1.png
deleted file mode 100644
index 174d2ad950..0000000000
--- a/src/main/resources/assets/miscutils/textures/items/ion/1.png
+++ /dev/null
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/ion/IonBase.png b/src/main/resources/assets/miscutils/textures/items/ion/IonBase.png
deleted file mode 100644
index fd342f7db2..0000000000
--- a/src/main/resources/assets/miscutils/textures/items/ion/IonBase.png
+++ /dev/null
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/ion0.png b/src/main/resources/assets/miscutils/textures/items/ion0.png
new file mode 100644
index 0000000000..e7dcfcd720
--- /dev/null
+++ b/src/main/resources/assets/miscutils/textures/items/ion0.png
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/ion1.png b/src/main/resources/assets/miscutils/textures/items/ion1.png
new file mode 100644
index 0000000000..19d2c6f09b
--- /dev/null
+++ b/src/main/resources/assets/miscutils/textures/items/ion1.png
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/itemAirFilter.png b/src/main/resources/assets/miscutils/textures/items/itemAirFilter.png
deleted file mode 100644
index da4b975517..0000000000
--- a/src/main/resources/assets/miscutils/textures/items/itemAirFilter.png
+++ /dev/null
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/itemAirFilter1.png b/src/main/resources/assets/miscutils/textures/items/itemAirFilter1.png
new file mode 100644
index 0000000000..e1923660b5
--- /dev/null
+++ b/src/main/resources/assets/miscutils/textures/items/itemAirFilter1.png
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/itemAirFilter2.png b/src/main/resources/assets/miscutils/textures/items/itemAirFilter2.png
new file mode 100644
index 0000000000..9d75ce6aa3
--- /dev/null
+++ b/src/main/resources/assets/miscutils/textures/items/itemAirFilter2.png
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/itemBasicTurbine.png b/src/main/resources/assets/miscutils/textures/items/itemBasicTurbine.png
index 62de905fb9..20bd1f90eb 100644
--- a/src/main/resources/assets/miscutils/textures/items/itemBasicTurbine.png
+++ b/src/main/resources/assets/miscutils/textures/items/itemBasicTurbine.png
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/itemBlueprint.png b/src/main/resources/assets/miscutils/textures/items/itemBlueprint.png
index 593ba0ac17..c8453c46b9 100644
--- a/src/main/resources/assets/miscutils/textures/items/itemBlueprint.png
+++ b/src/main/resources/assets/miscutils/textures/items/itemBlueprint.png
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/itemBoilerChassis.png b/src/main/resources/assets/miscutils/textures/items/itemBoilerChassis.png
deleted file mode 100644
index 1ac3bff818..0000000000
--- a/src/main/resources/assets/miscutils/textures/items/itemBoilerChassis.png
+++ /dev/null
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/itemBoilerChassis1.png b/src/main/resources/assets/miscutils/textures/items/itemBoilerChassis1.png
new file mode 100644
index 0000000000..cf44b0e5af
--- /dev/null
+++ b/src/main/resources/assets/miscutils/textures/items/itemBoilerChassis1.png
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/itemBoilerChassis2.png b/src/main/resources/assets/miscutils/textures/items/itemBoilerChassis2.png
new file mode 100644
index 0000000000..33f9f442de
--- /dev/null
+++ b/src/main/resources/assets/miscutils/textures/items/itemBoilerChassis2.png
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/itemBoilerChassis3.png b/src/main/resources/assets/miscutils/textures/items/itemBoilerChassis3.png
new file mode 100644
index 0000000000..cf29977a8c
--- /dev/null
+++ b/src/main/resources/assets/miscutils/textures/items/itemBoilerChassis3.png
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/itemDehydratorCoil.png b/src/main/resources/assets/miscutils/textures/items/itemDehydratorCoil.png
deleted file mode 100644
index c7a849556f..0000000000
--- a/src/main/resources/assets/miscutils/textures/items/itemDehydratorCoil.png
+++ /dev/null
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/itemDehydratorCoilWire.png b/src/main/resources/assets/miscutils/textures/items/itemDehydratorCoilWire.png
deleted file mode 100644
index 8687d1c8ca..0000000000
--- a/src/main/resources/assets/miscutils/textures/items/itemDehydratorCoilWire.png
+++ /dev/null
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoilWire_0.png b/src/main/resources/assets/miscutils/textures/items/itemDehydratorCoilWire_0.png
index 652f68aeb7..652f68aeb7 100644
--- a/src/main/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoilWire_0.png
+++ b/src/main/resources/assets/miscutils/textures/items/itemDehydratorCoilWire_0.png
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoilWire_1.png b/src/main/resources/assets/miscutils/textures/items/itemDehydratorCoilWire_1.png
index 7a14abccbd..7a14abccbd 100644
--- a/src/main/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoilWire_1.png
+++ b/src/main/resources/assets/miscutils/textures/items/itemDehydratorCoilWire_1.png
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoilWire_2.png b/src/main/resources/assets/miscutils/textures/items/itemDehydratorCoilWire_2.png
index cc0a5fe94d..cc0a5fe94d 100644
--- a/src/main/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoilWire_2.png
+++ b/src/main/resources/assets/miscutils/textures/items/itemDehydratorCoilWire_2.png
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoilWire_3.png b/src/main/resources/assets/miscutils/textures/items/itemDehydratorCoilWire_3.png
index ce0dbab306..ce0dbab306 100644
--- a/src/main/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoilWire_3.png
+++ b/src/main/resources/assets/miscutils/textures/items/itemDehydratorCoilWire_3.png
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoil_0.png b/src/main/resources/assets/miscutils/textures/items/itemDehydratorCoil_0.png
index 2b2f615676..2b2f615676 100644
--- a/src/main/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoil_0.png
+++ b/src/main/resources/assets/miscutils/textures/items/itemDehydratorCoil_0.png
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoil_1.png b/src/main/resources/assets/miscutils/textures/items/itemDehydratorCoil_1.png
index f01ba96be9..f01ba96be9 100644
--- a/src/main/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoil_1.png
+++ b/src/main/resources/assets/miscutils/textures/items/itemDehydratorCoil_1.png
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoil_2.png b/src/main/resources/assets/miscutils/textures/items/itemDehydratorCoil_2.png
index f57bb1308b..f57bb1308b 100644
--- a/src/main/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoil_2.png
+++ b/src/main/resources/assets/miscutils/textures/items/itemDehydratorCoil_2.png
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoil_3.png b/src/main/resources/assets/miscutils/textures/items/itemDehydratorCoil_3.png
index 77a416a3a6..77a416a3a6 100644
--- a/src/main/resources/assets/miscutils/textures/items/dehydrator/itemDehydratorCoil_3.png
+++ b/src/main/resources/assets/miscutils/textures/items/itemDehydratorCoil_3.png
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/particle/0.png b/src/main/resources/assets/miscutils/textures/items/particle/0.png
index a0a32d4508..e15e9a69e6 100644
--- a/src/main/resources/assets/miscutils/textures/items/particle/0.png
+++ b/src/main/resources/assets/miscutils/textures/items/particle/0.png
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/particle/1.png b/src/main/resources/assets/miscutils/textures/items/particle/1.png
index 4eddfa1727..87c8b1d3d4 100644
--- a/src/main/resources/assets/miscutils/textures/items/particle/1.png
+++ b/src/main/resources/assets/miscutils/textures/items/particle/1.png
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/particle/10.png b/src/main/resources/assets/miscutils/textures/items/particle/10.png
index 09eee049a9..91c9a5240b 100644
--- a/src/main/resources/assets/miscutils/textures/items/particle/10.png
+++ b/src/main/resources/assets/miscutils/textures/items/particle/10.png
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/particle/11.png b/src/main/resources/assets/miscutils/textures/items/particle/11.png
index 7f636919b6..34018752bb 100644
--- a/src/main/resources/assets/miscutils/textures/items/particle/11.png
+++ b/src/main/resources/assets/miscutils/textures/items/particle/11.png
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/particle/12.png b/src/main/resources/assets/miscutils/textures/items/particle/12.png
index 4e9504b03f..506c01930d 100644
--- a/src/main/resources/assets/miscutils/textures/items/particle/12.png
+++ b/src/main/resources/assets/miscutils/textures/items/particle/12.png
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/particle/13.png b/src/main/resources/assets/miscutils/textures/items/particle/13.png
index d929480c16..829228e732 100644
--- a/src/main/resources/assets/miscutils/textures/items/particle/13.png
+++ b/src/main/resources/assets/miscutils/textures/items/particle/13.png
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/particle/14.png b/src/main/resources/assets/miscutils/textures/items/particle/14.png
index 7338066c1a..b5fbcab100 100644
--- a/src/main/resources/assets/miscutils/textures/items/particle/14.png
+++ b/src/main/resources/assets/miscutils/textures/items/particle/14.png
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/particle/14.png.mcmeta b/src/main/resources/assets/miscutils/textures/items/particle/14.png.mcmeta
new file mode 100644
index 0000000000..eada83be81
--- /dev/null
+++ b/src/main/resources/assets/miscutils/textures/items/particle/14.png.mcmeta
@@ -0,0 +1 @@
+{ "animation": { "interpolate": true, "frametime": 4 } }
diff --git a/src/main/resources/assets/miscutils/textures/items/particle/15.png b/src/main/resources/assets/miscutils/textures/items/particle/15.png
index 189a3127d9..80f1a1a2ba 100644
--- a/src/main/resources/assets/miscutils/textures/items/particle/15.png
+++ b/src/main/resources/assets/miscutils/textures/items/particle/15.png
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/particle/16.png b/src/main/resources/assets/miscutils/textures/items/particle/16.png
index 8824201ff3..b5f23805f5 100644
--- a/src/main/resources/assets/miscutils/textures/items/particle/16.png
+++ b/src/main/resources/assets/miscutils/textures/items/particle/16.png
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/particle/17.png b/src/main/resources/assets/miscutils/textures/items/particle/17.png
index edea5115c0..8cab86da91 100644
--- a/src/main/resources/assets/miscutils/textures/items/particle/17.png
+++ b/src/main/resources/assets/miscutils/textures/items/particle/17.png
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/particle/18.png b/src/main/resources/assets/miscutils/textures/items/particle/18.png
index d3e63562d7..ad69842cda 100644
--- a/src/main/resources/assets/miscutils/textures/items/particle/18.png
+++ b/src/main/resources/assets/miscutils/textures/items/particle/18.png
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/particle/19.png b/src/main/resources/assets/miscutils/textures/items/particle/19.png
index 43f9278b2c..8074790eaa 100644
--- a/src/main/resources/assets/miscutils/textures/items/particle/19.png
+++ b/src/main/resources/assets/miscutils/textures/items/particle/19.png
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/particle/2.png b/src/main/resources/assets/miscutils/textures/items/particle/2.png
index 292207ae7e..de4f3e8fde 100644
--- a/src/main/resources/assets/miscutils/textures/items/particle/2.png
+++ b/src/main/resources/assets/miscutils/textures/items/particle/2.png
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/particle/20.png b/src/main/resources/assets/miscutils/textures/items/particle/20.png
index 0e2ce23565..bb622d23ee 100644
--- a/src/main/resources/assets/miscutils/textures/items/particle/20.png
+++ b/src/main/resources/assets/miscutils/textures/items/particle/20.png
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/particle/21.png b/src/main/resources/assets/miscutils/textures/items/particle/21.png
index 758fa46941..cb8a813db6 100644
--- a/src/main/resources/assets/miscutils/textures/items/particle/21.png
+++ b/src/main/resources/assets/miscutils/textures/items/particle/21.png
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/particle/22.png b/src/main/resources/assets/miscutils/textures/items/particle/22.png
index 08bda97b66..450c47a1f8 100644
--- a/src/main/resources/assets/miscutils/textures/items/particle/22.png
+++ b/src/main/resources/assets/miscutils/textures/items/particle/22.png
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/particle/23.png b/src/main/resources/assets/miscutils/textures/items/particle/23.png
index 9ba21b22eb..78176654b2 100644
--- a/src/main/resources/assets/miscutils/textures/items/particle/23.png
+++ b/src/main/resources/assets/miscutils/textures/items/particle/23.png
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/particle/24.png b/src/main/resources/assets/miscutils/textures/items/particle/24.png
index bc6aec8854..65e7e7edcc 100644
--- a/src/main/resources/assets/miscutils/textures/items/particle/24.png
+++ b/src/main/resources/assets/miscutils/textures/items/particle/24.png
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/particle/3.png b/src/main/resources/assets/miscutils/textures/items/particle/3.png
index d085b86507..68479b5df3 100644
--- a/src/main/resources/assets/miscutils/textures/items/particle/3.png
+++ b/src/main/resources/assets/miscutils/textures/items/particle/3.png
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/particle/4.png b/src/main/resources/assets/miscutils/textures/items/particle/4.png
index faf8db0576..4ff62e6b38 100644
--- a/src/main/resources/assets/miscutils/textures/items/particle/4.png
+++ b/src/main/resources/assets/miscutils/textures/items/particle/4.png
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/particle/5.png b/src/main/resources/assets/miscutils/textures/items/particle/5.png
index 3a30274238..be10194952 100644
--- a/src/main/resources/assets/miscutils/textures/items/particle/5.png
+++ b/src/main/resources/assets/miscutils/textures/items/particle/5.png
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/particle/6.png b/src/main/resources/assets/miscutils/textures/items/particle/6.png
index 8930ce52ef..0f75caa5de 100644
--- a/src/main/resources/assets/miscutils/textures/items/particle/6.png
+++ b/src/main/resources/assets/miscutils/textures/items/particle/6.png
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/particle/7.png b/src/main/resources/assets/miscutils/textures/items/particle/7.png
index 0581d47446..d589c1d2cd 100644
--- a/src/main/resources/assets/miscutils/textures/items/particle/7.png
+++ b/src/main/resources/assets/miscutils/textures/items/particle/7.png
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/particle/8.png b/src/main/resources/assets/miscutils/textures/items/particle/8.png
index 6bd3c2c682..24ce21e771 100644
--- a/src/main/resources/assets/miscutils/textures/items/particle/8.png
+++ b/src/main/resources/assets/miscutils/textures/items/particle/8.png
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/particle/9.png b/src/main/resources/assets/miscutils/textures/items/particle/9.png
index 430f1aed3d..1190886fc1 100644
--- a/src/main/resources/assets/miscutils/textures/items/particle/9.png
+++ b/src/main/resources/assets/miscutils/textures/items/particle/9.png
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/particle/new/0.png b/src/main/resources/assets/miscutils/textures/items/particle/new/0.png
deleted file mode 100644
index 3fe49c3a57..0000000000
--- a/src/main/resources/assets/miscutils/textures/items/particle/new/0.png
+++ /dev/null
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/particle/new/1.png b/src/main/resources/assets/miscutils/textures/items/particle/new/1.png
deleted file mode 100644
index 39ffa85711..0000000000
--- a/src/main/resources/assets/miscutils/textures/items/particle/new/1.png
+++ /dev/null
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/particle/new/10.png b/src/main/resources/assets/miscutils/textures/items/particle/new/10.png
deleted file mode 100644
index 18ded814cf..0000000000
--- a/src/main/resources/assets/miscutils/textures/items/particle/new/10.png
+++ /dev/null
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/particle/new/11.png b/src/main/resources/assets/miscutils/textures/items/particle/new/11.png
deleted file mode 100644
index b7e191c79f..0000000000
--- a/src/main/resources/assets/miscutils/textures/items/particle/new/11.png
+++ /dev/null
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/particle/new/12.png b/src/main/resources/assets/miscutils/textures/items/particle/new/12.png
deleted file mode 100644
index 49feb199e0..0000000000
--- a/src/main/resources/assets/miscutils/textures/items/particle/new/12.png
+++ /dev/null
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/particle/new/13.png b/src/main/resources/assets/miscutils/textures/items/particle/new/13.png
deleted file mode 100644
index b70178d315..0000000000
--- a/src/main/resources/assets/miscutils/textures/items/particle/new/13.png
+++ /dev/null
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/particle/new/14.png b/src/main/resources/assets/miscutils/textures/items/particle/new/14.png
deleted file mode 100644
index 77741644ed..0000000000
--- a/src/main/resources/assets/miscutils/textures/items/particle/new/14.png
+++ /dev/null
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/particle/new/15.png b/src/main/resources/assets/miscutils/textures/items/particle/new/15.png
deleted file mode 100644
index d48096c85c..0000000000
--- a/src/main/resources/assets/miscutils/textures/items/particle/new/15.png
+++ /dev/null
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/particle/new/16.png b/src/main/resources/assets/miscutils/textures/items/particle/new/16.png
deleted file mode 100644
index cef33d17fd..0000000000
--- a/src/main/resources/assets/miscutils/textures/items/particle/new/16.png
+++ /dev/null
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/particle/new/17.png b/src/main/resources/assets/miscutils/textures/items/particle/new/17.png
deleted file mode 100644
index 4b752e7a9a..0000000000
--- a/src/main/resources/assets/miscutils/textures/items/particle/new/17.png
+++ /dev/null
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/particle/new/18.png b/src/main/resources/assets/miscutils/textures/items/particle/new/18.png
deleted file mode 100644
index 23fdb190c7..0000000000
--- a/src/main/resources/assets/miscutils/textures/items/particle/new/18.png
+++ /dev/null
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/particle/new/19.png b/src/main/resources/assets/miscutils/textures/items/particle/new/19.png
deleted file mode 100644
index 94e2a856c9..0000000000
--- a/src/main/resources/assets/miscutils/textures/items/particle/new/19.png
+++ /dev/null
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/particle/new/2.png b/src/main/resources/assets/miscutils/textures/items/particle/new/2.png
deleted file mode 100644
index d86b5b357d..0000000000
--- a/src/main/resources/assets/miscutils/textures/items/particle/new/2.png
+++ /dev/null
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/particle/new/20.png b/src/main/resources/assets/miscutils/textures/items/particle/new/20.png
deleted file mode 100644
index d7cbdb8f45..0000000000
--- a/src/main/resources/assets/miscutils/textures/items/particle/new/20.png
+++ /dev/null
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/particle/new/21.png b/src/main/resources/assets/miscutils/textures/items/particle/new/21.png
deleted file mode 100644
index 2531eaff52..0000000000
--- a/src/main/resources/assets/miscutils/textures/items/particle/new/21.png
+++ /dev/null
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/particle/new/22.png b/src/main/resources/assets/miscutils/textures/items/particle/new/22.png
deleted file mode 100644
index d594dc4be8..0000000000
--- a/src/main/resources/assets/miscutils/textures/items/particle/new/22.png
+++ /dev/null
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/particle/new/23.png b/src/main/resources/assets/miscutils/textures/items/particle/new/23.png
deleted file mode 100644
index d96dd2b000..0000000000
--- a/src/main/resources/assets/miscutils/textures/items/particle/new/23.png
+++ /dev/null
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/particle/new/24.png b/src/main/resources/assets/miscutils/textures/items/particle/new/24.png
deleted file mode 100644
index 56067466ad..0000000000
--- a/src/main/resources/assets/miscutils/textures/items/particle/new/24.png
+++ /dev/null
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/particle/new/3.png b/src/main/resources/assets/miscutils/textures/items/particle/new/3.png
deleted file mode 100644
index 43438c4ce5..0000000000
--- a/src/main/resources/assets/miscutils/textures/items/particle/new/3.png
+++ /dev/null
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/particle/new/4.png b/src/main/resources/assets/miscutils/textures/items/particle/new/4.png
deleted file mode 100644
index 8f0db073cd..0000000000
--- a/src/main/resources/assets/miscutils/textures/items/particle/new/4.png
+++ /dev/null
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/particle/new/5.png b/src/main/resources/assets/miscutils/textures/items/particle/new/5.png
deleted file mode 100644
index 40ec84db70..0000000000
--- a/src/main/resources/assets/miscutils/textures/items/particle/new/5.png
+++ /dev/null
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/particle/new/6.png b/src/main/resources/assets/miscutils/textures/items/particle/new/6.png
deleted file mode 100644
index c63ad0ba19..0000000000
--- a/src/main/resources/assets/miscutils/textures/items/particle/new/6.png
+++ /dev/null
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/particle/new/7.png b/src/main/resources/assets/miscutils/textures/items/particle/new/7.png
deleted file mode 100644
index aad8c7ca62..0000000000
--- a/src/main/resources/assets/miscutils/textures/items/particle/new/7.png
+++ /dev/null
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/particle/new/8.png b/src/main/resources/assets/miscutils/textures/items/particle/new/8.png
deleted file mode 100644
index c9b908ec61..0000000000
--- a/src/main/resources/assets/miscutils/textures/items/particle/new/8.png
+++ /dev/null
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/particle/new/9.png b/src/main/resources/assets/miscutils/textures/items/particle/new/9.png
deleted file mode 100644
index b8e02c82ea..0000000000
--- a/src/main/resources/assets/miscutils/textures/items/particle/new/9.png
+++ /dev/null
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/personalCloakingDevice.png b/src/main/resources/assets/miscutils/textures/items/personalCloakingDevice.png
index 2d196cb9ed..80c2c979be 100644
--- a/src/main/resources/assets/miscutils/textures/items/personalCloakingDevice.png
+++ b/src/main/resources/assets/miscutils/textures/items/personalCloakingDevice.png
Binary files differ
diff --git a/src/main/resources/assets/miscutils/textures/items/token/0.png b/src/main/resources/assets/miscutils/textures/items/token/0.png
index 7947f30bb6..6bc570cbee 100644
--- a/src/main/resources/assets/miscutils/textures/items/token/0.png
+++ b/src/main/resources/assets/miscutils/textures/items/token/0.png
Binary files differ