From 76719d65a90d98e228a914774d3b11ed9f01ac8e Mon Sep 17 00:00:00 2001 From: Connor-Colenso <52056774+Connor-Colenso@users.noreply.github.com> Date: Mon, 4 Sep 2023 03:05:22 +0100 Subject: Clean-up v2 (#729) * Remove test items from NEI with no texture * Add number formatting to hand pumps * Remove heavy plates (no recipes & completely unused). * Remove helium generator (no texture, no recipe) * Remove fire pit and fire starter (no use, no recipe, no textures) * Remove giant chicken and associated unused stuff, has no texture and is unobtainable. Used to be relevant but isn't anymore. * Remove villagers with silly trades like 1 motor + 1 hull = 1 hull. Why? * Remove trade bench, no recipe, missing textures. Unused. * Remove farm processors, no texture, no recipe. Unused. * Remove MAX tier components, these exist in GT now, have no recipe here and are unused. * Hide untextured light block from NEI * Update buildscript * Remove unused backpacks, no recipe and contains dupe bugs. Bad. * Remove eatotronic, universal toolbox and magic tool bag. All 3 are missing textures and uncraftable. * Remove eatotronic, universal toolbox and magic tool bag. All 3 are missing textures and uncraftable. part 2 * Remove dragon catcher (what?), no texture, no recipe, unused. * Remove empty item, does nothing, has no recipe, no idea why it is here. * Empty item v2 removal * Revert "Empty item v2 removal" This reverts commit 75bcd3ccfaf55bbfe2c12b2e4167d5c37636030d. * Revert "Remove empty item, does nothing, has no recipe, no idea why it is here." This reverts commit e41a9f484392776331c58530ab1faa5ef978ef36. * Remove debug square. No recipe, unused. * Number formatting overflow covers * Remove JVM garbage collection block. Unused, no recipe. * Remove nanotubes, no recipe for them. Unused. * Remove "git" item, doesn't seem to work. Has no recipe. * Remove uncraftable food with awful textures. * Remove "bat king" mob, unused content. Does not spawn. * Remove uncraftable doors with bad textures. Unused content. * Remove uncraftable, unlocalised redstone stuff that crashes game when placed. * Remove weird spawner item. No recipe, does not exist in world. * Remove sunnarium bit, no recipe, no usage. * Remove unused modularity table and some misc uncraftable, unused items. * Remove Interconnecting Storage Crate, no recipe, unused. * Delete worse debug power gen, this already exists as part of GT. Unneeded duplication. * Delete unused placeholder circuit * Delete uncraftable generator hatches. * Spotless * Remove XP tank thing, unused and uncraftable. * Remove null item, this fluid registry only seemed to register one null fluid. All others exist? * Remove EU -> RF battery. Unused in GTNH. * Remove some shelf nonsense, why is this in this mod? * Remove some weird random tools. These have no realistic usage in GTNH. * Remove firemaker. Useless in GTNH. * Removed helium blob. Deprecated item, not used anymore, uncraftable. * spotlessApply (#730) Co-authored-by: GitHub GTNH Actions <> * Stop modulators generating unused blocks with no textures * Remove more unused untextured casings * Remove more unused untextured casings * Remove more unused untextured casings * Remove more unused untextured casings * Remove more unused untextured casings * Remove some weird methods and uncraftable mining parts, probably part of deprecated multiblock. * spotlessApply (#732) Co-authored-by: GitHub GTNH Actions <> * Remove gem shards, unused. * Remove unused atoms * Remove unused gum * Remove unused elements/materials * Bye bye * Remove some unused reflection stuff * Remove control cores, obsolete now. * Remove mob killing thing with no texture and no recipe. * Remove uncraftable covers * Remove pizza gloves * Net and rope removal, unused * Remove force crop * Removal of some old event stuff * Remove unused nuclear chem items * Remove player safe, mostly because of the horrible event code that was intercepting every block break. I can't see any real usage of this via discord. * Remove Force material and associated other nonsense. Also remove some nuclear chem stuff. * Remove force for realsies * Skookum Chooker purge. * Remove some enderio compat, these plates/dusts are added via GT5 anyway now. This is obsolete. * spotlessApply (#733) Co-authored-by: GitHub GTNH Actions <> * Unused textures * Bump dep * Revert "Remove force for realsies" This reverts commit 0d288912a99f9dabce56d2a2623d4d3510f4804e. * Revert "Remove Force material and associated other nonsense. Also remove some nuclear chem stuff." This reverts commit 3455e6e916defe1f2aef923be6f9696a6cf3095b. * Remove nuclear items that are unused * spotlessApply (#734) Co-authored-by: GitHub GTNH Actions <> --------- Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Co-authored-by: Connor Colenso Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- src/main/java/gtPlusPlus/GTplusplus.java | 7 - src/main/java/gtPlusPlus/core/block/ModBlocks.java | 65 +- .../gtPlusPlus/core/block/general/BlockNet.java | 37 - .../core/block/general/BlockSuperLight.java | 2 - .../core/block/general/BlockTankXpConverter.java | 156 ----- .../gtPlusPlus/core/block/general/FirePit.java | 238 ------- .../gtPlusPlus/core/block/general/LightGlass.java | 7 +- .../gtPlusPlus/core/block/general/PlayerDoors.java | 485 ------------- .../general/redstone/BlockGenericRedstone.java | 366 ---------- .../redstone/BlockGenericRedstoneDetector.java | 142 ---- .../general/redstone/BlockGenericRedstoneTest.java | 211 ------ .../java/gtPlusPlus/core/block/machine/EggBox.java | 149 ---- .../core/block/machine/HeliumGenerator.java | 90 --- .../block/machine/Machine_ModularityTable.java | 101 --- .../core/block/machine/Machine_TradeTable.java | 87 --- .../block/machine/bedrock/Mining_Head_Fake.java | 173 ----- .../block/machine/bedrock/Mining_Pipe_Fake.java | 131 ---- .../gtPlusPlus/core/client/model/ModelBatKing.java | 115 ---- .../core/client/model/ModelGiantChicken.java | 111 --- .../core/client/renderer/RenderBatKing.java | 152 ----- .../core/client/renderer/RenderGiantChicken.java | 15 - .../java/gtPlusPlus/core/common/CommonProxy.java | 38 -- .../core/common/compat/COMPAT_Baubles.java | 37 - .../core/common/compat/COMPAT_EnderIO.java | 26 - .../java/gtPlusPlus/core/config/ConfigHandler.java | 139 +--- .../core/container/Container_BackpackBase.java | 184 ----- .../core/container/Container_EggBox.java | 133 ---- .../core/container/Container_Grindle.java | 137 ---- .../core/container/Container_HeliumGenerator.java | 152 ----- .../core/container/Container_ModularityTable.java | 193 ------ .../core/container/Container_TradeTable.java | 174 ----- .../core/container/box/LunchBoxContainer.java | 21 - .../core/container/box/MagicBagContainer.java | 21 - .../core/container/box/ToolBoxContainer.java | 17 - .../core/entity/InternalEntityRegistry.java | 25 - .../entity/ai/batking/EntityAIBatKingAttack.java | 419 ------------ .../core/entity/item/ItemEntityGiantEgg.java | 117 ---- .../core/entity/monster/EntityBatKing.java | 760 --------------------- .../entity/monster/EntityGiantChickenBase.java | 314 --------- .../entity/projectile/EntityLightningAttack.java | 5 - .../java/gtPlusPlus/core/fluids/FluidFactory.java | 206 ------ .../java/gtPlusPlus/core/fluids/FluidPackage.java | 80 --- .../core/fluids/ItemGenericFluidBucket.java | 325 --------- .../gtPlusPlus/core/gui/item/GuiBaseBackpack.java | 125 ---- .../gtPlusPlus/core/gui/item/GuiBaseGrindle.java | 589 ---------------- .../gtPlusPlus/core/gui/item/GuiScreenGrindle.java | 513 -------------- .../gtPlusPlus/core/gui/machine/GUI_EggBox.java | 57 -- .../core/gui/machine/GUI_HeliumGenerator.java | 40 -- .../core/gui/machine/GUI_ModularityTable.java | 79 --- .../core/gui/machine/GUI_TradeTable.java | 53 -- .../core/handler/AchievementHandler.java | 14 +- .../gtPlusPlus/core/handler/COMPAT_HANDLER.java | 20 - .../core/handler/COMPAT_IntermodStaging.java | 4 - .../java/gtPlusPlus/core/handler/GuiHandler.java | 150 +--- .../core/handler/Recipes/RegistrationHandler.java | 2 - .../core/handler/events/BlockEventHandler.java | 211 ------ .../handler/events/GeneralTooltipEventHandler.java | 85 --- .../events/PickaxeBlockBreakEventHandler.java | 66 -- .../events/ZombieBackupSpawnEventHandler.java | 49 -- .../core/handler/render/FirepitModel.java | 118 ---- .../core/handler/render/FirepitRender.java | 60 -- .../core/inventories/BaseInventoryBackpack.java | 215 ------ .../core/inventories/BaseInventoryGrindle.java | 219 ------ .../core/inventories/InventoryHeliumGenerator.java | 157 ----- .../core/inventories/box/LunchBoxInventory.java | 18 - .../core/inventories/box/MagicBagInventory.java | 18 - .../core/inventories/box/ToolBoxInventory.java | 19 - .../modulartable/InventoryModularMain.java | 175 ----- .../modulartable/InventoryModularOutput.java | 185 ----- src/main/java/gtPlusPlus/core/item/ModItems.java | 500 +------------- .../core/item/base/BaseItemBackpack.java | 75 -- .../core/item/base/BaseItemComponent.java | 2 - .../item/base/itemblock/ItemBlockEntityBase.java | 42 -- .../core/item/base/itemblock/ItemBlockSpawner.java | 39 -- .../core/item/base/plates/BaseItemPlateHeavy.java | 47 -- .../core/item/bauble/FireProtectionBauble.java | 137 ---- .../core/item/bauble/HealthBoostBauble.java | 40 -- .../gtPlusPlus/core/item/bauble/ModularBauble.java | 495 -------------- .../core/item/bauble/MonsterKillerBaseBauble.java | 181 ----- .../core/item/chemistry/NuclearChem.java | 44 +- .../chemistry/general/ItemNuclearChemBase.java | 145 ---- .../core/item/general/BaseItemGrindle.java | 76 --- .../core/item/general/ItemAreaClear.java | 205 ------ .../core/item/general/ItemBasicFirestarter.java | 98 --- .../core/item/general/ItemControlCore.java | 82 --- .../core/item/general/ItemGemShards.java | 67 -- .../gtPlusPlus/core/item/general/ItemGiantEgg.java | 297 -------- .../core/item/general/ItemSunnariumBit.java | 27 - .../core/item/general/RF2EU_Battery.java | 307 --------- .../item/general/capture/ItemEntityCatcher.java | 250 ------- .../item/general/throwables/ItemThrowableBomb.java | 2 - .../java/gtPlusPlus/core/item/init/ItemsFoods.java | 70 -- .../core/item/tool/misc/GregtechPump.java | 9 +- .../core/item/tool/misc/SandstoneHammer.java | 75 -- .../core/item/tool/misc/box/AutoLunchBox.java | 15 - .../core/item/tool/misc/box/MagicToolBag.java | 14 - .../core/item/tool/misc/box/UniversalToolBox.java | 16 - .../core/item/tool/staballoy/MultiPickaxeBase.java | 287 -------- .../core/item/tool/staballoy/StaballoyAxe.java | 372 ---------- .../core/item/tool/staballoy/StaballoyPickaxe.java | 458 ------------- src/main/java/gtPlusPlus/core/lib/CORE.java | 3 - .../java/gtPlusPlus/core/material/ELEMENT.java | 181 +---- .../java/gtPlusPlus/core/material/Material.java | 2 - .../java/gtPlusPlus/core/proxy/ClientProxy.java | 13 - .../gtPlusPlus/core/recipe/RECIPES_GREGTECH.java | 37 - .../gtPlusPlus/core/recipe/RECIPES_General.java | 64 -- .../gtPlusPlus/core/recipe/RECIPES_Machines.java | 156 +---- .../java/gtPlusPlus/core/recipe/RECIPES_Tools.java | 84 --- .../gtPlusPlus/core/slots/SlotItemBackpackInv.java | 27 - .../gtPlusPlus/core/slots/SlotModularBauble.java | 31 - .../core/slots/SlotModularBaubleUpgrades.java | 56 -- .../core/tileentities/ModTileEntities.java | 12 - .../tileentities/general/TileEntityEggBox.java | 365 ---------- .../tileentities/general/TileEntityFirepit.java | 38 -- .../general/TileEntityHeliumGenerator.java | 117 ---- .../general/TileEntityXpConverter.java | 297 -------- .../machines/TileEntityModularityTable.java | 482 ------------- .../machines/TileEntityProjectTable.java | 136 ---- .../machines/TileEntityTradeTable.java | 123 ---- src/main/java/gtPlusPlus/core/util/Utils.java | 129 +--- .../gtPlusPlus/core/util/minecraft/ItemUtils.java | 200 +----- .../core/util/minecraft/MaterialUtils.java | 5 +- .../core/util/minecraft/PlayerUtils.java | 18 - .../gtPlusPlus/plugin/agrichem/Core_Agrichem.java | 4 - .../plugin/agrichem/fluids/FluidLoader.java | 19 - .../plugin/villagers/Core_VillagerAdditions.java | 113 --- .../plugin/villagers/VillagerObject.java | 41 -- .../gtPlusPlus/plugin/villagers/VillagerUtils.java | 19 - .../villagers/block/BlockGenericSpawner.java | 58 -- .../villagers/tile/MobSpawnerCustomLogic.java | 68 -- .../villagers/tile/TileEntityGenericSpawner.java | 233 ------- .../plugin/villagers/trade/TradeHandlerBanker.java | 25 - .../plugin/villagers/trade/TradeHandlerBase.java | 24 - .../villagers/trade/TradeHandlerTechnician.java | 25 - .../plugin/villagers/trade/TradeHandlerTrader.java | 52 -- .../xmod/bartcrops/LoaderOfTheCrops.java | 4 +- .../xmod/bartcrops/crops/Crop_Force.java | 61 -- .../gtPlusPlus/xmod/bartcrops/crops/Crop_Hemp.java | 31 +- .../java/gtPlusPlus/xmod/cofh/HANDLER_COFH.java | 15 - .../xmod/eio/handler/HandlerTooltip_EIO.java | 76 --- .../gtPlusPlus/xmod/eio/material/MaterialEIO.java | 109 --- .../forestry/bees/registry/GTPP_BeeDefinition.java | 4 +- .../java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java | 10 +- .../xmod/gregtech/api/enums/GregtechItemList.java | 48 -- .../gregtech/api/enums/GregtechOrePrefixes.java | 2 - .../gregtech/api/enums/GregtechToolDictNames.java | 1 - .../GT_MetaTileEntity_Hatch_ControlCore.java | 166 ----- .../GT_MetaTileEntity_Hatch_Energy_RTG.java | 289 -------- .../base/GregtechMeta_MultiBlockBase.java | 98 +-- .../base/machines/GregtechMetaSafeBlockBase.java | 328 --------- .../common/blocks/GregtechMetaCasingBlocks2.java | 31 +- .../common/blocks/GregtechMetaCasingBlocks4.java | 81 ++- .../common/blocks/GregtechMetaCasingBlocks6.java | 9 + .../blocks/GregtechMetaSpecialMachineCasings.java | 21 +- .../blocks/GregtechMetaSpecialMultiCasings2.java | 17 +- .../blocks/GregtechMetaTieredCasingBlocks1.java | 27 +- .../blocks/textures/TexturesGtCutomCovers.java | 40 -- .../common/blocks/textures/TexturesGtTools.java | 1 - .../xmod/gregtech/common/covers/CoverManager.java | 86 --- .../common/items/MetaGeneratedGregtechItems.java | 168 +---- .../common/items/MetaGeneratedGregtechTools.java | 15 - .../generators/GregtechMetaTileEntity_RTG.java | 2 - .../creative/GregtechMetaCreativeEnergyBuffer.java | 234 ------- .../basic/GregtechMetaGarbageCollector.java | 386 ----------- .../GT_MetaTileEntity_ConnectableCrate.java | 578 ---------------- .../storage/GregtechMetaSafeBlock.java | 77 --- .../storage/shelving/GT4Entity_Shelf.java | 365 ---------- .../shelving/GT4Entity_Shelf_Compartment.java | 40 -- .../storage/shelving/GT4Entity_Shelf_Desk.java | 49 -- .../shelving/GT4Entity_Shelf_FileCabinet.java | 60 -- .../storage/shelving/GT4Entity_Shelf_Iron.java | 47 -- .../storage/shelving/GT4Entity_Shelf_Large.java | 276 -------- .../common/tools/TOOL_Gregtech_Choocher.java | 231 ------- .../loaders/ProcessingToolHeadChoocher.java | 124 ---- .../loaders/recipe/RecipeLoader_Nuclear.java | 15 - .../xmod/gregtech/recipes/GregtechRecipeAdder.java | 5 - .../registration/gregtech/Gregtech4Content.java | 38 -- .../registration/gregtech/GregtechConduits.java | 8 +- .../gregtech/GregtechCustomHatches.java | 35 - .../gregtech/GregtechEnergyBuffer.java | 10 - .../registration/gregtech/GregtechSafeBlock.java | 137 ---- .../registration/gregtech/GregtechSuperChests.java | 8 - src/main/java/gtPlusPlus/xmod/sc2/HANDLER_SC2.java | 14 - .../xmod/sc2/modules/ModuleExoticSeeds.java | 108 --- .../gtPlusPlus/xmod/sol/HANDLER_SpiceOfLife.java | 49 -- .../vswe/stevescarts/ModuleData/GppModuleData.java | 50 -- .../assets/miscutils/textures/blocks/net.png | Bin 350 -> 0 bytes .../textures/items/IndustrialDiamondExquisite.png | Bin 608 -> 0 bytes .../textures/items/MU-metaitem.01/101.png | Bin 309 -> 0 bytes .../textures/items/MU-metaitem.01/102.png | Bin 10825 -> 0 bytes .../textures/items/MU-metaitem.01/103.png | Bin 13990 -> 0 bytes .../textures/items/MU-metaitem.01/104.png | Bin 24047 -> 0 bytes .../miscutils/textures/items/MU-metaitem.01/60.png | Bin 5146 -> 0 bytes .../miscutils/textures/items/StoneStatue.png | Bin 3703 -> 0 bytes .../items/baubles/itemFireProtectGlovesBetter.png | Bin 1326 -> 0 bytes .../textures/items/bucket.generic.overlay.png | Bin 279 -> 0 bytes .../textures/items/controlcore/Core_0.png | Bin 527 -> 0 bytes .../textures/items/controlcore/Core_1.png | Bin 495 -> 0 bytes .../textures/items/controlcore/Core_2.png | Bin 492 -> 0 bytes .../textures/items/controlcore/Core_3.png | Bin 495 -> 0 bytes .../textures/items/controlcore/Core_4.png | Bin 483 -> 0 bytes .../textures/items/controlcore/Core_5.png | Bin 479 -> 0 bytes .../textures/items/controlcore/Core_6.png | Bin 476 -> 0 bytes .../textures/items/controlcore/Core_7.png | Bin 465 -> 0 bytes .../textures/items/controlcore/Core_8.png | Bin 465 -> 0 bytes .../textures/items/controlcore/Core_9.png | Bin 412 -> 0 bytes .../assets/miscutils/textures/items/ion/10.png | Bin 161 -> 0 bytes .../assets/miscutils/textures/items/ion/100.png | Bin 161 -> 0 bytes .../assets/miscutils/textures/items/ion/101.png | Bin 153 -> 0 bytes .../assets/miscutils/textures/items/ion/102.png | Bin 124 -> 0 bytes .../assets/miscutils/textures/items/ion/103.png | Bin 148 -> 0 bytes .../assets/miscutils/textures/items/ion/104.png | Bin 156 -> 0 bytes .../assets/miscutils/textures/items/ion/105.png | Bin 175 -> 0 bytes .../assets/miscutils/textures/items/ion/106.png | Bin 148 -> 0 bytes .../assets/miscutils/textures/items/ion/107.png | Bin 143 -> 0 bytes .../assets/miscutils/textures/items/ion/108.png | Bin 152 -> 0 bytes .../assets/miscutils/textures/items/ion/109.png | Bin 154 -> 0 bytes .../assets/miscutils/textures/items/ion/11.png | Bin 178 -> 0 bytes .../assets/miscutils/textures/items/ion/110.png | Bin 163 -> 0 bytes .../assets/miscutils/textures/items/ion/111.png | Bin 146 -> 0 bytes .../assets/miscutils/textures/items/ion/112.png | Bin 148 -> 0 bytes .../assets/miscutils/textures/items/ion/113.png | Bin 113 -> 0 bytes .../assets/miscutils/textures/items/ion/114.png | Bin 160 -> 0 bytes .../assets/miscutils/textures/items/ion/115.png | Bin 138 -> 0 bytes .../assets/miscutils/textures/items/ion/116.png | Bin 140 -> 0 bytes .../assets/miscutils/textures/items/ion/117.png | Bin 166 -> 0 bytes .../assets/miscutils/textures/items/ion/12.png | Bin 147 -> 0 bytes .../assets/miscutils/textures/items/ion/13.png | Bin 151 -> 0 bytes .../assets/miscutils/textures/items/ion/14.png | Bin 125 -> 0 bytes .../assets/miscutils/textures/items/ion/15.png | Bin 136 -> 0 bytes .../assets/miscutils/textures/items/ion/16.png | Bin 136 -> 0 bytes .../assets/miscutils/textures/items/ion/17.png | Bin 148 -> 0 bytes .../assets/miscutils/textures/items/ion/18.png | Bin 143 -> 0 bytes .../assets/miscutils/textures/items/ion/19.png | Bin 161 -> 0 bytes .../assets/miscutils/textures/items/ion/2.png | Bin 115 -> 0 bytes .../assets/miscutils/textures/items/ion/20.png | Bin 155 -> 0 bytes .../assets/miscutils/textures/items/ion/21.png | Bin 115 -> 0 bytes .../assets/miscutils/textures/items/ion/22.png | Bin 132 -> 0 bytes .../assets/miscutils/textures/items/ion/23.png | Bin 144 -> 0 bytes .../assets/miscutils/textures/items/ion/24.png | Bin 150 -> 0 bytes .../assets/miscutils/textures/items/ion/25.png | Bin 141 -> 0 bytes .../assets/miscutils/textures/items/ion/26.png | Bin 148 -> 0 bytes .../assets/miscutils/textures/items/ion/27.png | Bin 141 -> 0 bytes .../assets/miscutils/textures/items/ion/28.png | Bin 142 -> 0 bytes .../assets/miscutils/textures/items/ion/29.png | Bin 145 -> 0 bytes .../assets/miscutils/textures/items/ion/3.png | Bin 150 -> 0 bytes .../assets/miscutils/textures/items/ion/30.png | Bin 159 -> 0 bytes .../assets/miscutils/textures/items/ion/31.png | Bin 157 -> 0 bytes .../assets/miscutils/textures/items/ion/32.png | Bin 158 -> 0 bytes .../assets/miscutils/textures/items/ion/33.png | Bin 158 -> 0 bytes .../assets/miscutils/textures/items/ion/34.png | Bin 144 -> 0 bytes .../assets/miscutils/textures/items/ion/35.png | Bin 159 -> 0 bytes .../assets/miscutils/textures/items/ion/36.png | Bin 155 -> 0 bytes .../assets/miscutils/textures/items/ion/37.png | Bin 149 -> 0 bytes .../assets/miscutils/textures/items/ion/38.png | Bin 135 -> 0 bytes .../assets/miscutils/textures/items/ion/39.png | Bin 141 -> 0 bytes .../assets/miscutils/textures/items/ion/4.png | Bin 125 -> 0 bytes .../assets/miscutils/textures/items/ion/40.png | Bin 157 -> 0 bytes .../assets/miscutils/textures/items/ion/41.png | Bin 162 -> 0 bytes .../assets/miscutils/textures/items/ion/42.png | Bin 133 -> 0 bytes .../assets/miscutils/textures/items/ion/43.png | Bin 147 -> 0 bytes .../assets/miscutils/textures/items/ion/44.png | Bin 155 -> 0 bytes .../assets/miscutils/textures/items/ion/45.png | Bin 152 -> 0 bytes .../assets/miscutils/textures/items/ion/46.png | Bin 173 -> 0 bytes .../assets/miscutils/textures/items/ion/47.png | Bin 154 -> 0 bytes .../assets/miscutils/textures/items/ion/48.png | Bin 129 -> 0 bytes .../assets/miscutils/textures/items/ion/49.png | Bin 152 -> 0 bytes .../assets/miscutils/textures/items/ion/5.png | Bin 127 -> 0 bytes .../assets/miscutils/textures/items/ion/50.png | Bin 163 -> 0 bytes .../assets/miscutils/textures/items/ion/51.png | Bin 142 -> 0 bytes .../assets/miscutils/textures/items/ion/52.png | Bin 110 -> 0 bytes .../assets/miscutils/textures/items/ion/53.png | Bin 167 -> 0 bytes .../assets/miscutils/textures/items/ion/54.png | Bin 155 -> 0 bytes .../assets/miscutils/textures/items/ion/55.png | Bin 152 -> 0 bytes .../assets/miscutils/textures/items/ion/56.png | Bin 142 -> 0 bytes .../assets/miscutils/textures/items/ion/57.png | Bin 154 -> 0 bytes .../assets/miscutils/textures/items/ion/58.png | Bin 136 -> 0 bytes .../assets/miscutils/textures/items/ion/59.png | Bin 156 -> 0 bytes .../assets/miscutils/textures/items/ion/6.png | Bin 131 -> 0 bytes .../assets/miscutils/textures/items/ion/60.png | Bin 142 -> 0 bytes .../assets/miscutils/textures/items/ion/61.png | Bin 157 -> 0 bytes .../assets/miscutils/textures/items/ion/62.png | Bin 129 -> 0 bytes .../assets/miscutils/textures/items/ion/63.png | Bin 165 -> 0 bytes .../assets/miscutils/textures/items/ion/64.png | Bin 134 -> 0 bytes .../assets/miscutils/textures/items/ion/65.png | Bin 157 -> 0 bytes .../assets/miscutils/textures/items/ion/66.png | Bin 139 -> 0 bytes .../assets/miscutils/textures/items/ion/67.png | Bin 129 -> 0 bytes .../assets/miscutils/textures/items/ion/68.png | Bin 126 -> 0 bytes .../assets/miscutils/textures/items/ion/69.png | Bin 157 -> 0 bytes .../assets/miscutils/textures/items/ion/7.png | Bin 128 -> 0 bytes .../assets/miscutils/textures/items/ion/70.png | Bin 121 -> 0 bytes .../assets/miscutils/textures/items/ion/71.png | Bin 127 -> 0 bytes .../assets/miscutils/textures/items/ion/72.png | Bin 137 -> 0 bytes .../assets/miscutils/textures/items/ion/73.png | Bin 150 -> 0 bytes .../assets/miscutils/textures/items/ion/74.png | Bin 153 -> 0 bytes .../assets/miscutils/textures/items/ion/75.png | Bin 154 -> 0 bytes .../assets/miscutils/textures/items/ion/76.png | Bin 126 -> 0 bytes .../assets/miscutils/textures/items/ion/77.png | Bin 138 -> 0 bytes .../assets/miscutils/textures/items/ion/78.png | Bin 152 -> 0 bytes .../assets/miscutils/textures/items/ion/79.png | Bin 157 -> 0 bytes .../assets/miscutils/textures/items/ion/8.png | Bin 107 -> 0 bytes .../assets/miscutils/textures/items/ion/80.png | Bin 112 -> 0 bytes .../assets/miscutils/textures/items/ion/81.png | Bin 151 -> 0 bytes .../assets/miscutils/textures/items/ion/82.png | Bin 139 -> 0 bytes .../assets/miscutils/textures/items/ion/83.png | Bin 149 -> 0 bytes .../assets/miscutils/textures/items/ion/84.png | Bin 153 -> 0 bytes .../assets/miscutils/textures/items/ion/85.png | Bin 152 -> 0 bytes .../assets/miscutils/textures/items/ion/86.png | Bin 125 -> 0 bytes .../assets/miscutils/textures/items/ion/87.png | Bin 153 -> 0 bytes .../assets/miscutils/textures/items/ion/88.png | Bin 157 -> 0 bytes .../assets/miscutils/textures/items/ion/89.png | Bin 125 -> 0 bytes .../assets/miscutils/textures/items/ion/9.png | Bin 161 -> 0 bytes .../assets/miscutils/textures/items/ion/90.png | Bin 146 -> 0 bytes .../assets/miscutils/textures/items/ion/91.png | Bin 119 -> 0 bytes .../assets/miscutils/textures/items/ion/92.png | Bin 163 -> 0 bytes .../assets/miscutils/textures/items/ion/93.png | Bin 138 -> 0 bytes .../assets/miscutils/textures/items/ion/94.png | Bin 153 -> 0 bytes .../assets/miscutils/textures/items/ion/95.png | Bin 150 -> 0 bytes .../assets/miscutils/textures/items/ion/96.png | Bin 157 -> 0 bytes .../assets/miscutils/textures/items/ion/97.png | Bin 146 -> 0 bytes .../assets/miscutils/textures/items/ion/98.png | Bin 143 -> 0 bytes .../assets/miscutils/textures/items/ion/99.png | Bin 128 -> 0 bytes .../assets/miscutils/textures/items/itemAmulet.png | Bin 346 -> 0 bytes .../miscutils/textures/items/itemBackpack.png | Bin 2409 -> 0 bytes .../assets/miscutils/textures/items/itemBelt.png | Bin 377 -> 0 bytes .../assets/miscutils/textures/items/itemBigEgg.png | Bin 5331 -> 0 bytes .../assets/miscutils/textures/items/itemBoots.png | Bin 358 -> 0 bytes .../assets/miscutils/textures/items/itemBread.png | Bin 5146 -> 0 bytes .../textures/items/itemDebugShapeSpawner.png | Bin 6534 -> 0 bytes .../miscutils/textures/items/itemFireStarter.png | Bin 1850 -> 0 bytes .../textures/items/itemFoodCurriedSausages.png | Bin 1897 -> 0 bytes .../textures/items/itemFoodRaisinToast.png | Bin 2076 -> 0 bytes .../textures/items/itemHotIngotRaisinBread.png | Bin 5146 -> 0 bytes .../textures/items/itemIngotRaisinBread.png | Bin 5146 -> 0 bytes .../assets/miscutils/textures/items/itemKeyBig.png | Bin 293 -> 0 bytes .../miscutils/textures/items/itemKeyGold.png | Bin 354 -> 0 bytes .../miscutils/textures/items/itemKeyGoldBoss.png | Bin 311 -> 0 bytes .../miscutils/textures/items/itemMushroom.png | Bin 260 -> 0 bytes .../miscutils/textures/items/itemMushroomRed.png | Bin 273 -> 0 bytes .../assets/miscutils/textures/items/itemNugget.png | Bin 1986 -> 0 bytes .../textures/items/itemPLACEHOLDER_Circuit.png | Bin 405 -> 0 bytes .../miscutils/textures/items/itemPickaxe.png | Bin 178 -> 0 bytes .../miscutils/textures/items/itemPineapple.png | Bin 297 -> 0 bytes .../miscutils/textures/items/itemPlatebody.png | Bin 378 -> 0 bytes .../miscutils/textures/items/itemPlatelegs.png | Bin 342 -> 0 bytes .../miscutils/textures/items/itemRingWearable.png | Bin 350 -> 0 bytes .../assets/miscutils/textures/items/itemRope.png | Bin 316 -> 0 bytes .../textures/items/itemSandstoneHammer.png | Bin 422 -> 0 bytes .../miscutils/textures/items/itemStaballoyAxe.png | Bin 534 -> 0 bytes .../textures/items/itemStaballoyPickaxe.png | Bin 525 -> 0 bytes .../miscutils/textures/items/itemStickyRubber.png | Bin 397 -> 0 bytes .../miscutils/textures/items/science/Atom.png | Bin 1175 -> 0 bytes 352 files changed, 210 insertions(+), 21809 deletions(-) delete mode 100644 src/main/java/gtPlusPlus/core/block/general/BlockNet.java delete mode 100644 src/main/java/gtPlusPlus/core/block/general/BlockTankXpConverter.java delete mode 100644 src/main/java/gtPlusPlus/core/block/general/FirePit.java delete mode 100644 src/main/java/gtPlusPlus/core/block/general/PlayerDoors.java delete mode 100644 src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstone.java delete mode 100644 src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstoneDetector.java delete mode 100644 src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstoneTest.java delete mode 100644 src/main/java/gtPlusPlus/core/block/machine/EggBox.java delete mode 100644 src/main/java/gtPlusPlus/core/block/machine/HeliumGenerator.java delete mode 100644 src/main/java/gtPlusPlus/core/block/machine/Machine_ModularityTable.java delete mode 100644 src/main/java/gtPlusPlus/core/block/machine/Machine_TradeTable.java delete mode 100644 src/main/java/gtPlusPlus/core/block/machine/bedrock/Mining_Head_Fake.java delete mode 100644 src/main/java/gtPlusPlus/core/block/machine/bedrock/Mining_Pipe_Fake.java delete mode 100644 src/main/java/gtPlusPlus/core/client/model/ModelBatKing.java delete mode 100644 src/main/java/gtPlusPlus/core/client/model/ModelGiantChicken.java delete mode 100644 src/main/java/gtPlusPlus/core/client/renderer/RenderBatKing.java delete mode 100644 src/main/java/gtPlusPlus/core/client/renderer/RenderGiantChicken.java delete mode 100644 src/main/java/gtPlusPlus/core/common/compat/COMPAT_EnderIO.java delete mode 100644 src/main/java/gtPlusPlus/core/container/Container_BackpackBase.java delete mode 100644 src/main/java/gtPlusPlus/core/container/Container_EggBox.java delete mode 100644 src/main/java/gtPlusPlus/core/container/Container_Grindle.java delete mode 100644 src/main/java/gtPlusPlus/core/container/Container_HeliumGenerator.java delete mode 100644 src/main/java/gtPlusPlus/core/container/Container_ModularityTable.java delete mode 100644 src/main/java/gtPlusPlus/core/container/Container_TradeTable.java delete mode 100644 src/main/java/gtPlusPlus/core/container/box/LunchBoxContainer.java delete mode 100644 src/main/java/gtPlusPlus/core/container/box/MagicBagContainer.java delete mode 100644 src/main/java/gtPlusPlus/core/container/box/ToolBoxContainer.java delete mode 100644 src/main/java/gtPlusPlus/core/entity/ai/batking/EntityAIBatKingAttack.java delete mode 100644 src/main/java/gtPlusPlus/core/entity/item/ItemEntityGiantEgg.java delete mode 100644 src/main/java/gtPlusPlus/core/entity/monster/EntityBatKing.java delete mode 100644 src/main/java/gtPlusPlus/core/entity/monster/EntityGiantChickenBase.java delete mode 100644 src/main/java/gtPlusPlus/core/fluids/FluidFactory.java delete mode 100644 src/main/java/gtPlusPlus/core/fluids/FluidPackage.java delete mode 100644 src/main/java/gtPlusPlus/core/fluids/ItemGenericFluidBucket.java delete mode 100644 src/main/java/gtPlusPlus/core/gui/item/GuiBaseBackpack.java delete mode 100644 src/main/java/gtPlusPlus/core/gui/item/GuiBaseGrindle.java delete mode 100644 src/main/java/gtPlusPlus/core/gui/item/GuiScreenGrindle.java delete mode 100644 src/main/java/gtPlusPlus/core/gui/machine/GUI_EggBox.java delete mode 100644 src/main/java/gtPlusPlus/core/gui/machine/GUI_HeliumGenerator.java delete mode 100644 src/main/java/gtPlusPlus/core/gui/machine/GUI_ModularityTable.java delete mode 100644 src/main/java/gtPlusPlus/core/gui/machine/GUI_TradeTable.java delete mode 100644 src/main/java/gtPlusPlus/core/handler/events/BlockEventHandler.java delete mode 100644 src/main/java/gtPlusPlus/core/handler/events/ZombieBackupSpawnEventHandler.java delete mode 100644 src/main/java/gtPlusPlus/core/handler/render/FirepitModel.java delete mode 100644 src/main/java/gtPlusPlus/core/handler/render/FirepitRender.java delete mode 100644 src/main/java/gtPlusPlus/core/inventories/BaseInventoryBackpack.java delete mode 100644 src/main/java/gtPlusPlus/core/inventories/BaseInventoryGrindle.java delete mode 100644 src/main/java/gtPlusPlus/core/inventories/InventoryHeliumGenerator.java delete mode 100644 src/main/java/gtPlusPlus/core/inventories/box/LunchBoxInventory.java delete mode 100644 src/main/java/gtPlusPlus/core/inventories/box/MagicBagInventory.java delete mode 100644 src/main/java/gtPlusPlus/core/inventories/box/ToolBoxInventory.java delete mode 100644 src/main/java/gtPlusPlus/core/inventories/modulartable/InventoryModularMain.java delete mode 100644 src/main/java/gtPlusPlus/core/inventories/modulartable/InventoryModularOutput.java delete mode 100644 src/main/java/gtPlusPlus/core/item/base/BaseItemBackpack.java delete mode 100644 src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockEntityBase.java delete mode 100644 src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockSpawner.java delete mode 100644 src/main/java/gtPlusPlus/core/item/base/plates/BaseItemPlateHeavy.java delete mode 100644 src/main/java/gtPlusPlus/core/item/bauble/FireProtectionBauble.java delete mode 100644 src/main/java/gtPlusPlus/core/item/bauble/HealthBoostBauble.java delete mode 100644 src/main/java/gtPlusPlus/core/item/bauble/ModularBauble.java delete mode 100644 src/main/java/gtPlusPlus/core/item/bauble/MonsterKillerBaseBauble.java delete mode 100644 src/main/java/gtPlusPlus/core/item/chemistry/general/ItemNuclearChemBase.java delete mode 100644 src/main/java/gtPlusPlus/core/item/general/BaseItemGrindle.java delete mode 100644 src/main/java/gtPlusPlus/core/item/general/ItemAreaClear.java delete mode 100644 src/main/java/gtPlusPlus/core/item/general/ItemBasicFirestarter.java delete mode 100644 src/main/java/gtPlusPlus/core/item/general/ItemControlCore.java delete mode 100644 src/main/java/gtPlusPlus/core/item/general/ItemGemShards.java delete mode 100644 src/main/java/gtPlusPlus/core/item/general/ItemGiantEgg.java delete mode 100644 src/main/java/gtPlusPlus/core/item/general/ItemSunnariumBit.java delete mode 100644 src/main/java/gtPlusPlus/core/item/general/RF2EU_Battery.java delete mode 100644 src/main/java/gtPlusPlus/core/item/general/capture/ItemEntityCatcher.java delete mode 100644 src/main/java/gtPlusPlus/core/item/tool/misc/SandstoneHammer.java delete mode 100644 src/main/java/gtPlusPlus/core/item/tool/misc/box/AutoLunchBox.java delete mode 100644 src/main/java/gtPlusPlus/core/item/tool/misc/box/MagicToolBag.java delete mode 100644 src/main/java/gtPlusPlus/core/item/tool/misc/box/UniversalToolBox.java delete mode 100644 src/main/java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java delete mode 100644 src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoyAxe.java delete mode 100644 src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoyPickaxe.java delete mode 100644 src/main/java/gtPlusPlus/core/slots/SlotItemBackpackInv.java delete mode 100644 src/main/java/gtPlusPlus/core/slots/SlotModularBauble.java delete mode 100644 src/main/java/gtPlusPlus/core/slots/SlotModularBaubleUpgrades.java delete mode 100644 src/main/java/gtPlusPlus/core/tileentities/general/TileEntityEggBox.java delete mode 100644 src/main/java/gtPlusPlus/core/tileentities/general/TileEntityFirepit.java delete mode 100644 src/main/java/gtPlusPlus/core/tileentities/general/TileEntityHeliumGenerator.java delete mode 100644 src/main/java/gtPlusPlus/core/tileentities/general/TileEntityXpConverter.java delete mode 100644 src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityModularityTable.java delete mode 100644 src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityTradeTable.java delete mode 100644 src/main/java/gtPlusPlus/plugin/agrichem/fluids/FluidLoader.java delete mode 100644 src/main/java/gtPlusPlus/plugin/villagers/Core_VillagerAdditions.java delete mode 100644 src/main/java/gtPlusPlus/plugin/villagers/VillagerObject.java delete mode 100644 src/main/java/gtPlusPlus/plugin/villagers/VillagerUtils.java delete mode 100644 src/main/java/gtPlusPlus/plugin/villagers/block/BlockGenericSpawner.java delete mode 100644 src/main/java/gtPlusPlus/plugin/villagers/tile/MobSpawnerCustomLogic.java delete mode 100644 src/main/java/gtPlusPlus/plugin/villagers/tile/TileEntityGenericSpawner.java delete mode 100644 src/main/java/gtPlusPlus/plugin/villagers/trade/TradeHandlerBanker.java delete mode 100644 src/main/java/gtPlusPlus/plugin/villagers/trade/TradeHandlerBase.java delete mode 100644 src/main/java/gtPlusPlus/plugin/villagers/trade/TradeHandlerTechnician.java delete mode 100644 src/main/java/gtPlusPlus/plugin/villagers/trade/TradeHandlerTrader.java delete mode 100644 src/main/java/gtPlusPlus/xmod/bartcrops/crops/Crop_Force.java delete mode 100644 src/main/java/gtPlusPlus/xmod/cofh/HANDLER_COFH.java delete mode 100644 src/main/java/gtPlusPlus/xmod/eio/handler/HandlerTooltip_EIO.java delete mode 100644 src/main/java/gtPlusPlus/xmod/eio/material/MaterialEIO.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ControlCore.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Energy_RTG.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaSafeBlockBase.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtCutomCovers.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/creative/GregtechMetaCreativeEnergyBuffer.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaGarbageCollector.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_ConnectableCrate.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GregtechMetaSafeBlock.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Compartment.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Desk.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_FileCabinet.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Iron.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Large.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_Choocher.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingToolHeadChoocher.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSafeBlock.java delete mode 100644 src/main/java/gtPlusPlus/xmod/sc2/HANDLER_SC2.java delete mode 100644 src/main/java/gtPlusPlus/xmod/sc2/modules/ModuleExoticSeeds.java delete mode 100644 src/main/java/gtPlusPlus/xmod/sol/HANDLER_SpiceOfLife.java delete mode 100644 src/main/java/vswe/stevescarts/ModuleData/GppModuleData.java delete mode 100644 src/main/resources/assets/miscutils/textures/blocks/net.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/IndustrialDiamondExquisite.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/101.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/102.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/103.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/104.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/MU-metaitem.01/60.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/StoneStatue.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/baubles/itemFireProtectGlovesBetter.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/bucket.generic.overlay.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/controlcore/Core_0.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/controlcore/Core_1.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/controlcore/Core_2.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/controlcore/Core_3.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/controlcore/Core_4.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/controlcore/Core_5.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/controlcore/Core_6.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/controlcore/Core_7.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/controlcore/Core_8.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/controlcore/Core_9.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/10.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/100.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/101.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/102.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/103.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/104.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/105.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/106.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/107.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/108.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/109.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/11.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/110.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/111.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/112.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/113.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/114.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/115.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/116.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/117.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/12.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/13.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/14.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/15.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/16.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/17.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/18.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/19.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/2.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/20.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/21.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/22.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/23.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/24.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/25.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/26.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/27.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/28.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/29.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/3.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/30.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/31.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/32.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/33.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/34.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/35.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/36.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/37.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/38.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/39.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/4.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/40.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/41.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/42.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/43.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/44.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/45.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/46.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/47.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/48.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/49.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/5.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/50.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/51.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/52.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/53.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/54.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/55.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/56.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/57.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/58.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/59.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/6.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/60.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/61.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/62.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/63.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/64.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/65.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/66.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/67.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/68.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/69.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/7.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/70.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/71.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/72.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/73.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/74.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/75.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/76.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/77.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/78.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/79.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/8.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/80.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/81.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/82.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/83.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/84.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/85.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/86.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/87.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/88.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/89.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/9.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/90.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/91.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/92.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/93.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/94.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/95.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/96.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/97.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/98.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/ion/99.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemAmulet.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemBackpack.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemBelt.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemBigEgg.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemBoots.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemBread.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemDebugShapeSpawner.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemFireStarter.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemFoodCurriedSausages.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemFoodRaisinToast.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemHotIngotRaisinBread.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemIngotRaisinBread.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemKeyBig.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemKeyGold.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemKeyGoldBoss.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemMushroom.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemMushroomRed.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemNugget.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemPLACEHOLDER_Circuit.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemPickaxe.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemPineapple.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemPlatebody.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemPlatelegs.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemRingWearable.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemRope.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemSandstoneHammer.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemStaballoyAxe.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemStaballoyPickaxe.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/itemStickyRubber.png delete mode 100644 src/main/resources/assets/miscutils/textures/items/science/Atom.png (limited to 'src') diff --git a/src/main/java/gtPlusPlus/GTplusplus.java b/src/main/java/gtPlusPlus/GTplusplus.java index a326a3d050..9d4e041bbb 100644 --- a/src/main/java/gtPlusPlus/GTplusplus.java +++ b/src/main/java/gtPlusPlus/GTplusplus.java @@ -46,11 +46,8 @@ import gtPlusPlus.core.handler.BookHandler; import gtPlusPlus.core.handler.MobMentality; import gtPlusPlus.core.handler.PacketHandler; import gtPlusPlus.core.handler.Recipes.RegistrationHandler; -import gtPlusPlus.core.handler.events.BlockEventHandler; import gtPlusPlus.core.handler.events.LoginEventHandler; import gtPlusPlus.core.handler.events.MissingMappingsEvent; -import gtPlusPlus.core.item.ModItems; -import gtPlusPlus.core.item.general.ItemGiantEgg; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.util.Utils; @@ -138,7 +135,6 @@ public class GTplusplus implements ActionListener { public static void loadTextures() { Logger.INFO("Loading some textures on the client."); // Tools - Logger.WARNING("Processing texture: " + TexturesGtTools.SKOOKUM_CHOOCHER.getTextureFile().getResourcePath()); Logger.WARNING("Processing texture: " + TexturesGtTools.ANGLE_GRINDER.getTextureFile().getResourcePath()); Logger.WARNING("Processing texture: " + TexturesGtTools.ELECTRIC_SNIPS.getTextureFile().getResourcePath()); Logger.WARNING("Processing texture: " + TexturesGtTools.ELECTRIC_LIGHTER.getTextureFile().getResourcePath()); @@ -214,9 +210,6 @@ public class GTplusplus implements ActionListener { Meta_GT_Proxy.postInit(); Core_Manager.postInit(); - ItemGiantEgg.postInit(ModItems.itemBigEgg); - BlockEventHandler.init(); - Logger.INFO("~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"); Logger.INFO( "| Recipes succesfully Loaded: " + RegistrationHandler.recipesSuccess diff --git a/src/main/java/gtPlusPlus/core/block/ModBlocks.java b/src/main/java/gtPlusPlus/core/block/ModBlocks.java index 9957ae3f92..5058ac51cd 100644 --- a/src/main/java/gtPlusPlus/core/block/ModBlocks.java +++ b/src/main/java/gtPlusPlus/core/block/ModBlocks.java @@ -1,37 +1,24 @@ package gtPlusPlus.core.block; import net.minecraft.block.Block; -import net.minecraft.block.material.Material; import net.minecraftforge.fluids.Fluid; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.block.general.BlockCompressedObsidian; -import gtPlusPlus.core.block.general.BlockNet; -import gtPlusPlus.core.block.general.BlockTankXpConverter; -import gtPlusPlus.core.block.general.FirePit; import gtPlusPlus.core.block.general.FluidTankInfinite; import gtPlusPlus.core.block.general.HellFire; import gtPlusPlus.core.block.general.LightGlass; import gtPlusPlus.core.block.general.MiningExplosives; -import gtPlusPlus.core.block.general.PlayerDoors; import gtPlusPlus.core.block.general.antigrief.BlockWitherProof; -import gtPlusPlus.core.block.general.redstone.BlockGenericRedstoneDetector; -import gtPlusPlus.core.block.general.redstone.BlockGenericRedstoneTest; import gtPlusPlus.core.block.machine.CircuitProgrammer; import gtPlusPlus.core.block.machine.DecayablesChest; -import gtPlusPlus.core.block.machine.EggBox; import gtPlusPlus.core.block.machine.FishTrap; -import gtPlusPlus.core.block.machine.HeliumGenerator; -import gtPlusPlus.core.block.machine.Machine_ModularityTable; import gtPlusPlus.core.block.machine.Machine_PestKiller; import gtPlusPlus.core.block.machine.Machine_PooCollector; import gtPlusPlus.core.block.machine.Machine_ProjectTable; import gtPlusPlus.core.block.machine.Machine_RoundRobinator; import gtPlusPlus.core.block.machine.Machine_SuperJukebox; -import gtPlusPlus.core.block.machine.Machine_TradeTable; import gtPlusPlus.core.block.machine.VolumetricFlaskSetter; -import gtPlusPlus.core.block.machine.bedrock.Mining_Head_Fake; -import gtPlusPlus.core.block.machine.bedrock.Mining_Pipe_Fake; import gtPlusPlus.core.fluids.FluidRegistryHandler; public final class ModBlocks { @@ -39,18 +26,9 @@ public final class ModBlocks { public static Block blockRoundRobinator; public static Block blockCircuitProgrammer; public static Block blockVolumetricFlaskSetter; - public static Block blockFakeMiningPipe; - public static Block blockFakeMiningHead; public static Block blockFishTrap; public static Block blockDecayablesChest; - public static Block blockEggBox; - - // Blocks - // public static Block blockBloodSteel; - // public static Block blockStaballoy; - // WIP TODO public static Block blockToolBuilder; - public static Block blockGriefSaver; public static Block blockCasingsMisc; public static Block blockCasings2Misc; @@ -64,32 +42,18 @@ public final class ModBlocks { public static Block blockCustomMachineCasings; public static Block blockCustomPipeGearCasings; - public static Block blockMetaTileEntity; - public static Block blockHeliumGenerator; - public static Block blockNHG; - public static Block blockCharger; - public static Block MatterFabricatorEffectBlock; public static Fluid fluidSludge = new Fluid("fluid.sludge"); public static Block blockFluidSludge; - public static Block blockFirePit; - - public static Block blockOreFluorite; - public static Block blockMiningExplosive; public static Block blockHellfire; public static Block blockInfiniteFLuidTank; public static Block blockProjectTable; - public static Block blockTradeTable; - public static Block blockModularTable; - public static Block blockWitherGuard; - public static Block blockXpConverter; public static Block blockCompressedObsidian; - public static Block blockNet; public static Block blockPlayerDoorWooden; public static Block blockPlayerDoorIron; @@ -97,8 +61,6 @@ public final class ModBlocks { public static Block blockPlayerDoorCustom_Ice; public static Block blockPlayerDoorCustom_Cactus; - public static Block blockCustomMobSpawner; - public static Block blockCustomSuperLight; public static Block blockCustomJukebox; public static Block blockPooCollector; @@ -120,41 +82,18 @@ public final class ModBlocks { FluidRegistryHandler.registerFluids(); // Workbench - blockHeliumGenerator = new HeliumGenerator(); - blockFirePit = new FirePit(); blockFishTrap = new FishTrap(); blockInfiniteFLuidTank = new FluidTankInfinite(); blockMiningExplosive = new MiningExplosives(); blockHellfire = new HellFire(); blockProjectTable = new Machine_ProjectTable(); - blockTradeTable = new Machine_TradeTable(); - blockModularTable = new Machine_ModularityTable(); blockWitherGuard = new BlockWitherProof(); - blockXpConverter = new BlockTankXpConverter(); blockCompressedObsidian = new BlockCompressedObsidian(); - blockNet = new BlockNet(); - - blockFakeMiningPipe = new Mining_Pipe_Fake(); - blockFakeMiningHead = new Mining_Head_Fake(); blockCircuitProgrammer = new CircuitProgrammer(); blockDecayablesChest = new DecayablesChest(); - blockEggBox = new EggBox(); - - blockPlayerDoorWooden = new PlayerDoors(Material.wood, "door_wood", true); - blockPlayerDoorIron = new PlayerDoors(Material.iron, "door_iron", true); - blockPlayerDoorCustom_Glass = new PlayerDoors(Material.glass, "door_glass", false); - blockPlayerDoorCustom_Ice = new PlayerDoors(Material.ice, "door_ice", false); - blockPlayerDoorCustom_Cactus = new PlayerDoors( - Material.cactus, - "door_cactus", - false, - 0.6f, - Block.soundTypeGrass, - "Cactus"); - - // blockCustomSuperLight = new BlockSuperLight(); + blockCustomJukebox = new Machine_SuperJukebox(); blockPooCollector = new Machine_PooCollector(); @@ -165,7 +104,5 @@ public final class ModBlocks { blockVolumetricFlaskSetter = new VolumetricFlaskSetter(); - new BlockGenericRedstoneDetector(); - new BlockGenericRedstoneTest(); } } diff --git a/src/main/java/gtPlusPlus/core/block/general/BlockNet.java b/src/main/java/gtPlusPlus/core/block/general/BlockNet.java deleted file mode 100644 index c462021374..0000000000 --- a/src/main/java/gtPlusPlus/core/block/general/BlockNet.java +++ /dev/null @@ -1,37 +0,0 @@ -package gtPlusPlus.core.block.general; - -import static gregtech.api.enums.Mods.GTPlusPlus; - -import java.util.Random; - -import net.minecraft.block.BlockWeb; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.item.Item; - -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.item.ModItems; - -public class BlockNet extends BlockWeb { - - public BlockNet() { - this.setCreativeTab(AddToCreativeTab.tabBlock); - this.setLightOpacity(1); - this.setHardness(4.0F); - this.setBlockName("blockNet"); - GameRegistry.registerBlock(this, "blockNet"); - } - - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(final IIconRegister iIcon) { - this.blockIcon = iIcon.registerIcon(GTPlusPlus.ID + ":" + "net"); - } - - @Override - public Item getItemDropped(final int p_149650_1_, final Random p_149650_2_, final int p_149650_3_) { - return ModItems.itemRope; - } -} diff --git a/src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java b/src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java index a9c309d5c7..f62fc50a69 100644 --- a/src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java +++ b/src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java @@ -179,7 +179,6 @@ public class BlockSuperLight extends BlockContainer { else if (enable && aLight == 0) { aBlocksToUpdate.put(new BlockPos(xOff, yOff, zOff, this.worldObj)); if (aBlockGet instanceof BlockAir) { - Logger.INFO("Lit air."); this.worldObj.setBlock( xOff, yOff, @@ -188,7 +187,6 @@ public class BlockSuperLight extends BlockContainer { 0, 3); } -