From bfdc4d5f9c5483b6d7b086ab33815cf4b4304ad7 Mon Sep 17 00:00:00 2001 From: Tombenpotter Date: Mon, 7 Jul 2014 16:53:03 +0200 Subject: [PATCH] Commit for version 1.1.1. Last version before the BIG rewrite that will include RF support, and more! --- Changelog.txt | 85 ++- build.gradle | 4 +- capes.txt | 3 +- capes/Thumbs.db | Bin 17920 -> 18432 bytes capes/cape.png | Bin 341 -> 3566 bytes src/api/java/ic2/api/Direction.class | Bin 3321 -> 3515 bytes src/api/java/ic2/api/Direction.java | 19 +- src/api/java/ic2/api/crops/package-info.class | Bin 0 -> 255 bytes src/api/java/ic2/api/crops/package-info.java | 4 + .../ic2/api/energy/event/package-info.class | Bin 0 -> 262 bytes .../ic2/api/energy/event/package-info.java | 4 + .../java/ic2/api/energy/package-info.class | Bin 0 -> 256 bytes src/api/java/ic2/api/energy/package-info.java | 4 + .../ic2/api/energy/prefab/package-info.class | Bin 0 -> 263 bytes .../ic2/api/energy/prefab/package-info.java | 4 + .../ic2/api/energy/tile/IHeatSource.class | Bin 0 -> 281 bytes .../java/ic2/api/energy/tile/IHeatSource.java | 24 + .../ic2/api/energy/tile/package-info.class | Bin 0 -> 261 bytes .../ic2/api/energy/tile/package-info.java | 4 + src/api/java/ic2/api/event/package-info.class | Bin 0 -> 255 bytes src/api/java/ic2/api/event/package-info.java | 4 + src/api/java/ic2/api/info/package-info.class | Bin 0 -> 254 bytes src/api/java/ic2/api/info/package-info.java | 4 + src/api/java/ic2/api/item/package-info.class | Bin 0 -> 254 bytes src/api/java/ic2/api/item/package-info.java | 4 + .../java/ic2/api/network/package-info.class | Bin 0 -> 257 bytes .../java/ic2/api/network/package-info.java | 4 + src/api/java/ic2/api/package-info.class | Bin 0 -> 249 bytes src/api/java/ic2/api/package-info.java | 4 + .../java/ic2/api/reactor/package-info.class | Bin 0 -> 257 bytes .../java/ic2/api/reactor/package-info.java | 4 + .../ic2/api/recipe/RecipeInputOreDict.class | Bin 2492 -> 2799 bytes .../ic2/api/recipe/RecipeInputOreDict.java | 11 +- .../java/ic2/api/recipe/package-info.class | Bin 0 -> 256 bytes src/api/java/ic2/api/recipe/package-info.java | 4 + src/api/java/ic2/api/tile/package-info.class | Bin 0 -> 254 bytes src/api/java/ic2/api/tile/package-info.java | 4 + src/api/java/ic2/api/util/package-info.class | Bin 0 -> 254 bytes src/api/java/ic2/api/util/package-info.java | 4 + .../client/CapeEventHandler.java | 210 +++--- .../client/ClientProxy.java | 20 +- .../client/gui/GuiEtherealMacerator.java | 43 +- .../gui/GuiIndustrialWandRecharger.java | 43 +- .../client/model/ModelWings.java | 49 ++ .../client/renderer/RenderArcher.java | 6 +- .../client/renderer/RenderLaser.java | 125 ++-- .../common/BlockRegistry.java | 53 +- .../common/CommonProxy.java | 104 ++- .../electricmagictools/common/Config.java | 319 ++++----- .../common/CreativeTab.java | 16 +- .../common/DungeonChestGenerator.java | 18 + .../common/EMTEntityRegistry.java | 52 +- .../common/EMTEventHandler.java | 32 +- .../common/EMTResearchItem.java | 90 +-- .../common/ElectricMagicTools.java | 137 ++-- .../common/ItemRegistry.java | 226 ++++--- .../common/State of things.txt | 12 - .../common/ThaumonomiconResearch.java | 612 +++++++++--------- .../common/TileEntityRegistry.java | 64 +- .../common/blocks/BlockEMT.java | 81 +++ .../common/blocks/BlockEMTMachines.java | 218 +++---- .../common/blocks/BlockEMTSolars.java | 532 +++++---------- .../common/blocks/BlockEMTSolars2.java | 213 ++---- .../blocks/BlockEssentiaGenerators.java | 202 +++--- .../common/blocks/BlockPortableNode.java | 129 ++-- .../common/blocks/BlockShield.java | 95 +-- .../common/entities/EntityArcher.java | 148 ++--- .../common/entities/EntityLaser.java | 552 ++++++++-------- .../common/items/ItemEMTBaubles.java | 321 +++++---- .../common/items/ItemEMTItems.java | 259 ++++++-- .../items/ItemElectricScribingTools.java | 101 ++- .../common/items/ItemLightningSummoner.java | 85 --- .../common/items/ItemThaumiumPlate.java | 35 - .../armor/ItemElectricBootsTraveller.java | 261 -------- .../items/armor/ItemElectricGoggles.java | 72 --- .../items/armor/ItemNanoBootsTraveller.java | 102 --- .../items/armor/ItemNanoThaumicHelmet.java | 97 --- .../armor/ItemQuantumBootsTraveller.java | 102 --- .../items/armor/ItemQuantumThaumicHelmet.java | 250 ------- .../items/armor/ItemSolarHelmetRevealing.java | 319 --------- .../boots/ItemElectricBootsTraveller.java | 261 ++++++++ .../armor/boots/ItemNanoBootsTraveller.java | 103 +++ .../boots/ItemQuantumBootsTraveller.java | 103 +++ .../armor/goggles/ItemElectricGoggles.java | 73 +++ .../armor/goggles/ItemNanoThaumicHelmet.java | 97 +++ .../goggles/ItemQuantumThaumicHelmet.java | 246 +++++++ .../goggles/ItemSolarHelmetRevealing.java | 315 +++++++++ .../items/armor/wings/ItemFeatherWing.java | 79 +++ .../items/armor/wings/ItemNanoWing.java | 211 ++++++ .../items/armor/wings/ItemQuantumWing.java | 210 ++++++ .../wings/ItemThaumiumReinforcedWing.java | 94 +++ .../items/blocks/ItemBlockEMTMachines.java | 62 +- .../items/blocks/ItemBlockEMTSolars.java | 337 +++++----- .../items/blocks/ItemBlockEMTSolars2.java | 157 ++--- .../blocks/ItemBlockEssentiaGenerators.java | 70 +- .../common/items/foci/ItemBaseFocus.java | 188 +++--- .../common/items/foci/ItemChargeFocus.java | 113 ++-- .../common/items/foci/ItemChristmasFocus.java | 77 +-- .../common/items/foci/ItemExplosionFocus.java | 77 +-- .../common/items/foci/ItemShieldFocus.java | 157 ++--- .../items/foci/ItemWandChargingFocus.java | 91 +-- .../items/tools/ItemDiamondChainsaw.java | 142 ++-- .../items/tools/ItemElectricHoeGrowth.java | 126 ++-- .../items/tools/ItemOmnitoolDiamond.java | 162 ++--- .../common/items/tools/ItemOmnitoolIron.java | 290 ++++----- .../items/tools/ItemOmnitoolThaumium.java | 162 ++--- .../items/tools/ItemRockbreakerDrill.java | 470 +++++++------- .../items/tools/ItemStreamChainsaw.java | 294 ++++----- .../items/tools/ItemThaumiumChainsaw.java | 270 ++++---- .../common/items/tools/ItemThaumiumDrill.java | 280 ++++---- .../tools/hammer/ItemElectricThorHammer.java | 302 ++++----- .../tools/hammer/ItemTaintedThorHammer.java | 91 +-- .../items/tools/hammer/ItemThorHammer.java | 145 ++--- .../common/lib/CraftingAspects.java | 97 +-- .../common/lib/ResearchAspects.java | 91 +-- .../common/lib/TextHelper.java | 40 ++ .../common/recipes/EMTInitRecipes.java | 73 ++- .../common/recipes/EMTPostInitRecipes.java | 355 +++++----- .../common/recipes/UuMInfusionRecipes.java | 142 ++-- .../common/tile/TileEntityArborGenerator.java | 75 ++- .../common/tile/TileEntityAuramGenerator.java | 93 ++- .../common/tile/TileEntityEMT.java | 52 ++ .../tile/TileEntityEtherealMacerator.java | 471 +++++++------- .../common/tile/TileEntityIgnisGenerator.java | 93 ++- .../TileEntityIndustrialWandRecharge.java | 273 ++++---- .../common/tile/TileEntityPortableNode.java | 26 +- .../tile/TileEntityPotentiaGenerator.java | 95 ++- .../container/ContainerEtheralMacerator.java | 183 +++--- .../ContainerIndustrialWandRecharge.java | 181 +++--- .../common/tile/slot/SlotWandOnly.java | 38 +- .../tile/solars/TileEntityAirSolar.java | 175 +++-- .../solars/TileEntityCompressedSolar.java | 171 +++-- .../tile/solars/TileEntityDarkSolar.java | 171 +++-- .../tile/solars/TileEntityDoubleAirSolar.java | 175 +++-- .../TileEntityDoubleCompressedSolar.java | 171 +++-- .../solars/TileEntityDoubleDarkSolar.java | 171 +++-- .../solars/TileEntityDoubleEarthSolar.java | 175 +++-- .../solars/TileEntityDoubleFireSolar.java | 175 +++-- .../solars/TileEntityDoubleOrderSolar.java | 170 +++-- .../solars/TileEntityDoubleWaterSolar.java | 171 +++-- .../tile/solars/TileEntityEarthSolar.java | 175 +++-- .../tile/solars/TileEntityFireSolar.java | 175 +++-- .../tile/solars/TileEntityOrderSolar.java | 171 +++-- .../tile/solars/TileEntityTripleAirSolar.java | 175 +++-- .../TileEntityTripleCompressedSolar.java | 171 +++-- .../solars/TileEntityTripleDarkSolar.java | 171 +++-- .../solars/TileEntityTripleEarthSolar.java | 175 +++-- .../solars/TileEntityTripleFireSolar.java | 175 +++-- .../solars/TileEntityTripleOrderSolar.java | 170 +++-- .../solars/TileEntityTripleWaterSolar.java | 171 +++-- .../tile/solars/TileEntityWaterSolar.java | 171 +++-- .../assets/electricmagictools/lang/en_US.lang | 33 +- .../assets/electricmagictools/lang/zh_CH.lang | 0 .../textures/blocks/Thumbs.db | Bin 3072 -> 0 bytes .../blocks/essentiagenerator/arborfront.png | Bin 642 -> 2300 bytes .../essentiagenerator/arborfront_alt.png | Bin 0 -> 2076 bytes .../blocks/essentiagenerator/auramfront.png | Bin 943 -> 2308 bytes .../essentiagenerator/auramfront_alt.png | Bin 0 -> 2071 bytes .../blocks/essentiagenerator/front.png | Bin 0 -> 2322 bytes .../blocks/essentiagenerator/front_alt.png | Bin 0 -> 2080 bytes .../blocks/essentiagenerator/ignisfront.png | Bin 911 -> 2281 bytes .../essentiagenerator/ignisfront_alt.png | Bin 0 -> 2062 bytes .../essentiagenerator/potentiafront.png | Bin 921 -> 2288 bytes .../essentiagenerator/potentiafront_alt.png | Bin 0 -> 2069 bytes .../blocks/essentiagenerator/saxumfront.png | Bin 462 -> 2090 bytes .../essentiagenerator/saxumfront_alt.png | Bin 0 -> 1966 bytes .../blocks/essentiagenerator/side.png | Bin 693 -> 1971 bytes .../textures/blocks/essentiagenerator/top.png | Bin 910 -> 2105 bytes .../blocks/essentiagenerator/top_arbor.png | Bin 0 -> 1982 bytes .../blocks/essentiagenerator/top_auram.png | Bin 0 -> 2028 bytes .../blocks/essentiagenerator/top_ignis.png | Bin 0 -> 1990 bytes .../blocks/essentiagenerator/top_potentia.png | Bin 0 -> 1989 bytes .../blocks/essentiagenerator/top_saxum.png | Bin 0 -> 1914 bytes .../textures/blocks/machines/bottom.png | Bin 910 -> 1938 bytes .../blocks/machines/etherealmacerator.png | Bin 681 -> 1905 bytes .../machines/etherealmaceratorfront.png | Bin 721 -> 2251 bytes .../machines/etherealmaceratorfront_alt.png | Bin 0 -> 2288 bytes .../machines/etherealmaceratorfront_alt2.png | Bin 0 -> 2325 bytes .../machines/etherealmaceratorfront_alt3.png | Bin 0 -> 2379 bytes .../machines/etherealmaceratorfront_alt4.png | Bin 0 -> 2329 bytes .../machines/etherealmaceratorfrontactive.png | Bin 794 -> 2393 bytes .../etherealmaceratorfrontactive_alt.png | Bin 0 -> 2458 bytes .../etherealmaceratorfrontactive_alt2.png | Bin 0 -> 2446 bytes .../etherealmaceratorfrontactive_alt3.png | Bin 0 -> 2598 bytes .../etherealmaceratorfrontactive_alt4.png | Bin 0 -> 2496 bytes .../blocks/machines/etherealmaceratortop.png | Bin 858 -> 2240 bytes .../machines/etherealmaceratortop_alt.png | Bin 0 -> 2050 bytes .../machines/etherealmaceratortopactive.png | Bin 0 -> 2341 bytes .../etherealmaceratortopactive_alt.png | Bin 0 -> 2302 bytes .../textures/blocks/machines/side.png | Bin 693 -> 1905 bytes .../textures/blocks/machines/top.png | Bin 910 -> 2004 bytes .../textures/blocks/machines/top_alt.png | Bin 0 -> 2105 bytes .../textures/blocks/machines/top_alt2.png | Bin 0 -> 1914 bytes .../textures/blocks/machines/wandcharger.png | Bin 909 -> 1905 bytes .../blocks/machines/wandcharger_front.png | Bin 0 -> 2047 bytes .../textures/blocks/portablenode.png | Bin 352 -> 2009 bytes .../textures/blocks/shield.png | Bin 217 -> 2262 bytes .../textures/blocks/solars/air/Thumbs.db | Bin 0 -> 8704 bytes .../textures/blocks/solars/air/airbottom.png | Bin 0 -> 1821 bytes .../textures/blocks/solars/air/airside.png | Bin 0 -> 5073 bytes .../blocks/solars/air/doublesolartop.png | Bin 0 -> 2091 bytes .../textures/blocks/solars/air/solartop.png | Bin 0 -> 2707 bytes .../blocks/solars/air/triplesolartop.png | Bin 0 -> 2661 bytes .../textures/blocks/solars/airbottom.png | Bin 775 -> 0 bytes .../textures/blocks/solars/airside.png | Bin 680 -> 0 bytes .../textures/blocks/solars/bottom.png | Bin 910 -> 1821 bytes .../textures/blocks/solars/dark/Thumbs.db | Bin 0 -> 8704 bytes .../blocks/solars/dark/darkbottom.png | Bin 0 -> 1821 bytes .../textures/blocks/solars/dark/darkside.png | Bin 0 -> 4682 bytes .../blocks/solars/dark/doublesolartop.png | Bin 0 -> 2091 bytes .../textures/blocks/solars/dark/solartop.png | Bin 0 -> 2707 bytes .../blocks/solars/dark/triplesolartop.png | Bin 0 -> 2661 bytes .../textures/blocks/solars/darkbottom.png | Bin 751 -> 0 bytes .../textures/blocks/solars/darkside.png | Bin 663 -> 0 bytes .../textures/blocks/solars/doublesolartop.png | Bin 1099 -> 2091 bytes .../blocks/solars/earth/doublesolartop.png | Bin 0 -> 2091 bytes .../blocks/solars/earth/earthbottom.png | Bin 0 -> 1821 bytes .../blocks/solars/earth/earthside.png | Bin 0 -> 5187 bytes .../textures/blocks/solars/earth/solartop.png | Bin 0 -> 2707 bytes .../blocks/solars/earth/triplesolartop.png | Bin 0 -> 2661 bytes .../textures/blocks/solars/earthbottom.png | Bin 775 -> 0 bytes .../textures/blocks/solars/earthside.png | Bin 680 -> 0 bytes .../blocks/solars/fire/doublesolartop.png | Bin 0 -> 2091 bytes .../blocks/solars/fire/firebottom.png | Bin 0 -> 1821 bytes .../textures/blocks/solars/fire/fireside.png | Bin 0 -> 5253 bytes .../textures/blocks/solars/fire/solartop.png | Bin 0 -> 2707 bytes .../blocks/solars/fire/triplesolartop.png | Bin 0 -> 2661 bytes .../textures/blocks/solars/firebottom.png | Bin 765 -> 0 bytes .../textures/blocks/solars/fireside.png | Bin 673 -> 0 bytes .../textures/blocks/solars/order/Thumbs.db | Bin 0 -> 4608 bytes .../blocks/solars/order/doublesolartop.png | Bin 0 -> 2091 bytes .../blocks/solars/order/orderbottom.png | Bin 0 -> 1821 bytes .../blocks/solars/order/orderside.png | Bin 0 -> 4987 bytes .../textures/blocks/solars/order/solartop.png | Bin 0 -> 2707 bytes .../blocks/solars/order/triplesolartop.png | Bin 0 -> 2661 bytes .../textures/blocks/solars/orderbottom.png | Bin 750 -> 0 bytes .../textures/blocks/solars/orderside.png | Bin 664 -> 0 bytes .../textures/blocks/solars/side.png | Bin 693 -> 2001 bytes .../textures/blocks/solars/solartop.png | Bin 1212 -> 2707 bytes .../textures/blocks/solars/triplesolartop.png | Bin 962 -> 2661 bytes .../textures/blocks/solars/water/Thumbs.db | Bin 0 -> 16384 bytes .../blocks/solars/water/doublesolartop.png | Bin 0 -> 2091 bytes .../textures/blocks/solars/water/solartop.png | Bin 0 -> 2707 bytes .../blocks/solars/water/triplesolartop.png | Bin 0 -> 2661 bytes .../blocks/solars/water/waterbottom.png | Bin 0 -> 1821 bytes .../blocks/solars/water/waterside.png | Bin 0 -> 4990 bytes .../textures/blocks/solars/waterbottom.png | Bin 780 -> 0 bytes .../textures/blocks/solars/waterside.png | Bin 687 -> 0 bytes .../textures/guis/Thumbs.db | Bin 5120 -> 0 bytes .../textures/guis/etherealmacerator.png | Bin 2092 -> 16004 bytes .../textures/guis/wandcharger.png | Bin 1932 -> 15672 bytes .../textures/items/OLDlightningsummoner.png | Bin 0 -> 269 bytes .../textures/items/Thumbs.db | Bin 3072 -> 0 bytes .../textures/items/cardboard.png | Bin 0 -> 1382 bytes .../textures/items/chainsaw.png | Bin 0 -> 1455 bytes .../textures/items/chargefocus.png | Bin 6298 -> 4189 bytes .../textures/items/christmasfocus.png | Bin 392 -> 1447 bytes .../textures/items/clusteruranium.png | Bin 544 -> 1607 bytes .../textures/items/denseironsheet.png | Bin 0 -> 1159 bytes .../textures/items/diamondchainsaw.png | Bin 796 -> 2346 bytes .../textures/items/diamondchainsaw_16X.png | Bin 0 -> 1486 bytes .../textures/items/diamonddrill_16X.png | Bin 0 -> 1510 bytes .../textures/items/diamondomnitool.png | Bin 858 -> 2173 bytes .../textures/items/diamondomnitool_16X.png | Bin 0 -> 1422 bytes .../textures/items/diamondomnitool_alt.png | Bin 0 -> 2182 bytes .../textures/items/drill.png | Bin 0 -> 1491 bytes .../textures/items/ducttape.png | Bin 0 -> 1461 bytes .../textures/items/electricboots.png | Bin 752 -> 1740 bytes .../textures/items/electricboots_ALT.png | Bin 0 -> 1786 bytes .../textures/items/electricgoggles.png | Bin 501 -> 1493 bytes .../textures/items/electricgoggles_alt.png | Bin 0 -> 1616 bytes .../textures/items/electrichoe_16X.png | Bin 0 -> 1339 bytes .../textures/items/electrichoegrowth.png | Bin 1327 -> 1382 bytes .../textures/items/electrichoegrowth_16X.png | Bin 0 -> 1399 bytes .../textures/items/electrichoegrowth_32x.png | Bin 0 -> 1863 bytes .../textures/items/electrichoegrowth_alt.png | Bin 0 -> 1417 bytes .../items/electrichoegrowth_alt32x.png | Bin 0 -> 2061 bytes .../textures/items/feathercarboardwing.png | Bin 0 -> 1425 bytes .../textures/items/feathercardboardwing.png | Bin 0 -> 1425 bytes .../textures/items/feathermesh.png | Bin 0 -> 1550 bytes .../textures/items/featherwings.png | Bin 0 -> 1822 bytes .../textures/items/featherwings_flat.png | Bin 0 -> 1768 bytes .../textures/items/glue.png | Bin 0 -> 326 bytes .../textures/items/glueball.png | Bin 0 -> 326 bytes .../items/hammer/electricthorhammer.png | Bin 1620 -> 4233 bytes .../hammer/electricthorhammer.png.mcmeta | 2 +- .../items/hammer/electricthorhammer_alt.png | Bin 0 -> 2724 bytes .../items/hammer/hammerStages/electric01.png | Bin 0 -> 1608 bytes .../items/hammer/hammerStages/electric02.png | Bin 0 -> 1616 bytes .../items/hammer/hammerStages/electric03.png | Bin 0 -> 1603 bytes .../items/hammer/hammerStages/electric04.png | Bin 0 -> 1646 bytes .../items/hammer/taintedthorhammer.png | Bin 1332 -> 9466 bytes .../items/hammer/taintedthorhammer.png.mcmeta | 21 +- .../items/hammer/taintedthorhammer_long.png | Bin 0 -> 11737 bytes .../items/hammer/taintedthorhammer_short.png | Bin 0 -> 7272 bytes .../textures/items/hammer/thorhammer.png | Bin 575 -> 1604 bytes .../textures/items/ironomnitool.png | Bin 846 -> 2114 bytes .../textures/items/ironomnitool_16X.png | Bin 0 -> 1382 bytes .../textures/items/lightningsummoner.png | Bin 269 -> 1519 bytes .../textures/items/lightningsummoner_alt.png | Bin 0 -> 1522 bytes .../textures/items/nanobootstravel.png | Bin 3230 -> 1552 bytes .../textures/items/nanothaumichelmet.png | Bin 462 -> 1420 bytes .../textures/items/nanothaumichelmet_alt.png | Bin 0 -> 1430 bytes .../textures/items/nanowings.png | Bin 0 -> 1821 bytes .../textures/items/quantumbootstravel.png | Bin 699 -> 1704 bytes .../textures/items/quantumthaumichelmet.png | Bin 530 -> 1406 bytes .../items/quantumthaumichelmet_alt.png | Bin 0 -> 1423 bytes .../textures/items/quantumwings.png | Bin 0 -> 1826 bytes .../textures/items/rockbreakerdrill_16X.png | Bin 0 -> 1497 bytes .../textures/items/rubberball.png | Bin 0 -> 1313 bytes .../textures/items/shieldfocus.png | Bin 509 -> 1554 bytes .../textures/items/shieldfocus_alt.png | Bin 0 -> 1538 bytes .../textures/items/solarrevealinghelmet.png | Bin 472 -> 1455 bytes .../items/solarrevealinghelmet_alt.png | Bin 0 -> 1573 bytes .../items/solarrevealinghelmet_alt2.png | Bin 0 -> 1599 bytes .../items/solarrevealinghelmet_alt3.png | Bin 0 -> 1523 bytes .../textures/items/streamchainsaw.png | Bin 1159 -> 2166 bytes .../textures/items/taintedfeather.png | Bin 0 -> 1430 bytes .../textures/items/thaumiumWing.png | Bin 0 -> 1433 bytes .../textures/items/thaumiumchainsaw.png | Bin 802 -> 2130 bytes .../textures/items/thaumiumchainsaw_16X.png | Bin 0 -> 1489 bytes .../textures/items/thaumiumchainsaw_alt.png | Bin 0 -> 2200 bytes .../textures/items/thaumiumdrill.png | Bin 845 -> 2193 bytes .../textures/items/thaumiumdrill_16X.png | Bin 0 -> 1502 bytes .../textures/items/thaumiumdrill_alt.png | Bin 0 -> 1986 bytes .../textures/items/thaumiumdrill_alt2.png | Bin 0 -> 2120 bytes .../textures/items/thaumiumomnitool.png | Bin 855 -> 2094 bytes .../textures/items/thaumiumomnitool_16X.png | Bin 0 -> 1404 bytes .../textures/items/thaumiumomnitool_alt.png | Bin 0 -> 2362 bytes .../textures/items/thaumiumomnitool_alt2.png | Bin 0 -> 2172 bytes .../textures/items/thaumiumwings.png | Bin 0 -> 2059 bytes .../textures/items/wandchargefocus.png | Bin 411 -> 1543 bytes .../textures/items/wings_random.png | Bin 0 -> 2323 bytes .../textures/items/wings_random2.png | Bin 0 -> 1872 bytes .../textures/misc/Thumbs.db | Bin 16896 -> 0 bytes .../textures/models/Thumbs.db | Bin 10240 -> 0 bytes .../textures/models/electricboots.png | Bin 508 -> 1410 bytes .../textures/models/electricgoggles.png | Bin 824 -> 1695 bytes .../textures/models/featherwing.png | Bin 0 -> 4323 bytes .../textures/models/featherwing_noString.png | Bin 0 -> 4237 bytes .../textures/models/nanobootstravel.png | Bin 3078 -> 1372 bytes .../textures/models/nanowing.png | Bin 0 -> 1977 bytes .../textures/models/quantumbootstravel.png | Bin 495 -> 1403 bytes .../textures/models/quantumwing.png | Bin 0 -> 1927 bytes .../textures/models/solarrevealinghelmet.png | Bin 961 -> 2164 bytes .../textures/models/thaumicnanohelmet.png | Bin 808 -> 1625 bytes .../textures/models/thaumicquantumhelmet.png | Bin 885 -> 1613 bytes .../textures/models/thaumiumwing.png | Bin 0 -> 2176 bytes 348 files changed, 9602 insertions(+), 8919 deletions(-) create mode 100644 src/api/java/ic2/api/crops/package-info.class create mode 100644 src/api/java/ic2/api/crops/package-info.java create mode 100644 src/api/java/ic2/api/energy/event/package-info.class create mode 100644 src/api/java/ic2/api/energy/event/package-info.java create mode 100644 src/api/java/ic2/api/energy/package-info.class create mode 100644 src/api/java/ic2/api/energy/package-info.java create mode 100644 src/api/java/ic2/api/energy/prefab/package-info.class create mode 100644 src/api/java/ic2/api/energy/prefab/package-info.java create mode 100644 src/api/java/ic2/api/energy/tile/IHeatSource.class create mode 100644 src/api/java/ic2/api/energy/tile/IHeatSource.java create mode 100644 src/api/java/ic2/api/energy/tile/package-info.class create mode 100644 src/api/java/ic2/api/energy/tile/package-info.java create mode 100644 src/api/java/ic2/api/event/package-info.class create mode 100644 src/api/java/ic2/api/event/package-info.java create mode 100644 src/api/java/ic2/api/info/package-info.class create mode 100644 src/api/java/ic2/api/info/package-info.java create mode 100644 src/api/java/ic2/api/item/package-info.class create mode 100644 src/api/java/ic2/api/item/package-info.java create mode 100644 src/api/java/ic2/api/network/package-info.class create mode 100644 src/api/java/ic2/api/network/package-info.java create mode 100644 src/api/java/ic2/api/package-info.class create mode 100644 src/api/java/ic2/api/package-info.java create mode 100644 src/api/java/ic2/api/reactor/package-info.class create mode 100644 src/api/java/ic2/api/reactor/package-info.java create mode 100644 src/api/java/ic2/api/recipe/package-info.class create mode 100644 src/api/java/ic2/api/recipe/package-info.java create mode 100644 src/api/java/ic2/api/tile/package-info.class create mode 100644 src/api/java/ic2/api/tile/package-info.java create mode 100644 src/api/java/ic2/api/util/package-info.class create mode 100644 src/api/java/ic2/api/util/package-info.java create mode 100644 src/main/java/electricMagicTools/tombenpotter/electricmagictools/client/model/ModelWings.java create mode 100644 src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/DungeonChestGenerator.java delete mode 100644 src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/State of things.txt create mode 100644 src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/blocks/BlockEMT.java delete mode 100644 src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/ItemLightningSummoner.java delete mode 100644 src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/ItemThaumiumPlate.java delete mode 100644 src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/armor/ItemElectricBootsTraveller.java delete mode 100644 src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/armor/ItemElectricGoggles.java delete mode 100644 src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/armor/ItemNanoBootsTraveller.java delete mode 100644 src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/armor/ItemNanoThaumicHelmet.java delete mode 100644 src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/armor/ItemQuantumBootsTraveller.java delete mode 100644 src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/armor/ItemQuantumThaumicHelmet.java delete mode 100644 src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/armor/ItemSolarHelmetRevealing.java create mode 100644 src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/armor/boots/ItemElectricBootsTraveller.java create mode 100644 src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/armor/boots/ItemNanoBootsTraveller.java create mode 100644 src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/armor/boots/ItemQuantumBootsTraveller.java create mode 100644 src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/armor/goggles/ItemElectricGoggles.java create mode 100644 src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/armor/goggles/ItemNanoThaumicHelmet.java create mode 100644 src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/armor/goggles/ItemQuantumThaumicHelmet.java create mode 100644 src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/armor/goggles/ItemSolarHelmetRevealing.java create mode 100644 src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/armor/wings/ItemFeatherWing.java create mode 100644 src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/armor/wings/ItemNanoWing.java create mode 100644 src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/armor/wings/ItemQuantumWing.java create mode 100644 src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/armor/wings/ItemThaumiumReinforcedWing.java create mode 100644 src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/lib/TextHelper.java create mode 100644 src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/TileEntityEMT.java delete mode 100644 src/main/resources/assets/electricmagictools/lang/zh_CH.lang delete mode 100644 src/main/resources/assets/electricmagictools/textures/blocks/Thumbs.db create mode 100644 src/main/resources/assets/electricmagictools/textures/blocks/essentiagenerator/arborfront_alt.png create mode 100644 src/main/resources/assets/electricmagictools/textures/blocks/essentiagenerator/auramfront_alt.png create mode 100644 src/main/resources/assets/electricmagictools/textures/blocks/essentiagenerator/front.png create mode 100644 src/main/resources/assets/electricmagictools/textures/blocks/essentiagenerator/front_alt.png create mode 100644 src/main/resources/assets/electricmagictools/textures/blocks/essentiagenerator/ignisfront_alt.png create mode 100644 src/main/resources/assets/electricmagictools/textures/blocks/essentiagenerator/potentiafront_alt.png create mode 100644 src/main/resources/assets/electricmagictools/textures/blocks/essentiagenerator/saxumfront_alt.png create mode 100644 src/main/resources/assets/electricmagictools/textures/blocks/essentiagenerator/top_arbor.png create mode 100644 src/main/resources/assets/electricmagictools/textures/blocks/essentiagenerator/top_auram.png create mode 100644 src/main/resources/assets/electricmagictools/textures/blocks/essentiagenerator/top_ignis.png create mode 100644 src/main/resources/assets/electricmagictools/textures/blocks/essentiagenerator/top_potentia.png create mode 100644 src/main/resources/assets/electricmagictools/textures/blocks/essentiagenerator/top_saxum.png create mode 100644 src/main/resources/assets/electricmagictools/textures/blocks/machines/etherealmaceratorfront_alt.png create mode 100644 src/main/resources/assets/electricmagictools/textures/blocks/machines/etherealmaceratorfront_alt2.png create mode 100644 src/main/resources/assets/electricmagictools/textures/blocks/machines/etherealmaceratorfront_alt3.png create mode 100644 src/main/resources/assets/electricmagictools/textures/blocks/machines/etherealmaceratorfront_alt4.png create mode 100644 src/main/resources/assets/electricmagictools/textures/blocks/machines/etherealmaceratorfrontactive_alt.png create mode 100644 src/main/resources/assets/electricmagictools/textures/blocks/machines/etherealmaceratorfrontactive_alt2.png create mode 100644 src/main/resources/assets/electricmagictools/textures/blocks/machines/etherealmaceratorfrontactive_alt3.png create mode 100644 src/main/resources/assets/electricmagictools/textures/blocks/machines/etherealmaceratorfrontactive_alt4.png create mode 100644 src/main/resources/assets/electricmagictools/textures/blocks/machines/etherealmaceratortop_alt.png create mode 100644 src/main/resources/assets/electricmagictools/textures/blocks/machines/etherealmaceratortopactive.png create mode 100644 src/main/resources/assets/electricmagictools/textures/blocks/machines/etherealmaceratortopactive_alt.png create mode 100644 src/main/resources/assets/electricmagictools/textures/blocks/machines/top_alt.png create mode 100644 src/main/resources/assets/electricmagictools/textures/blocks/machines/top_alt2.png create mode 100644 src/main/resources/assets/electricmagictools/textures/blocks/machines/wandcharger_front.png create mode 100644 src/main/resources/assets/electricmagictools/textures/blocks/solars/air/Thumbs.db create mode 100644 src/main/resources/assets/electricmagictools/textures/blocks/solars/air/airbottom.png create mode 100644 src/main/resources/assets/electricmagictools/textures/blocks/solars/air/airside.png create mode 100644 src/main/resources/assets/electricmagictools/textures/blocks/solars/air/doublesolartop.png create mode 100644 src/main/resources/assets/electricmagictools/textures/blocks/solars/air/solartop.png create mode 100644 src/main/resources/assets/electricmagictools/textures/blocks/solars/air/triplesolartop.png delete mode 100644 src/main/resources/assets/electricmagictools/textures/blocks/solars/airbottom.png delete mode 100644 src/main/resources/assets/electricmagictools/textures/blocks/solars/airside.png create mode 100644 src/main/resources/assets/electricmagictools/textures/blocks/solars/dark/Thumbs.db create mode 100644 src/main/resources/assets/electricmagictools/textures/blocks/solars/dark/darkbottom.png create mode 100644 src/main/resources/assets/electricmagictools/textures/blocks/solars/dark/darkside.png create mode 100644 src/main/resources/assets/electricmagictools/textures/blocks/solars/dark/doublesolartop.png create mode 100644 src/main/resources/assets/electricmagictools/textures/blocks/solars/dark/solartop.png create mode 100644 src/main/resources/assets/electricmagictools/textures/blocks/solars/dark/triplesolartop.png delete mode 100644 src/main/resources/assets/electricmagictools/textures/blocks/solars/darkbottom.png delete mode 100644 src/main/resources/assets/electricmagictools/textures/blocks/solars/darkside.png create mode 100644 src/main/resources/assets/electricmagictools/textures/blocks/solars/earth/doublesolartop.png create mode 100644 src/main/resources/assets/electricmagictools/textures/blocks/solars/earth/earthbottom.png create mode 100644 src/main/resources/assets/electricmagictools/textures/blocks/solars/earth/earthside.png create mode 100644 src/main/resources/assets/electricmagictools/textures/blocks/solars/earth/solartop.png create mode 100644 src/main/resources/assets/electricmagictools/textures/blocks/solars/earth/triplesolartop.png delete mode 100644 src/main/resources/assets/electricmagictools/textures/blocks/solars/earthbottom.png delete mode 100644 src/main/resources/assets/electricmagictools/textures/blocks/solars/earthside.png create mode 100644 src/main/resources/assets/electricmagictools/textures/blocks/solars/fire/doublesolartop.png create mode 100644 src/main/resources/assets/electricmagictools/textures/blocks/solars/fire/firebottom.png create mode 100644 src/main/resources/assets/electricmagictools/textures/blocks/solars/fire/fireside.png create mode 100644 src/main/resources/assets/electricmagictools/textures/blocks/solars/fire/solartop.png create mode 100644 src/main/resources/assets/electricmagictools/textures/blocks/solars/fire/triplesolartop.png delete mode 100644 src/main/resources/assets/electricmagictools/textures/blocks/solars/firebottom.png delete mode 100644 src/main/resources/assets/electricmagictools/textures/blocks/solars/fireside.png create mode 100644 src/main/resources/assets/electricmagictools/textures/blocks/solars/order/Thumbs.db create mode 100644 src/main/resources/assets/electricmagictools/textures/blocks/solars/order/doublesolartop.png create mode 100644 src/main/resources/assets/electricmagictools/textures/blocks/solars/order/orderbottom.png create mode 100644 src/main/resources/assets/electricmagictools/textures/blocks/solars/order/orderside.png create mode 100644 src/main/resources/assets/electricmagictools/textures/blocks/solars/order/solartop.png create mode 100644 src/main/resources/assets/electricmagictools/textures/blocks/solars/order/triplesolartop.png delete mode 100644 src/main/resources/assets/electricmagictools/textures/blocks/solars/orderbottom.png delete mode 100644 src/main/resources/assets/electricmagictools/textures/blocks/solars/orderside.png create mode 100644 src/main/resources/assets/electricmagictools/textures/blocks/solars/water/Thumbs.db create mode 100644 src/main/resources/assets/electricmagictools/textures/blocks/solars/water/doublesolartop.png create mode 100644 src/main/resources/assets/electricmagictools/textures/blocks/solars/water/solartop.png create mode 100644 src/main/resources/assets/electricmagictools/textures/blocks/solars/water/triplesolartop.png create mode 100644 src/main/resources/assets/electricmagictools/textures/blocks/solars/water/waterbottom.png create mode 100644 src/main/resources/assets/electricmagictools/textures/blocks/solars/water/waterside.png delete mode 100644 src/main/resources/assets/electricmagictools/textures/blocks/solars/waterbottom.png delete mode 100644 src/main/resources/assets/electricmagictools/textures/blocks/solars/waterside.png delete mode 100644 src/main/resources/assets/electricmagictools/textures/guis/Thumbs.db create mode 100644 src/main/resources/assets/electricmagictools/textures/items/OLDlightningsummoner.png delete mode 100644 src/main/resources/assets/electricmagictools/textures/items/Thumbs.db create mode 100644 src/main/resources/assets/electricmagictools/textures/items/cardboard.png create mode 100644 src/main/resources/assets/electricmagictools/textures/items/chainsaw.png create mode 100644 src/main/resources/assets/electricmagictools/textures/items/denseironsheet.png create mode 100644 src/main/resources/assets/electricmagictools/textures/items/diamondchainsaw_16X.png create mode 100644 src/main/resources/assets/electricmagictools/textures/items/diamonddrill_16X.png create mode 100644 src/main/resources/assets/electricmagictools/textures/items/diamondomnitool_16X.png create mode 100644 src/main/resources/assets/electricmagictools/textures/items/diamondomnitool_alt.png create mode 100644 src/main/resources/assets/electricmagictools/textures/items/drill.png create mode 100644 src/main/resources/assets/electricmagictools/textures/items/ducttape.png create mode 100644 src/main/resources/assets/electricmagictools/textures/items/electricboots_ALT.png create mode 100644 src/main/resources/assets/electricmagictools/textures/items/electricgoggles_alt.png create mode 100644 src/main/resources/assets/electricmagictools/textures/items/electrichoe_16X.png create mode 100644 src/main/resources/assets/electricmagictools/textures/items/electrichoegrowth_16X.png create mode 100644 src/main/resources/assets/electricmagictools/textures/items/electrichoegrowth_32x.png create mode 100644 src/main/resources/assets/electricmagictools/textures/items/electrichoegrowth_alt.png create mode 100644 src/main/resources/assets/electricmagictools/textures/items/electrichoegrowth_alt32x.png create mode 100644 src/main/resources/assets/electricmagictools/textures/items/feathercarboardwing.png create mode 100644 src/main/resources/assets/electricmagictools/textures/items/feathercardboardwing.png create mode 100644 src/main/resources/assets/electricmagictools/textures/items/feathermesh.png create mode 100644 src/main/resources/assets/electricmagictools/textures/items/featherwings.png create mode 100644 src/main/resources/assets/electricmagictools/textures/items/featherwings_flat.png create mode 100644 src/main/resources/assets/electricmagictools/textures/items/glue.png create mode 100644 src/main/resources/assets/electricmagictools/textures/items/glueball.png create mode 100644 src/main/resources/assets/electricmagictools/textures/items/hammer/electricthorhammer_alt.png create mode 100644 src/main/resources/assets/electricmagictools/textures/items/hammer/hammerStages/electric01.png create mode 100644 src/main/resources/assets/electricmagictools/textures/items/hammer/hammerStages/electric02.png create mode 100644 src/main/resources/assets/electricmagictools/textures/items/hammer/hammerStages/electric03.png create mode 100644 src/main/resources/assets/electricmagictools/textures/items/hammer/hammerStages/electric04.png create mode 100644 src/main/resources/assets/electricmagictools/textures/items/hammer/taintedthorhammer_long.png create mode 100644 src/main/resources/assets/electricmagictools/textures/items/hammer/taintedthorhammer_short.png create mode 100644 src/main/resources/assets/electricmagictools/textures/items/ironomnitool_16X.png create mode 100644 src/main/resources/assets/electricmagictools/textures/items/lightningsummoner_alt.png create mode 100644 src/main/resources/assets/electricmagictools/textures/items/nanothaumichelmet_alt.png create mode 100644 src/main/resources/assets/electricmagictools/textures/items/nanowings.png create mode 100644 src/main/resources/assets/electricmagictools/textures/items/quantumthaumichelmet_alt.png create mode 100644 src/main/resources/assets/electricmagictools/textures/items/quantumwings.png create mode 100644 src/main/resources/assets/electricmagictools/textures/items/rockbreakerdrill_16X.png create mode 100644 src/main/resources/assets/electricmagictools/textures/items/rubberball.png create mode 100644 src/main/resources/assets/electricmagictools/textures/items/shieldfocus_alt.png create mode 100644 src/main/resources/assets/electricmagictools/textures/items/solarrevealinghelmet_alt.png create mode 100644 src/main/resources/assets/electricmagictools/textures/items/solarrevealinghelmet_alt2.png create mode 100644 src/main/resources/assets/electricmagictools/textures/items/solarrevealinghelmet_alt3.png create mode 100644 src/main/resources/assets/electricmagictools/textures/items/taintedfeather.png create mode 100644 src/main/resources/assets/electricmagictools/textures/items/thaumiumWing.png create mode 100644 src/main/resources/assets/electricmagictools/textures/items/thaumiumchainsaw_16X.png create mode 100644 src/main/resources/assets/electricmagictools/textures/items/thaumiumchainsaw_alt.png create mode 100644 src/main/resources/assets/electricmagictools/textures/items/thaumiumdrill_16X.png create mode 100644 src/main/resources/assets/electricmagictools/textures/items/thaumiumdrill_alt.png create mode 100644 src/main/resources/assets/electricmagictools/textures/items/thaumiumdrill_alt2.png create mode 100644 src/main/resources/assets/electricmagictools/textures/items/thaumiumomnitool_16X.png create mode 100644 src/main/resources/assets/electricmagictools/textures/items/thaumiumomnitool_alt.png create mode 100644 src/main/resources/assets/electricmagictools/textures/items/thaumiumomnitool_alt2.png create mode 100644 src/main/resources/assets/electricmagictools/textures/items/thaumiumwings.png create mode 100644 src/main/resources/assets/electricmagictools/textures/items/wings_random.png create mode 100644 src/main/resources/assets/electricmagictools/textures/items/wings_random2.png delete mode 100644 src/main/resources/assets/electricmagictools/textures/misc/Thumbs.db delete mode 100644 src/main/resources/assets/electricmagictools/textures/models/Thumbs.db create mode 100644 src/main/resources/assets/electricmagictools/textures/models/featherwing.png create mode 100644 src/main/resources/assets/electricmagictools/textures/models/featherwing_noString.png create mode 100644 src/main/resources/assets/electricmagictools/textures/models/nanowing.png create mode 100644 src/main/resources/assets/electricmagictools/textures/models/quantumwing.png create mode 100644 src/main/resources/assets/electricmagictools/textures/models/thaumiumwing.png diff --git a/Changelog.txt b/Changelog.txt index 2005e0c..e484a1d 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -1,20 +1,77 @@ Changelog of the mod : Electric Magic Tools, a Thaumcraft 4/Industrial-Craft 2 addon -------------------------------------------------------------------------------------------------------------------------------------------------------- +Version 1.1.1 : +Fixed a bug with The One Ring where mobs attacked you when you removed it while in creative. +New Thaumonomicon entries for a couple of things, thanks to Professor29. +Forgot to mention it, new Nanosuit Boots of the Traveller texture thanks to TehNut. +Removed Thaumium Plate and Lightning Summoner, and moved them to use other ids. This will delete existing ones. +Moved all the Solar Panels tooltips to require the use of the shift key to show themselves. +Adding wings, my take at the mix of Magic and Jetpacks. +Blacklist of the Etheral Processor now extends to anything containing armor, armour, helm, chestp, legging, boot, sword, shovel, axe or pick in its unlocalized name. +Added a drop to the Tainted Chicken, the Tainted Feather. Also added a crafting recipe for it. +Added a couple of crating components, used in the making of the wings. +Added a bunch of console outputs on the starting of the game so that I know exactly when it crashed if it died at startup. +Fixed a bug with the drill of the Rockbreaker that would make it use durability and eventually break when shift-breaking a block. +Added a different texture file for each solar panel, so that it can be changed more easily. +CyanideX remade all the EMT textures! Finally featuring cool looking stuff! Yey, thanks a lot to him! -Version 1.0.0 : First release of the mod. -Version 1.0.1 : Second release of the mod : fixes a crash due to the Omnitools. -Version 1.0.2 : Third release of the mod : adds the Wand Focus : Laser, and a christmas easter egg. Does not work on servers. -Version 1.0.3 : Attempt to fix the server crash of the mod. Attemps failed. -Version 1.0.3b : Second attempt to fix the server crash, it is again working in SMP. -Version 1.0.4 : Adds the Kris-tmas Focus and the Shield Focus -Version 1.0.5 : Added some Ignis/Potentia/Auram generators, Electric Goggles of revealing, Chainsaw of the Stream, and Drill of the Rockbreaker. -Version 1.0.6beta1 : Added an Industrial Wand Charging Station, some legendary tools, and a couple of other stuff. -Version 1.0.6beta2 : No new stuff, but switched to ForgeGradle (964) -Version 1.0.6beta3 : Added some enhanced boots of the traveller, and also capes for me and some friends -Version 1.0.7 : Updated to Thaumcraft 4.1.0x -Version 1.0.8 : Added some magical solar panels, different tiers and special capablities to all of them. -Version 1.0.9beta1 : Fixed the bug with the Drill of the Rockbreaker, added UU-Matter Infusion Recipes, fixed the recipe for the Quantum Solar Helmet of Revealing, added the Wand Focus: Charging, a cool particle effect existing when the Electric/Nano/Quantum boots of the traveller are worn (you an disable it in the config),a portable node (Azanor agreed about the balance), and an Elecric Hoe of Growth. -Version 1.0.9beta2 : Added a blacklist for the Ethereal Processor to anything that has "dust" in its OreDict entry. Included my build.gradle in the commit :) +Version 1.1.0 : +Updating to MC 1.7.2. +Added an Inventory Charging Bauble and an Armor Charging Bauble. +Added The One Ring, available only through dungeon loot. +Added a Wand Charging wand focus. + +Versions 1.0.9a, 1.0.9b, 1.0.9c, 1.0.9d : +Added a blacklist for the Ethereal Processor to anything that has "dust" in its OreDict entry. +Mainly bugfixes. + +Version 1.0.9 : +Fixed the bug with the Drill of the Rockbreaker. +Added UU-Matter Infusion Recipes. +Fixed the recipe for the Quantum Solar Helmet of Revealing. +Added the Wand Focus: Charging. +Added a cool particle effect existing when the Electric/Nano/Quantum boots of the traveller are worn (you an disable it in the config). +Added a portable node, and an Elecric Hoe of Growth. + +Version 1.0.8 : +Added some magical solar panels, different tiers and special abilities to all of them. + +Version 1.0.7 : +Updated to Thaumcraft 4.1.0x. + +Version 1.0.6 : +Added an Industrial Wand Charging Station. +Added some legendary tools. +A couple of other things. +Code wise, switching to Forge Gradle (#964). +Added some enhanced boots of the traveller, and capes for some friends and I. + +Version 1.0.5 : +Added some Ignis/Potentia/Auram generators. +Added Electric Goggles of revealing. +Added a Chainsaw of the Stream. +Added a Drill of the Rockbreaker. + +Version 1.0.4 : +Added the Kris-tmas Focus. +Added the Shield Focus + +Version 1.0.3b : +Second attempt to fix the server crash, it is again working in SMP. + +Version 1.0.3 : +Attempt to fix the server crash of the mod. Attempt failed. + +Version 1.0.2 : +Adds the Wand Focus : Laser. +Added a christmas easter egg. +Does not work on servers. + +Version 1.0.1 : +Fixes a crash due to the Omnitools. + +Version 1.0.0 : +First release of the mod. -------------------------------------------------------------------------------------------------------------------------------------------------------- \ No newline at end of file diff --git a/build.gradle b/build.gradle index e12d22a..af6ca82 100644 --- a/build.gradle +++ b/build.gradle @@ -17,12 +17,12 @@ buildscript { apply plugin: 'forge' -version = "1.1.0" +version = "1.1.1" group= "electricMagicTools.tombenpotter" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "ElectroMagicTools" minecraft { - version = "1.7.2-10.12.0.1057" + version = "1.7.2-10.12.2.1147" assetDir = "eclipse/assets" } diff --git a/capes.txt b/capes.txt index 116fe4a..b39b751 100644 --- a/capes.txt +++ b/capes.txt @@ -9,4 +9,5 @@ VMvinner:https://raw.github.com/Tombenpotter/Electro-Magic-Tools/master/capes/ca Drullkus:https://raw.github.com/Tombenpotter/Electro-Magic-Tools/master/capes/cape.png jztech101:https://raw.github.com/Tombenpotter/Electro-Magic-Tools/master/capes/cape.png Pixel_404:https://raw.github.com/Tombenpotter/Electro-Magic-Tools/master/capes/cape.png -Speedynutty68:https://raw.github.com/Tombenpotter/Electro-Magic-Tools/master/capes/cape.png \ No newline at end of file +Speedynutty68:https://raw.github.com/Tombenpotter/Electro-Magic-Tools/master/capes/cape.png +TheDrunkMafia:https://raw.github.com/Tombenpotter/Electro-Magic-Tools/master/capes/cape.png \ No newline at end of file diff --git a/capes/Thumbs.db b/capes/Thumbs.db index 8661b0a0d30b0e94ed3c3ce36b2dae3e51b973cb..e07e3ac7d6cb29270f08de612b9b1224249c30ef 100644 GIT binary patch delta 828 zcmZqZVQiSdxS@rKRf&Ot;oruhw4IeZfi+sZejpJ!wS3OcAwu43`yU;{G$1Ht4* zL5;~jSiC1Y>ltn?VZ9+GIt3^*6^N$+@pK@b0mML)<}+?m^58bKW(0D9AVNJaGVorf^PH;L$);)wjP!KQN6GK&U$|~{rqm{GWKur z-Ftrh371>tIpH!}P5qSQ4a-w4!}32D@qOL*PiHx=f{S*;{7HI0^n;-eG-5DiFk^^k zuwY0ALSu#`hExU#uc=($a`fXSiy-_8wP~6p)?Ix^hwG7N#G6e`SVE zG`O@Q!tv|U-G55-*aC7K3V)vUO^6AvKcr{Bb~WRKX$(zY*$UpVhMf6j&^Oy`0mov# zB|p#JU%4QGi9@XcLNqgd_$4`?7w7;mNGORcV-e}*aWh_XBI7qm$kWx&Wt~$()8xr6 ox|R|^0Z`166*cvAiW*#@S5K$l!xnm=ketk~Yq-dnagy^603Y5fBme*a delta 709 zcmZpez}V2kxS@rK@!!V4YQ{+{IeZ^DS0Ap5I?u?=z`$@oWpWjZ9|seV`5y=-HwtP@ z{=wqS%LwAJ!bC5!sBA7_y&<(RWDVoQ1ddHg9^8hGj6hi+=+yng`=#{Z^UeT2cU~?j zE}#&vr-w@rkTw8f2@Wy$i-yH(-vGFD-(0{Xtiqm zp@ZTYwT;p>R(JW#*$;|OFxK?Utmad1n%-O^FzeFO|Fc`J9sG9b@cNS8$8X-dFz?H* z;1;+x&p54;q5c-LOyuL8U!-rnUcx4}$L%5WN2W=7KbRsJCx3MEntVjxW|FhZW*{X} z->LpkB*}&IWJ5j6xo56{j7~jgjs^rWav4opFPJ%ZPwkW~K_&s;>*uMbuyM@fWL?5l z)4C{8kLQZ{{BQGbxqGs*y>FOsDbc!CVj9c*HTJf>-4U6`jm&|v_ zWaT+*z;k$pQ0e^H`}*%s&c4OK!_3IQB*-ktV9)S#(ZjpT z6w^|ryBauO$6b8z*4%eft)OWx+r6|aI^HJddHhAr#0d&Y+V9qyl$+Cf?|8pq*Ym9W GoBRNdx+Y%$ diff --git a/capes/cape.png b/capes/cape.png index a66b541a2207775ca69f1e65011177c69bd67f98..0d2eb18d3556be58aa3694b54f8a42b28c59b278 100644 GIT binary patch literal 3566 zcma)8cT^Kf_D({OCPk%4Q6o}RAVI41P6#3a0VPNX2{m*92}PNLOh>DAE<_k;V7k?*7XDv2)JMow@Vf^4*y^XJSo^;q0setN;Lj9buq*<4D>b zb!p~fN8>7QDD_ByowTlN0RXQO*$%Lb0065NUPs3Sp`!ya@%D7YyEy;=2JBgn288DT6A&IFY^TS~c0U3) z!t$NVq@&qXSC2MMbY)p9lm9V6qIaSu$L6a?#+=rIN9q732NB>FUrS(^T&^Ye>Qb}y z$x}UT+o022Kn_b_)3l=_7`~$m8a$w=Wo8x`bda}Jp<(v*pCubj#C(PiLz9ISbwrK< zSoMY!R71r0XrMGRay!4wA^81f`X!m@D>A&fEO{@5XWA;ekP2oiv{eQ{u5=cy4unmZHIJ1>^&7AvF2&A%G^ z9Ry%bYg2mX%@Mz=CuRd_zq1B#;DGo6!H%7j){P{VW1yNzR$XG6^BYF&Z*78_#A)NCzcHfqvs`6Z0P z3)m8|dUA%`kZu8}azCa?n|_I0g8;rW0;(pS{x}=$W|PwP^|&}&{PMD!4=~3SDzTur zpA+HvzA;*9JF{nX|E5YIpGNov1dptP9`M1 zO?(?s3l^peX)KYk&h=5M;g(5Id)CO%q3O`m3gS%sAz7~6&UZ0@;3y@N8U$09ry4-# z0)vQ$Mj$A7={DCD)~<$k&Sl9JK8Z4czvlPOv02A?OdDwlo6T(C z2Axb|@_oiC7Y>yMN!qdtg~@s`Oh5pUVFp|bj~Ji^AiO5{wU+wm(G|Qh3iP}0;sqEC z5BvZ&j!^JAW(~g8#O}p*JPfYM8r^(N8aNS-XO39s;>pu0N#ZTw%+wy{60~9t(9trv z%FWQO6Pv`9qPhD)tmyRR`z5(LCTg1(d` zDpiD-;VnH=y8b**nfRJMPaD?os&iDg@J$P@106*kPQZ^w49w$2X1m<`f*c zWW#qOp5umI6lSHK(m*Jmky4 z)tn>5`mm)|_Gz&V|96)sxYr^$n|;=C_s%!4h6;tAolHE}(I}q8Vg+`M;5`2bBH|`u z&LzM+&rFXz(IRIWUWD`&j^+wzv&LO|^>9?{9YRRVIF%a_Ey8z0389}1Rw2=%#1_qiVjyWG{_^a@s24vc-*=!b` zUwJcEf4ZtgEefGW%1g&Rz>#pVxcgt_+f7B^rG%$cpF|dGE>?aNeSTg*d*FG%$C|3^ zRmz_nK1rW}D;Dezq%O8^o?D=7vN(u3+@@Wm3DE>-P z&DBz8sGk)o@HU6<>Xp z6R0n!gluXSM(%L-Am&?TU2I^@p3BeHZ))FC1xNx70{j9N0vU20^86$ZQa6c4nwRUW za<*c71Gb`B&A+jcPS0HJHFp#x$1CNQm9M;z>Q^rqFI6kEDX3B_pXUiGbVuk}+K$rWuE+!^gM zV@K{Q9G`nrRxCB?*SHd_LPA%L^VS>JQ@1#_g!jevuP~{__{UHey*`pK@7LzuHa@C0Mz7hI;Jn6}43F zo9iRa!9HR{tOt2P+6Ov*QK~HR$I(1{KBu9QaxcY}18OY%L;ML~DV(0JPFuY}V%Ntm zczgoyHC}>#H@sbM2!35JNH0V0T85=0iae`Nv?4+Z)p*Yd@&t+ac^7Yg9KRMbv;38H zW)&)H{fNB$$@>khxQAMvglR_IxqMde+?h$P!`M?T#WbVxO-wC;1|CVRkJ(R|?~s^J z*g)?%93+D?B40=L>t?i}W9<;-2p+@?2&wgE>h5dI_wd=`w4}8BOR~lN#ed){?WZ3BJU_qxa-v5_bd9KS$@@(qbzE;-1>8^F#+9NH~q6= zDbXF`ZZNjqqu-O@AUNp}H!*1X%(Sw>)|tFE*P&gjZ8}Yn>buS1*6zmRwleNWE_3;u zA#BtC6W8-K?kiICOUlwDD)`p!c<)x^3g!9M^L@gUA2Z?0_+s4;%S;@~X6!@x6uOMo z`#tY_b^Wd7hMU;icWgQFiS~(AGDWW`h7~UGp%>o@zJ&`UlIAGif~r@tK6QQ`X`FNq z9RMaUv@@xns%AfCl~*<4&WgO8U7}G&AKDplET(KOKO3>7k{>uFM%U=T4%2rlkgbf= zVyc9GmHsz)8JtSoC5{Ka+H7C%A!ZEBL^WRe^>#bGzceR=uupNqb+@g%_Ag~>7)}&5 zDD4ezxzF1#%nlInYlSc3CQ2JLw!-PT`*xe1$&1U#9b|e=f(GFp%fWYlF?Ywg$?eD= z`!dR?kfYBfi9h6zLdg!sCu30qz_f#`U8J3!>2a!_eubyf%j zqUvq$sC+|L|8Mi7m71`#udkOf3`QUjpafZ{r?(UAijtBNOj-seBO`T$kn#!e@WuK| zdH7uT%gI0e=sNh=dE>o&@tz)#-+r+;&%3^A!ot4;{j2?*r@Pm`0(toS&FY9B%pdCo zy8@Ml{U;+|yyL&q`(IYScm6W_lht3rRF6udtmEx~_4V{N_w;mAH^JgPe4)mA<`6$w zs66z_6;;^(h5S2J)!#mqk=}TRBeK6KsUN}rpYCtGD(pAk|H1#S;{K^Us;)ZgQKWyK zlsc>E*?Hrmb9F`NYMJ{3SB6!}Tco+7ups;x!oy;v*&5>x;U1t(R=fs&huY?xUI!xQ~g77u}MY%(^9#?pD8V#Mo3!+6N=h8vO9}c?d8&(X>OIIK=62ypxC#Grfqj2q zjore4srigRAewZch_*vH^Wl47pdzK3A+D2?lNNX=?yb^i{%f@^hY_;@0m+gU~b9E!Vb<_y>MeYSI7z literal 341 zcmeAS@N?(olHy`uVBq!ia0vp^20$#q!3HGv{H?nKq!f}pf_xbms#F;m8k!jxe*Op2 zFBuq0feK$GFfdrnU|pA>)84XBp0z$3Dlfk7xAgc;==)ph{|rAk~QN`mv#O3D+9 zQW*jgGxJLH{9Hp6%8d0)^$ZQ&KRcNNRc-ZjaSVxYe>-g>Z?glBt8QwG$d-j1#s*B$ z8=aRW&+hL1F`d7BWzdmnf0nBAlpn2MCs3L5H2t5H?uM?AC;R4Y{2c!C&c>Mq$`?e~ z1zcWsw@5dx7YbwvkSP8u=E`6qRMz*X!6k;{&Fp7uKU=dfc(;fySgzfur*q%5o#kZX@l* fMb_(N1uL1eov&a2yz;9t&;tyfu6{1-oD!MdehP;^}MiDZ=XG#h|Qw^0jtQdKz48w$@fmtK=u$PwI zUY4cyHmzU=238m?f9Z$T>ThWEU({-?Z12NVEPgn9pMB2R-~RSD`_7-fg`(syfB&!u zpaJt9D2SVQ8e=+|bsRHMj|7|Jd~?FYGZ^=fnP790&9f$5oMQ8wiRY1Ib6Urwjx#!5 zFj0UP4ZOtuWe;7Q_23n}%HeAUUN`UtZNoTcVinGFi8mSPEfW{;wt*lA4j;c`U^Dx7 z4K%QS&%hS;?;B`j|AB!f_7^$hLmeMY|2iu)S7Jb*(z&8l=jxGoJUY=mD$rKb>0DNQ zqSd*i1)MXkV&`{PRihXe5EHac3TSDQntQ(ADU{djA}9dqaVr5exWKcfC(lXsPuX77!#1wICrp`N%PpWWx8zk3#^v$-TjI?Q{ zemba|PU`0Z!m{oC^rn;4e-ICm+SFO{KY<-QOpo~IbkI#wv-}Pok)reNQQ9d4K8eS0 zfP}H>z6h?{R72D8xQ-qngpPwC^Tb~SEAS+qT2c}>36ASEvTCeY|F#rLy6P64S+iEo zKp{bbvQ5e=rMx=w4LBrO@1WdLnt)!K1(l|y0uk!YMSn&c=><>48tT4J5~Ld0mQ483 zPiI0>Erk0vJyVG)5gZWI=-NLBO<*vIp)Act0%ZkErm6SlYw;Ttxum>HqdqJNEe*7p zE#%@qhb%%<79mHDM_fIu^sj_SEQ82lh$PhzID(^Dj0W<|!tiIXVIFs`oZ#_g07jOB zfnh|m`3q7?;OqhvyP(wVp2Nm8%4AfoC^D*$QKhOcVM=dEAvo$+YZmhjYuSTz!i4 NS^9)W5R=-D{sWeS4N(99 delta 1696 zcmZ8h>sM4&6#t#MckaD&xgc*G84N_?H3NufM2H|#S;1%{>P;gCm|$cW2uBm6rkC0K zb)&TGojt8!U=6M?TlJw2ee&<94}PuHTG`%*DOs+&W8%&<76<1rnxIvzKX zhbIgqSwHEat*1PA8qcu%tbx-8o@4WjiQEHtp3z@mxED>lgqIC8u=5HpziOa~^=k&U zuzuY@GwU}DY-RnXffm*dXS}6jPQZ1jPoTi55Jd~u&I(6Ud^u(!8jJMA6Vb$sK$SD- zsv&toULEgHQ_ids60Ocv<;ua^ zc{HsS&f=UvUUay*F+3G*+#Q{c3@4(KaSI)I*Frbmv#<@@3B-? z_|*o#yCIG2bLbDO@pI$@c(hlp_d>9LCjLtUK&XNV-$Nol?YK}DO}fSL)EcgN575(Iu1hUIP^Ec3)pyI zb#^7VOt~7@;t}z9M%q*GIf*R4Jey)U*&s{;FDH0E>1OmxdL5KlPA7Ai&d5!txEV+2 zrnu-Yqyi7h(<;P943Nd-TQcNL)Zrmo6Ow2#lW!| zBZy=$nn^PYqb`lIOV~Jn6Nm9N07iy`frl}g$zPG91kS8LwexRLlx37JqC$F`R8@MF z(%bBIlb2jXm2_{_G`U$Vy&7GYUaj=%3`2VLx!R8etE5m7vegtSL$*7Gs*tUvP#v=M z6lz1ZkwSfF5#kd3i|{ST{%%~zb##OU@L@e2kdF@1IiGD6Ow!<1-`p6Yvf-ou0vNyx A>Hq)$ diff --git a/src/api/java/ic2/api/Direction.java b/src/api/java/ic2/api/Direction.java index 59b82fb..64350dd 100644 --- a/src/api/java/ic2/api/Direction.java +++ b/src/api/java/ic2/api/Direction.java @@ -54,11 +54,23 @@ public enum Direction { * @param tileEntity tile entity to check * @return Adjacent tile entity or null if none exists */ - public TileEntity applyToTileEntity(TileEntity tileEntity) { - int coords[] = { tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord }; + public TileEntity applyToTileEntity(TileEntity te) { + return applyTo(te.getWorldObj(), te.xCoord, te.yCoord, te.zCoord); + } + + /** + * Get the tile entity next to a position following this direction. + * + * @param world World to check + * @param x X coordinate to check from + * @param y Y coordinate to check from + * @param z Z coordinate to check from + * @return Adjacent tile entity or null if none exists + */ + public TileEntity applyTo(World world, int x, int y, int z) { + int coords[] = { x, y, z }; coords[dir/2] += getSign(); - World world = tileEntity.getWorldObj(); if (world != null && world.blockExists(coords[0], coords[1], coords[2])) { try { @@ -67,6 +79,7 @@ public enum Direction { throw new RuntimeException("error getting TileEntity at dim "+world.provider.dimensionId+" "+coords[0]+"/"+coords[1]+"/"+coords[2]); } } + return null; } diff --git a/src/api/java/ic2/api/crops/package-info.class b/src/api/java/ic2/api/crops/package-info.class new file mode 100644 index 0000000000000000000000000000000000000000..1c2c0e11984088047c361a7591da7bbcffd08763 GIT binary patch literal 255 zcmYjM%}# z(%P0K7Uf=C+M6KDVpgFsPC}4qCbQ|I8r#HkpNn1+x)0-fLQnS5XWgbxHDQpl?0D(b zr>}sj2)FENqeA1dq+B0wbuZlqyHSLgYI8HLQm(FGJQp=f&q>T JhBzrW{RQACKiL2P literal 0 HcmV?d00001 diff --git a/src/api/java/ic2/api/crops/package-info.java b/src/api/java/ic2/api/crops/package-info.java new file mode 100644 index 0000000..04b8253 --- /dev/null +++ b/src/api/java/ic2/api/crops/package-info.java @@ -0,0 +1,4 @@ +@API(apiVersion="1.0", owner="IC2", provides="IC2API") +package ic2.api.crops; +import cpw.mods.fml.common.API; + diff --git a/src/api/java/ic2/api/energy/event/package-info.class b/src/api/java/ic2/api/energy/event/package-info.class new file mode 100644 index 0000000000000000000000000000000000000000..fc279ec0f7be683acb0e2931ddbae603cbbfc0ca GIT binary patch literal 262 zcmYjM%}N774F0CI-CF+-3Lbp`8{Mm?A`}XOqR{(vnl4j!GRw|%i?8Ov2k@c9)RQ?R zB;OBTzJETy0F*c@a8lsZVEh)ht>c-m+2EqF?%h^=>t!7$8{1if>({MhA9&%DU)DSo ziP>f!B`NmgnjM9>O0*6&xfnten!d~*)YvwD!EI8eLH~YoXE2C6;a0c#V`(sI+SvIO ztItpmsxr9ot|S!_E3x_@?pQMYPi1hv&qcMBik_DncKHf0=;>Sg>Y@MF4=~VqsmM?- OMZyS&31b{39RC6>?Lw3Q literal 0 HcmV?d00001 diff --git a/src/api/java/ic2/api/energy/event/package-info.java b/src/api/java/ic2/api/energy/event/package-info.java new file mode 100644 index 0000000..40db6f8 --- /dev/null +++ b/src/api/java/ic2/api/energy/event/package-info.java @@ -0,0 +1,4 @@ +@API(apiVersion="1.0", owner="IC2", provides="IC2API") +package ic2.api.energy.event; +import cpw.mods.fml.common.API; + diff --git a/src/api/java/ic2/api/energy/package-info.class b/src/api/java/ic2/api/energy/package-info.class new file mode 100644 index 0000000000000000000000000000000000000000..baaed208f9a33befaa16ebb85ab6260da0b3fd52 GIT binary patch literal 256 zcmYjM%}xSA4E_d$Meqj?ni!u!M)&H8n2?Z=U^L-A3}sW?nQnF#h_B|s2jHQM#S=ZW zX}_O*J^X(E0LXEj;WEROLH|RxwWkS}WN=eC|LF>PYi`i1YT5CM z)TgTlRT(_6&#ekADY5vnr+Ey9$3(Vtv9R;yhJ14e7_{`EW3|x!?`P=fyj7&Dmn@-& K^MpPI2^W7eLO?wL literal 0 HcmV?d00001 diff --git a/src/api/java/ic2/api/energy/package-info.java b/src/api/java/ic2/api/energy/package-info.java new file mode 100644 index 0000000..81d0bfe --- /dev/null +++ b/src/api/java/ic2/api/energy/package-info.java @@ -0,0 +1,4 @@ +@API(apiVersion="1.0", owner="IC2", provides="IC2API") +package ic2.api.energy; +import cpw.mods.fml.common.API; + diff --git a/src/api/java/ic2/api/energy/prefab/package-info.class b/src/api/java/ic2/api/energy/prefab/package-info.class new file mode 100644 index 0000000000000000000000000000000000000000..52651b15adb54ce6146d24edb6714f9508e6b5d0 GIT binary patch literal 263 zcmYjM$w~u35PhAPOpIGRD0ua5O6Te+2!VhQQOLcgQ!{j&Ug(}A_-h{g06$8sc(M*v zRK0~)-#?#U07_gGI4f|jFn$Z$WO!~{R=AAXyz7SVtgpj#qjy^2=5^~k>v(0ety-RW zA3ELH;Im-QChp0Fb*9?2WP)?S)9hvOD8@S46{jprh5p0zUSSaSo|9~gr&3`QQ`p%x zi_cIFqEfiErX&#(3$gj2n7Gyz{g0(EIRv9t`-Ya)hD~=3DD>p7L-o-A>qi*Kyb@$6 Pmm*_?dN9~lOOajmXi&W-$pm8h^a`bfy9Yb$|kV?}$l4}0fJVeRVLS#E-< zc$vt;c+tT)`!y>F!xs(V^Ib)e9D|K(yq2Y@gfJ@7q9>Uj)I|{{M(3JZxK0P%Lwi-eFRj{ZM~gi+7{ literal 0 HcmV?d00001 diff --git a/src/api/java/ic2/api/energy/tile/IHeatSource.java b/src/api/java/ic2/api/energy/tile/IHeatSource.java new file mode 100644 index 0000000..7f6ff66 --- /dev/null +++ b/src/api/java/ic2/api/energy/tile/IHeatSource.java @@ -0,0 +1,24 @@ +package ic2.api.energy.tile; + +import net.minecraftforge.common.util.ForgeDirection; + +public interface IHeatSource { + + /* + * Return max heat transmission peer Tick (only theoretical bandwidth not available amount) + */ + int maxrequestHeatTick(ForgeDirection directionFrom); + + /* + * @param requested amount of heat to transfer + * + * @return transmitted amount of heat + * + * example: You Request 100 units of heat but the Source have only 50 units left + * + * requestHeat(100) : return 50 : so 50 units of heat remove from HeatSource + */ + + int requestHeat(ForgeDirection directionFrom,int requestheat); + +} diff --git a/src/api/java/ic2/api/energy/tile/package-info.class b/src/api/java/ic2/api/energy/tile/package-info.class new file mode 100644 index 0000000000000000000000000000000000000000..fdee4a7722bb0bb10b3c1e810e23cc2cb4aafa3c GIT binary patch literal 261 zcmYjM%}xSA4E_d$Mf}5qCf&~I|=JJ-q@WrxOv@%ES?vVWLfhh zgqUrX7?NVouGy21t3+#GlZ)QRK$Dl*qZ->r7ThLf8gw7V_XfSV58UcDdnyeEO&fQz zV)g0kK~)B~;!08>u@b8f${LIQhcXx)Vo_~FMf2r`UA_hkI{MY2I_UoOBlL7$Dbm+V Nkubn_d0D zs;g4{{qy++pu|;yivpJh!-eb{Pp@2&!A_azQ z)m2pg{C<4{C~;BXtiZX$_(Qi%;Ag4W;i~rG)35nX(n=>Azw-{a@7vT$d zTi=SNY}`wz_Y`%RX%#C98lxtfzRe!Z*w-@WCflV$|6y|PFwlMC#_d0D zs;g4{`}h3=pu}B)n*z56{ja!d98aWTgZtXLtzGl8gjF1F?A{tY&2}M+=eZqdKCC%y5Nw(LCzJ(tkB^mP?T-BdD&hJMkcB|L literal 0 HcmV?d00001 diff --git a/src/api/java/ic2/api/network/package-info.java b/src/api/java/ic2/api/network/package-info.java new file mode 100644 index 0000000..25ea29e --- /dev/null +++ b/src/api/java/ic2/api/network/package-info.java @@ -0,0 +1,4 @@ +@API(apiVersion="1.0", owner="IC2", provides="IC2API") +package ic2.api.network; +import cpw.mods.fml.common.API; + diff --git a/src/api/java/ic2/api/package-info.class b/src/api/java/ic2/api/package-info.class new file mode 100644 index 0000000000000000000000000000000000000000..7caf6997842f48e97402f4b55bb54dced3669925 GIT binary patch literal 249 zcmYjM%Sr=55Ufs2HpW*375oS@x>rv@5CVchA@|9o6FTlpFFTv$-#qvMew5hpWFNZe zs;;8?`{(luK#7Y2X9dm)!*|^_fuE&f!e#BlhhOuZq?L|0e&-3dZ`;&L z=}c!b{r>s<0#M_k!dZoLgWTuOFeO^Gcb%B2~r! L#~DMMWSss2hsZ#r literal 0 HcmV?d00001 diff --git a/src/api/java/ic2/api/reactor/package-info.java b/src/api/java/ic2/api/reactor/package-info.java new file mode 100644 index 0000000..5194aee --- /dev/null +++ b/src/api/java/ic2/api/reactor/package-info.java @@ -0,0 +1,4 @@ +@API(apiVersion="1.0", owner="IC2", provides="IC2API") +package ic2.api.reactor; +import cpw.mods.fml.common.API; + diff --git a/src/api/java/ic2/api/recipe/RecipeInputOreDict.class b/src/api/java/ic2/api/recipe/RecipeInputOreDict.class index df8d64c6906509f5a1f17f471e87fdf753c65539..a068e8fc910c8113d815716b38ae62bd047cb17d 100644 GIT binary patch literal 2799 zcma)7SyLQU6#gzVLk~j(VOWyLlGO+UWCA8p10f*`kvM=tBofzV=nPF}OVblWT;i^O z!58&Os;oT3sszMTSw5L6|AOV4e?m)x-|6ld27-wXbNb$M&ppd`zH{f-2S5GVgUB4S#@r3k9=s)*MjcpYzOcvEcNil7dL ztY$PMBWS>Q7_;&$_tuW^0dqqQ9LqS$g}Q{5 zHOC5>8PmRC%%rJ_CUQw5J!ROI?0sd>nX?uY_9d)jU);!BaobEcyum<^i|^)GHT@A2587>$dhpjRVmXM@>vk*=p+wB z<92{qMLRk-#iFm!f`G!7=WGElV4EzYYSKz&4X0qU<$Vv``X3pFot#G}qE@`Wk*$%* zT)|G7!W@C=Aze00%`J5^+_>ZtT&q7yESV$CDat9Sd*>fQ|yL5d|G@$r&_4vRZfZhMDp+gOy&>G%Lc68u9QAK_!Bx_R--Js7{PfiPKx$(67{k3LME+;8~0h(vgz7L8F;k9t{Cq>?XiddJ?&7~g#hYhF!*0pFSFr(IUf9KJU@V^C_A`2LCXr!#=3$l zP~US|flkVZtJYD88pOD7_RP?QZtlcQ58acwbav2pb{;{x1H!ScR<(kP&EB^0R=w+O zw`W)K7WTdIF5*nL!u5N|_nYQENWYD-6$D~kcM*)W-bE|(QH3Vd zGUoBtfETc zOH6VRQTQ3v$AUY9%h2zma%t@kT36mjwPJOhKYHSJCm8tv5C@|L1sA2v!|&K@pp=~ z9j1>uOydZSx=7ELDxb$QJSEXFgJpMmtdP&ny%>Xs+(EdT4hT|Fr|311F zO?Rzgo5Bj}N4Y8oeD7w!e}Ue;Gq{Rq1uibF{nmY(t~~raKJ>EEJ~H7jyLtp?S+ihv zm?3+~#WOBaZA_$y)Hy%JFh}Do@!=~)%i$7IG6&vSf9b4Xmc?W*!Bxf=NPR5 z&(oFt;=pm|IWGJa*D8wlbwYIKqF=pwRrkL8Zr8W)hqBC<-|yxDY{GpDQS?aIZD9p^ zOPKAEuvfx93;WUMML!OBaS(?j99B4D!Hc67j^Vgu0}6u{{OC0?B&S}&bm_BpRR|kaU^WS(IDZxjg_dh5yL7QRj5|DVB;b# zDU8{;j4OoNxQc5wuH!~_-d$aK6CDb-Y}`hNjd9$`hV*1?0(Wgp;GPC;l3%Bd?byMj zTdI>U(|WU({b)319~*Vqa?gWglon{HfExknPlo~`!C9$-tKxYaHH@pXUp?iiTGlMM z7`^bo#u{c3XRojpb=(PN9l6++$b^HeP|>cxNI!3sI>;(^2FxPTEFh&;PaQ6Yqru@A zSG5`8h`?YBLPr@&5P}b3W)X)k!75l=QW7fig$jIfDwDa%nZ$Zw1~ikMJVd4wub{t$ z>T8&Tsi8kPhY}4>(96Wqkog2}o6b9)&+ta|9PBArvdv*xvr(UePl~=5h%mRq#xr=s zMj*5J9ELtUwfNdS%^o^riWofr-8bob4c%(zw1d<&%-slYh_9X0B=tsq2J0;ujBRe9U5Ax;Shan|Z2{asW+8ainIR+r>%?D_dBpgy$Fh3atul3y3SU_h<`@sFVi0QIMfgbr)~ZRSL|b&4Q~lto@5`{0G1E z2D+U)+lb`LWfY#Ljw)a@lefP9J^Vv&P#O&65ENxOlm$cioc;%cVTK$cGyl7{Jdfe; nD=%W$&+W|UbL?&6e@fAZ7SUSmxJe;}VZ}{8Bynk{qkGpMfu)Eb diff --git a/src/api/java/ic2/api/recipe/RecipeInputOreDict.java b/src/api/java/ic2/api/recipe/RecipeInputOreDict.java index a64d83f..89f73dc 100644 --- a/src/api/java/ic2/api/recipe/RecipeInputOreDict.java +++ b/src/api/java/ic2/api/recipe/RecipeInputOreDict.java @@ -1,5 +1,6 @@ package ic2.api.recipe; +import java.util.ArrayList; import java.util.List; import net.minecraft.item.ItemStack; @@ -26,6 +27,7 @@ public class RecipeInputOreDict implements IRecipeInput { List inputs = OreDictionary.getOres(input); for (ItemStack input1 : inputs) { + if (input1.getItem() == null) continue; // ignore invalid int metaRequired = meta == null ? input1.getItemDamage() : meta; if (subject.getItem() == input1.getItem() && @@ -44,7 +46,14 @@ public class RecipeInputOreDict implements IRecipeInput { @Override public List getInputs() { - return OreDictionary.getOres(input); + List ores = OreDictionary.getOres(input); + List ret = new ArrayList(ores.size()); + + for (ItemStack stack : ores) { + if (stack.getItem() != null) ret.add(stack); // ignore invalid + } + + return ret; } @Override diff --git a/src/api/java/ic2/api/recipe/package-info.class b/src/api/java/ic2/api/recipe/package-info.class new file mode 100644 index 0000000000000000000000000000000000000000..f30b57f7835efb0abaa8c2e321d7b984c8fdc422 GIT binary patch literal 256 zcmYjMOHM*T5Uc^=A^vcoiSZ25`nIl!i3y2`L=*PI(2&MApUgbqZZ154hcY&<>_vCF zs;g4{{qy++pvFaovkK=1!}qw&j-RDrgUe*yhh6iXgjF1G?9Lk8ylq1(p660z(eNaM z*xFWND9XLKv?m{zg;u^H7rl>xCbQ|I8rvju&P6W`x)0-fgI?SR&bm#XYJ)+_aVJYw zpS}XBGPo62lL{%blf?8tkHP4Wh#DK#^t#xvYp(%=jy`m#4!VE+2tA!w%Jdbf3I;eX J7~-Vh^cO9RKq~+M literal 0 HcmV?d00001 diff --git a/src/api/java/ic2/api/recipe/package-info.java b/src/api/java/ic2/api/recipe/package-info.java new file mode 100644 index 0000000..44e70e7 --- /dev/null +++ b/src/api/java/ic2/api/recipe/package-info.java @@ -0,0 +1,4 @@ +@API(apiVersion="1.0", owner="IC2", provides="IC2API") +package ic2.api.recipe; +import cpw.mods.fml.common.API; + diff --git a/src/api/java/ic2/api/tile/package-info.class b/src/api/java/ic2/api/tile/package-info.class new file mode 100644 index 0000000000000000000000000000000000000000..226d45541037da6f5eb4672f34e5f1254370a83b GIT binary patch literal 254 zcmYjM%T5A85Uc@V5np)F#E+21y?P=hBqSypOt=q2Lk4!HH#-CTn+HF@k1{lz>_d0D zs;g4{`}h3=pu}B)n*z56{V&-yjwiligZtXLtzGl8k1H8&?A{tY&2};Sz;mDcqT+Fk zl5O@9lXCB_K2VTlqE)EKNeB{Y{5gG9V_W+q(aJ?hyJHA7@YD@W#gJY78`c?5in@!JEv-)eeM_N=zLJ7t4NX1!(~Dr HR|(fghIl_; literal 0 HcmV?d00001 diff --git a/src/api/java/ic2/api/tile/package-info.java b/src/api/java/ic2/api/tile/package-info.java new file mode 100644 index 0000000..5ebc76e --- /dev/null +++ b/src/api/java/ic2/api/tile/package-info.java @@ -0,0 +1,4 @@ +@API(apiVersion="1.0", owner="IC2", provides="IC2API") +package ic2.api.tile; +import cpw.mods.fml.common.API; + diff --git a/src/api/java/ic2/api/util/package-info.class b/src/api/java/ic2/api/util/package-info.class new file mode 100644 index 0000000000000000000000000000000000000000..4c91d9186aca2be1a632a781e1c0fa52adfefd8b GIT binary patch literal 254 zcmYjM%T5C^44kyITgv+Y5+6YWd*xIiAyq;Gfz*4Nx|K^3uQu8C-#G9Ad=#q72_I~E z#xolK{C<4{sBux@tirj$_(QtZ(=!J$xN4mLbZfffw35ljZJojGdzT7FnseqwplM1{ zTwzIBxfkE;Y?NiTs~D`87$w>1+w4(|UBh!~vtAnXA13z(1KA~Nb(=la2BW5xEiXxZ zh6<=k4cXULg|;gk?Ef?dmxnwyxU{yfiw*g50~qx5okR7||LaE>=)6{Ds7RGD!g0nJ HCmE-Ei>^O! literal 0 HcmV?d00001 diff --git a/src/api/java/ic2/api/util/package-info.java b/src/api/java/ic2/api/util/package-info.java new file mode 100644 index 0000000..4dd2d93 --- /dev/null +++ b/src/api/java/ic2/api/util/package-info.java @@ -0,0 +1,4 @@ +@API(apiVersion="1.0", owner="IC2", provides="IC2API") +package ic2.api.util; +import cpw.mods.fml.common.API; + diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/client/CapeEventHandler.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/client/CapeEventHandler.java index 14e7632..e927735 100644 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/client/CapeEventHandler.java +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/client/CapeEventHandler.java @@ -1,18 +1,25 @@ /******************************************************************************* * Copyright (c) 2014 Tombenpotter. * All rights reserved. - * + * * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * + * * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ package electricMagicTools.tombenpotter.electricmagictools.client; -import java.awt.Graphics; -import java.awt.Image; +import cpw.mods.fml.common.Loader; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.relauncher.ReflectionHelper; +import net.minecraft.client.entity.AbstractClientPlayer; +import net.minecraft.client.renderer.ThreadDownloadImageData; +import net.minecraftforge.client.event.RenderPlayerEvent; + +import javax.swing.*; +import java.awt.*; import java.awt.image.BufferedImage; import java.io.BufferedReader; import java.io.IOException; @@ -24,126 +31,117 @@ import java.net.URLConnection; import java.util.ArrayList; import java.util.HashMap; -import javax.swing.ImageIcon; - -import net.minecraft.client.entity.AbstractClientPlayer; -import net.minecraft.client.renderer.ThreadDownloadImageData; -import net.minecraftforge.client.event.RenderPlayerEvent; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.relauncher.ReflectionHelper; - public class CapeEventHandler { - private final String serverLocation = "https://raw.github.com/Tombenpotter/Electro-Magic-Tools/master/capes.txt"; - private final int timeout = 1000; + private final String serverLocation = "https://raw.github.com/Tombenpotter/Electro-Magic-Tools/master/capes.txt"; + private final int timeout = 1000; - private static final Graphics TEST_GRAPHICS = new BufferedImage(128, 128, BufferedImage.TYPE_INT_RGB).getGraphics(); - private HashMap cloaks = new HashMap(); - private ArrayList capePlayers = new ArrayList(); + private static final Graphics TEST_GRAPHICS = new BufferedImage(128, 128, BufferedImage.TYPE_INT_RGB).getGraphics(); + private HashMap cloaks = new HashMap(); + private ArrayList capePlayers = new ArrayList(); - public static CapeEventHandler instance; + public static CapeEventHandler instance; - public CapeEventHandler() { - buildCloakURLDatabase(); - instance = this; - } + public CapeEventHandler() { + buildCloakURLDatabase(); + instance = this; + } - @SubscribeEvent - public void onPreRenderSpecials(RenderPlayerEvent.Specials.Pre event) { - if (Loader.isModLoaded("shadersmod")) { - return; - } - if (event.entityPlayer instanceof AbstractClientPlayer) { - AbstractClientPlayer abstractClientPlayer = (AbstractClientPlayer) event.entityPlayer; + @SubscribeEvent + public void onPreRenderSpecials(RenderPlayerEvent.Specials.Pre event) { + if (Loader.isModLoaded("shadersmod")) { + return; + } + if (event.entityPlayer instanceof AbstractClientPlayer) { + AbstractClientPlayer abstractClientPlayer = (AbstractClientPlayer) event.entityPlayer; - if (!capePlayers.contains(abstractClientPlayer)) { - String cloakURL = cloaks.get(event.entityPlayer.getCommandSenderName()); + if (!capePlayers.contains(abstractClientPlayer)) { + String cloakURL = cloaks.get(event.entityPlayer.getCommandSenderName()); - if (cloakURL == null) { - return; - } + if (cloakURL == null) { + return; + } - capePlayers.add(abstractClientPlayer); + capePlayers.add(abstractClientPlayer); - ReflectionHelper.setPrivateValue(ThreadDownloadImageData.class, abstractClientPlayer.getTextureCape(), false, new String[] { "textureUploaded", "field_110559_g" }); + ReflectionHelper.setPrivateValue(ThreadDownloadImageData.class, abstractClientPlayer.getTextureCape(), false, new String[]{"textureUploaded", "field_110559_g"}); - new Thread(new CloakThread(abstractClientPlayer, cloakURL)).start(); - event.renderCape = true; - } - } - } + new Thread(new CloakThread(abstractClientPlayer, cloakURL)).start(); + event.renderCape = true; + } + } + } - public void buildCloakURLDatabase() { - URL url; - try { - url = new URL(serverLocation); - URLConnection con = url.openConnection(); - con.setConnectTimeout(timeout); - con.setReadTimeout(timeout); - InputStream io = con.getInputStream(); - BufferedReader br = new BufferedReader(new InputStreamReader(io)); + public void buildCloakURLDatabase() { + URL url; + try { + url = new URL(serverLocation); + URLConnection con = url.openConnection(); + con.setConnectTimeout(timeout); + con.setReadTimeout(timeout); + InputStream io = con.getInputStream(); + BufferedReader br = new BufferedReader(new InputStreamReader(io)); - String str; - int linetracker = 1; - while ((str = br.readLine()) != null) { - if (!str.startsWith("--")) { - if (str.contains(":")) { - String nick = str.substring(0, str.indexOf(":")); - String link = str.substring(str.indexOf(":") + 1); - new Thread(new CloakPreload(link)).start(); - cloaks.put(nick, link); - } else { - System.err.println("[Electro-Magic Tools] [skins.txt] Syntax error on line " + linetracker + ": " + str); - } - } - linetracker++; - } + String str; + int linetracker = 1; + while ((str = br.readLine()) != null) { + if (!str.startsWith("--")) { + if (str.contains(":")) { + String nick = str.substring(0, str.indexOf(":")); + String link = str.substring(str.indexOf(":") + 1); + new Thread(new CloakPreload(link)).start(); + cloaks.put(nick, link); + } else { + System.err.println("[Electro-Magic Tools] [skins.txt] Syntax error on line " + linetracker + ": " + str); + } + } + linetracker++; + } - br.close(); - } catch (MalformedURLException e) { - e.printStackTrace(); - } catch (IOException e) { - e.printStackTrace(); - } - } + br.close(); + } catch (MalformedURLException e) { + e.printStackTrace(); + } catch (IOException e) { + e.printStackTrace(); + } + } - private class CloakThread implements Runnable { - AbstractClientPlayer abstractClientPlayer; - String cloakURL; + private class CloakThread implements Runnable { + AbstractClientPlayer abstractClientPlayer; + String cloakURL; - public CloakThread(AbstractClientPlayer player, String cloak) { - abstractClientPlayer = player; - cloakURL = cloak; - } + public CloakThread(AbstractClientPlayer player, String cloak) { + abstractClientPlayer = player; + cloakURL = cloak; + } - @Override - public void run() { - try { - Image cape = new ImageIcon(new URL(cloakURL)).getImage(); - BufferedImage bo = new BufferedImage(cape.getWidth(null), cape.getHeight(null), BufferedImage.TYPE_INT_ARGB); - bo.getGraphics().drawImage(cape, 0, 0, null); + @Override + public void run() { + try { + Image cape = new ImageIcon(new URL(cloakURL)).getImage(); + BufferedImage bo = new BufferedImage(cape.getWidth(null), cape.getHeight(null), BufferedImage.TYPE_INT_ARGB); + bo.getGraphics().drawImage(cape, 0, 0, null); - ReflectionHelper.setPrivateValue(ThreadDownloadImageData.class, abstractClientPlayer.getTextureCape(), bo, new String[] { "bufferedImage", "field_110560_d" }); - } catch (MalformedURLException e) { - e.printStackTrace(); - } - } - } + ReflectionHelper.setPrivateValue(ThreadDownloadImageData.class, abstractClientPlayer.getTextureCape(), bo, new String[]{"bufferedImage", "field_110560_d"}); + } catch (MalformedURLException e) { + e.printStackTrace(); + } + } + } - private class CloakPreload implements Runnable { - String cloakURL; + private class CloakPreload implements Runnable { + String cloakURL; - public CloakPreload(String link) { - cloakURL = link; - } + public CloakPreload(String link) { + cloakURL = link; + } - @Override - public void run() { - try { - TEST_GRAPHICS.drawImage(new ImageIcon(new URL(cloakURL)).getImage(), 0, 0, null); - } catch (MalformedURLException e) { - e.printStackTrace(); - } - } - } + @Override + public void run() { + try { + TEST_GRAPHICS.drawImage(new ImageIcon(new URL(cloakURL)).getImage(), 0, 0, null); + } catch (MalformedURLException e) { + e.printStackTrace(); + } + } + } } diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/client/ClientProxy.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/client/ClientProxy.java index df63c9d..e3a9be9 100644 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/client/ClientProxy.java +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/client/ClientProxy.java @@ -1,10 +1,10 @@ /******************************************************************************* * Copyright (c) 2014 Tombenpotter. * All rights reserved. - * + * * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * + * * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. * http://www.minecraftforum.net/topic/1585216- @@ -20,13 +20,13 @@ import electricMagicTools.tombenpotter.electricmagictools.common.entities.Entity public class ClientProxy extends CommonProxy { - @Override - public void load() { - registerRenders(); - } + @Override + public void load() { + registerRenders(); + } - public void registerRenders() { - RenderingRegistry.registerEntityRenderingHandler(EntityLaser.class, new RenderLaser()); - RenderingRegistry.registerEntityRenderingHandler(EntityArcher.class, new RenderArcher()); - } + public void registerRenders() { + RenderingRegistry.registerEntityRenderingHandler(EntityLaser.class, new RenderLaser()); + RenderingRegistry.registerEntityRenderingHandler(EntityArcher.class, new RenderArcher()); + } } diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/client/gui/GuiEtherealMacerator.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/client/gui/GuiEtherealMacerator.java index 0ca2792..5ff7f59 100644 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/client/gui/GuiEtherealMacerator.java +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/client/gui/GuiEtherealMacerator.java @@ -1,45 +1,44 @@ /******************************************************************************* * Copyright (c) 2014 Tombenpotter. * All rights reserved. - * + * * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * + * * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ package electricMagicTools.tombenpotter.electricmagictools.client.gui; +import electricMagicTools.tombenpotter.electricmagictools.common.ElectricMagicTools; +import electricMagicTools.tombenpotter.electricmagictools.common.tile.TileEntityEtherealMacerator; +import electricMagicTools.tombenpotter.electricmagictools.common.tile.container.ContainerEtheralMacerator; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; - import org.lwjgl.opengl.GL11; -import electricMagicTools.tombenpotter.electricmagictools.common.tile.TileEntityEtherealMacerator; -import electricMagicTools.tombenpotter.electricmagictools.common.tile.container.ContainerEtheralMacerator; - public class GuiEtherealMacerator extends GuiContainer { - public GuiEtherealMacerator(InventoryPlayer inventory, TileEntityEtherealMacerator te) { - super(new ContainerEtheralMacerator(inventory, te)); - xSize = 176; - ySize = 165; - } + public GuiEtherealMacerator(InventoryPlayer inventory, TileEntityEtherealMacerator te) { + super(new ContainerEtheralMacerator(inventory, te)); + xSize = 176; + ySize = 165; + } - public static final ResourceLocation texture = new ResourceLocation("electricmagictools", "textures/guis/etherealmacerator.png"); + public static final ResourceLocation texture = new ResourceLocation(ElectricMagicTools.texturePath, "textures/guis/etherealmacerator.png"); - @Override - public void drawGuiContainerBackgroundLayer(float f, int j, int i) { - GL11.glColor4f(1F, 1F, 1F, 1F); - Minecraft.getMinecraft().getTextureManager().bindTexture(texture); - drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); - } + @Override + public void drawGuiContainerBackgroundLayer(float f, int j, int i) { + GL11.glColor4f(1F, 1F, 1F, 1F); + Minecraft.getMinecraft().getTextureManager().bindTexture(texture); + drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); + } - protected void drawGuiContainerForegroundLayer(int par1, int par2) { - this.fontRendererObj.drawString("Ethereal Processor", 6, 6, 4210752); - this.fontRendererObj.drawString("Inventory", 8, this.ySize - 96 + 2, 4210752); - } + protected void drawGuiContainerForegroundLayer(int par1, int par2) { + this.fontRendererObj.drawString("Ethereal Processor", 6, 6, 4210752); + this.fontRendererObj.drawString("Inventory", 8, this.ySize - 96 + 2, 4210752); + } } diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/client/gui/GuiIndustrialWandRecharger.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/client/gui/GuiIndustrialWandRecharger.java index 598de9f..4fb56f4 100644 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/client/gui/GuiIndustrialWandRecharger.java +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/client/gui/GuiIndustrialWandRecharger.java @@ -1,45 +1,44 @@ /******************************************************************************* * Copyright (c) 2014 Tombenpotter. * All rights reserved. - * + * * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * + * * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ package electricMagicTools.tombenpotter.electricmagictools.client.gui; +import electricMagicTools.tombenpotter.electricmagictools.common.ElectricMagicTools; +import electricMagicTools.tombenpotter.electricmagictools.common.tile.TileEntityIndustrialWandRecharge; +import electricMagicTools.tombenpotter.electricmagictools.common.tile.container.ContainerIndustrialWandRecharge; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; - import org.lwjgl.opengl.GL11; -import electricMagicTools.tombenpotter.electricmagictools.common.tile.TileEntityIndustrialWandRecharge; -import electricMagicTools.tombenpotter.electricmagictools.common.tile.container.ContainerIndustrialWandRecharge; - public class GuiIndustrialWandRecharger extends GuiContainer { - public GuiIndustrialWandRecharger(InventoryPlayer inventory, TileEntityIndustrialWandRecharge te) { - super(new ContainerIndustrialWandRecharge(inventory, te)); - xSize = 176; - ySize = 165; - } + public GuiIndustrialWandRecharger(InventoryPlayer inventory, TileEntityIndustrialWandRecharge te) { + super(new ContainerIndustrialWandRecharge(inventory, te)); + xSize = 176; + ySize = 165; + } - public static final ResourceLocation texture = new ResourceLocation("electricmagictools", "textures/guis/wandcharger.png"); + public static final ResourceLocation texture = new ResourceLocation(ElectricMagicTools.texturePath, "textures/guis/wandcharger.png"); - @Override - public void drawGuiContainerBackgroundLayer(float f, int j, int i) { - GL11.glColor4f(1F, 1F, 1F, 1F); - Minecraft.getMinecraft().getTextureManager().bindTexture(texture); - drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); - } + @Override + public void drawGuiContainerBackgroundLayer(float f, int j, int i) { + GL11.glColor4f(1F, 1F, 1F, 1F); + Minecraft.getMinecraft().getTextureManager().bindTexture(texture); + drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); + } - protected void drawGuiContainerForegroundLayer(int par1, int par2) { - this.fontRendererObj.drawString("Industrial Wand Charging Station", 6, 6, 4210752); - this.fontRendererObj.drawString("Inventory", 8, this.ySize - 96 + 2, 4210752); - } + protected void drawGuiContainerForegroundLayer(int par1, int par2) { + this.fontRendererObj.drawString("Industrial Wand Charging Station", 6, 6, 4210752); + this.fontRendererObj.drawString("Inventory", 8, this.ySize - 96 + 2, 4210752); + } } diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/client/model/ModelWings.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/client/model/ModelWings.java new file mode 100644 index 0000000..71f225c --- /dev/null +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/client/model/ModelWings.java @@ -0,0 +1,49 @@ +package electricMagicTools.tombenpotter.electricmagictools.client.model; + +import net.minecraft.client.model.ModelBiped; +import net.minecraft.client.model.ModelRenderer; +import net.minecraft.entity.Entity; + +public class ModelWings extends ModelBiped { + ModelRenderer rightWing; + ModelRenderer leftWing; + ModelRenderer center; + + public ModelWings() { + textureWidth = 64; + textureHeight = 64; + + rightWing = new ModelRenderer(this, 24, 0); + rightWing.addBox(-11F, 0F, 0F, 11, 13, 1); + rightWing.setRotationPoint(-2F, 0F, 3F); + rightWing.setTextureSize(64, 32); + rightWing.mirror = true; + setRotation(rightWing, 0F, 0.1570796F, 0F); + leftWing = new ModelRenderer(this, 0, 0); + leftWing.addBox(0F, 0F, 0F, 11, 13, 1); + leftWing.setRotationPoint(2F, 0F, 3F); + leftWing.setTextureSize(64, 32); + leftWing.mirror = true; + setRotation(leftWing, 0F, -0.1570796F, 0F); + center = new ModelRenderer(this, 0, 14); + center.addBox(0F, 0F, 0F, 8, 14, 1); + center.setRotationPoint(-4F, 0F, 3F); + center.setTextureSize(64, 32); + center.mirror = true; + setRotation(center, 0F, 0F, 0F); + } + + public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { + super.render(entity, f, f1, f2, f3, f4, f5); + setRotationAngles(f, f1, f2, f3, f4, f5, entity); + rightWing.render(f5); + leftWing.render(f5); + center.render(f5); + } + + private void setRotation(ModelRenderer model, float x, float y, float z) { + model.rotateAngleX = x; + model.rotateAngleY = y; + model.rotateAngleZ = z; + } +} diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/client/renderer/RenderArcher.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/client/renderer/RenderArcher.java index 4620123..e701fdf 100644 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/client/renderer/RenderArcher.java +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/client/renderer/RenderArcher.java @@ -1,19 +1,19 @@ /******************************************************************************* * Copyright (c) 2014 Tombenpotter. * All rights reserved. - * + * * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * + * * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ package electricMagicTools.tombenpotter.electricmagictools.client.renderer; -import net.minecraft.client.renderer.entity.RenderSnowMan; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.renderer.entity.RenderSnowMan; @SideOnly(Side.CLIENT) public class RenderArcher extends RenderSnowMan { diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/client/renderer/RenderLaser.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/client/renderer/RenderLaser.java index 1929870..a17a5ec 100644 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/client/renderer/RenderLaser.java +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/client/renderer/RenderLaser.java @@ -1,92 +1,91 @@ /******************************************************************************* * Copyright (c) 2014 Tombenpotter. * All rights reserved. - * + * * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * + * * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ package electricMagicTools.tombenpotter.electricmagictools.client.renderer; +import electricMagicTools.tombenpotter.electricmagictools.common.ElectricMagicTools; +import electricMagicTools.tombenpotter.electricmagictools.common.entities.EntityLaser; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.Render; import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; - import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import electricMagicTools.tombenpotter.electricmagictools.common.entities.EntityLaser; - public class RenderLaser extends Render { - private static final ResourceLocation laserTexture = new ResourceLocation("electricmagictools:textures/models/lasermodel.png"); + private static final ResourceLocation laserTexture = new ResourceLocation(ElectricMagicTools.texturePath, "textures/models/lasermodel.png"); - public void renderArrow(EntityLaser entityLaser, double par2, double par4, double par6, float par8, float par9) { + public void renderArrow(EntityLaser entityLaser, double par2, double par4, double par6, float par8, float par9) { - this.bindEntityTexture(entityLaser); - GL11.glPushMatrix(); - GL11.glTranslatef((float) par2, (float) par4, (float) par6); - GL11.glRotatef(entityLaser.prevRotationYaw + (entityLaser.rotationYaw - entityLaser.prevRotationYaw) * par9 - 90.0F, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(entityLaser.prevRotationPitch + (entityLaser.rotationPitch - entityLaser.prevRotationPitch) * par9, 0.0F, 0.0F, 1.0F); - Tessellator tessellator = Tessellator.instance; - byte b0 = 0; - float f2 = 0.4F; - float f3 = 0.7F; - float f4 = (float) (0 + b0 * 10) / 32.0F; - float f5 = (float) (5 + b0 * 10) / 32.0F; - float f6 = 0.0F; - float f7 = 0.15625F; - float f8 = (float) (5 + b0 * 10) / 32.0F; - float f9 = (float) (10 + b0 * 10) / 32.0F; - float f10 = 0.05625F; - GL11.glEnable(GL12.GL_RESCALE_NORMAL); + this.bindEntityTexture(entityLaser); + GL11.glPushMatrix(); + GL11.glTranslatef((float) par2, (float) par4, (float) par6); + GL11.glRotatef(entityLaser.prevRotationYaw + (entityLaser.rotationYaw - entityLaser.prevRotationYaw) * par9 - 90.0F, 0.0F, 1.0F, 0.0F); + GL11.glRotatef(entityLaser.prevRotationPitch + (entityLaser.rotationPitch - entityLaser.prevRotationPitch) * par9, 0.0F, 0.0F, 1.0F); + Tessellator tessellator = Tessellator.instance; + byte b0 = 0; + float f2 = 0.4F; + float f3 = 0.7F; + float f4 = (float) (0 + b0 * 10) / 32.0F; + float f5 = (float) (5 + b0 * 10) / 32.0F; + float f6 = 0.0F; + float f7 = 0.15625F; + float f8 = (float) (5 + b0 * 10) / 32.0F; + float f9 = (float) (10 + b0 * 10) / 32.0F; + float f10 = 0.05625F; + GL11.glEnable(GL12.GL_RESCALE_NORMAL); - GL11.glRotatef(45.0F, 1.0F, 0.0F, 0.0F); - GL11.glScalef(f10, f10, f10); - GL11.glTranslatef(-4.0F, 0.0F, 0.0F); - GL11.glNormal3f(f10, 0.0F, 0.0F); - tessellator.startDrawingQuads(); - tessellator.addVertexWithUV(-7.0D, -2.0D, -2.0D, (double) f6, (double) f8); - tessellator.addVertexWithUV(-7.0D, -2.0D, 2.0D, (double) f7, (double) f8); - tessellator.addVertexWithUV(-7.0D, 2.0D, 2.0D, (double) f7, (double) f9); - tessellator.addVertexWithUV(-7.0D, 2.0D, -2.0D, (double) f6, (double) f9); - tessellator.draw(); - GL11.glNormal3f(-f10, 0.0F, 0.0F); - tessellator.startDrawingQuads(); - tessellator.addVertexWithUV(-7.0D, 2.0D, -2.0D, (double) f6, (double) f8); - tessellator.addVertexWithUV(-7.0D, 2.0D, 2.0D, (double) f7, (double) f8); - tessellator.addVertexWithUV(-7.0D, -2.0D, 2.0D, (double) f7, (double) f9); - tessellator.addVertexWithUV(-7.0D, -2.0D, -2.0D, (double) f6, (double) f9); - tessellator.draw(); + GL11.glRotatef(45.0F, 1.0F, 0.0F, 0.0F); + GL11.glScalef(f10, f10, f10); + GL11.glTranslatef(-4.0F, 0.0F, 0.0F); + GL11.glNormal3f(f10, 0.0F, 0.0F); + tessellator.startDrawingQuads(); + tessellator.addVertexWithUV(-7.0D, -2.0D, -2.0D, (double) f6, (double) f8); + tessellator.addVertexWithUV(-7.0D, -2.0D, 2.0D, (double) f7, (double) f8); + tessellator.addVertexWithUV(-7.0D, 2.0D, 2.0D, (double) f7, (double) f9); + tessellator.addVertexWithUV(-7.0D, 2.0D, -2.0D, (double) f6, (double) f9); + tessellator.draw(); + GL11.glNormal3f(-f10, 0.0F, 0.0F); + tessellator.startDrawingQuads(); + tessellator.addVertexWithUV(-7.0D, 2.0D, -2.0D, (double) f6, (double) f8); + tessellator.addVertexWithUV(-7.0D, 2.0D, 2.0D, (double) f7, (double) f8); + tessellator.addVertexWithUV(-7.0D, -2.0D, 2.0D, (double) f7, (double) f9); + tessellator.addVertexWithUV(-7.0D, -2.0D, -2.0D, (double) f6, (double) f9); + tessellator.draw(); - for (int i = 0; i < 4; ++i) { - GL11.glRotatef(90.0F, 1.0F, 0.0F, 0.0F); - GL11.glNormal3f(0.0F, 0.0F, f10); - tessellator.startDrawingQuads(); - tessellator.addVertexWithUV(-8.0D, -2.0D, 0.0D, (double) f2, (double) f4); - tessellator.addVertexWithUV(8.0D, -2.0D, 0.0D, (double) f3, (double) f4); - tessellator.addVertexWithUV(8.0D, 2.0D, 0.0D, (double) f3, (double) f5); - tessellator.addVertexWithUV(-8.0D, 2.0D, 0.0D, (double) f2, (double) f5); - tessellator.draw(); - } + for (int i = 0; i < 4; ++i) { + GL11.glRotatef(90.0F, 1.0F, 0.0F, 0.0F); + GL11.glNormal3f(0.0F, 0.0F, f10); + tessellator.startDrawingQuads(); + tessellator.addVertexWithUV(-8.0D, -2.0D, 0.0D, (double) f2, (double) f4); + tessellator.addVertexWithUV(8.0D, -2.0D, 0.0D, (double) f3, (double) f4); + tessellator.addVertexWithUV(8.0D, 2.0D, 0.0D, (double) f3, (double) f5); + tessellator.addVertexWithUV(-8.0D, 2.0D, 0.0D, (double) f2, (double) f5); + tessellator.draw(); + } - GL11.glDisable(GL12.GL_RESCALE_NORMAL); - GL11.glPopMatrix(); - } + GL11.glDisable(GL12.GL_RESCALE_NORMAL); + GL11.glPopMatrix(); + } - protected ResourceLocation getArrowTextures(EntityLaser entityLaser) { - return laserTexture; - } + protected ResourceLocation getArrowTextures(EntityLaser entityLaser) { + return laserTexture; + } - protected ResourceLocation getEntityTexture(Entity par1Entity) { - return this.getArrowTextures((EntityLaser) par1Entity); - } + protected ResourceLocation getEntityTexture(Entity par1Entity) { + return this.getArrowTextures((EntityLaser) par1Entity); + } - public void doRender(Entity par1Entity, double par2, double par4, double par6, float par8, float par9) { - this.renderArrow((EntityLaser) par1Entity, par2, par4, par6, par8, par9); - } + public void doRender(Entity par1Entity, double par2, double par4, double par6, float par8, float par9) { + this.renderArrow((EntityLaser) par1Entity, par2, par4, par6, par8, par9); + } } diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/BlockRegistry.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/BlockRegistry.java index 7764a62..9927f87 100644 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/BlockRegistry.java +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/BlockRegistry.java @@ -1,50 +1,45 @@ /******************************************************************************* * Copyright (c) 2014 Tombenpotter. * All rights reserved. - * + * * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * + * * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ package electricMagicTools.tombenpotter.electricmagictools.common; -import net.minecraft.block.Block; import cpw.mods.fml.common.registry.GameRegistry; -import electricMagicTools.tombenpotter.electricmagictools.common.blocks.BlockEMTMachines; -import electricMagicTools.tombenpotter.electricmagictools.common.blocks.BlockEMTSolars; -import electricMagicTools.tombenpotter.electricmagictools.common.blocks.BlockEMTSolars2; -import electricMagicTools.tombenpotter.electricmagictools.common.blocks.BlockEssentiaGenerators; -import electricMagicTools.tombenpotter.electricmagictools.common.blocks.BlockPortableNode; -import electricMagicTools.tombenpotter.electricmagictools.common.blocks.BlockShield; +import electricMagicTools.tombenpotter.electricmagictools.common.blocks.*; import electricMagicTools.tombenpotter.electricmagictools.common.items.blocks.ItemBlockEMTMachines; import electricMagicTools.tombenpotter.electricmagictools.common.items.blocks.ItemBlockEMTSolars; import electricMagicTools.tombenpotter.electricmagictools.common.items.blocks.ItemBlockEMTSolars2; import electricMagicTools.tombenpotter.electricmagictools.common.items.blocks.ItemBlockEssentiaGenerators; +import net.minecraft.block.Block; public class BlockRegistry { - public static Block essentiaGens; - public static Block shield; - public static Block emtSolars; - public static Block emtMachines; - public static Block emtSolars2; - public static Block portableNode; + public static Block essentiaGens; + public static Block shield; + public static Block emtSolars; + public static Block emtMachines; + public static Block emtSolars2; + public static Block portableNode; - public static void registerEMTBlocks() { - shield = new BlockShield().setBlockName("shield"); - portableNode = new BlockPortableNode().setBlockName("portablenode"); - emtSolars = new BlockEMTSolars().setBlockName("emtsolars"); - essentiaGens = new BlockEssentiaGenerators().setBlockName("essentiaGens"); - emtMachines = new BlockEMTMachines().setBlockName("emtmachines"); - emtSolars2 = new BlockEMTSolars2().setBlockName("emtsolars2"); + public static void registerEMTBlocks() { + shield = new BlockShield().setBlockName("shield"); + portableNode = new BlockPortableNode().setBlockName("portablenode"); + emtSolars = new BlockEMTSolars().setBlockName("emtsolars"); + essentiaGens = new BlockEssentiaGenerators().setBlockName("essentiaGens"); + emtMachines = new BlockEMTMachines().setBlockName("emtmachines"); + emtSolars2 = new BlockEMTSolars2().setBlockName("emtsolars2"); - GameRegistry.registerBlock(shield, "Shield Block"); - GameRegistry.registerBlock(portableNode, "Portable Node"); - GameRegistry.registerBlock(emtSolars, ItemBlockEMTSolars.class, "EMT Solar Panels"); - GameRegistry.registerBlock(essentiaGens, ItemBlockEssentiaGenerators.class, "Essentia Generators"); - GameRegistry.registerBlock(emtMachines, ItemBlockEMTMachines.class, "EMT Machines"); - GameRegistry.registerBlock(emtSolars2, ItemBlockEMTSolars2.class, "EMT Solars 2"); - } + GameRegistry.registerBlock(shield, "Shield Block"); + GameRegistry.registerBlock(portableNode, "Portable Node"); + GameRegistry.registerBlock(emtSolars, ItemBlockEMTSolars.class, "EMT Solar Panels"); + GameRegistry.registerBlock(essentiaGens, ItemBlockEssentiaGenerators.class, "Essentia Generators"); + GameRegistry.registerBlock(emtMachines, ItemBlockEMTMachines.class, "EMT Machines"); + GameRegistry.registerBlock(emtSolars2, ItemBlockEMTSolars2.class, "EMT Solars 2"); + } } diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/CommonProxy.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/CommonProxy.java index dc7dcd7..b77a174 100644 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/CommonProxy.java +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/CommonProxy.java @@ -1,19 +1,16 @@ /******************************************************************************* * Copyright (c) 2014 Tombenpotter. * All rights reserved. - * + * * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * + * * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ package electricMagicTools.tombenpotter.electricmagictools.common; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; import cpw.mods.fml.common.network.IGuiHandler; import electricMagicTools.tombenpotter.electricmagictools.client.gui.GuiEtherealMacerator; import electricMagicTools.tombenpotter.electricmagictools.client.gui.GuiIndustrialWandRecharger; @@ -21,61 +18,62 @@ import electricMagicTools.tombenpotter.electricmagictools.common.tile.TileEntity import electricMagicTools.tombenpotter.electricmagictools.common.tile.TileEntityIndustrialWandRecharge; import electricMagicTools.tombenpotter.electricmagictools.common.tile.container.ContainerEtheralMacerator; import electricMagicTools.tombenpotter.electricmagictools.common.tile.container.ContainerIndustrialWandRecharge; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; public class CommonProxy implements IGuiHandler { - public void load() { - registerRenders(); - } + public void load() { + registerRenders(); + } - public void registerRenders() { - /* Empty in common proxy */ - } + public void registerRenders() { + /* Empty in common proxy */ + } - @Override - public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - TileEntity entity = world.getTileEntity(x, y, z); + @Override + public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + TileEntity entity = world.getTileEntity(x, y, z); - switch (ID) { - case 0: - if (entity != null && entity instanceof TileEntityIndustrialWandRecharge) { - return new ContainerIndustrialWandRecharge(player.inventory, (TileEntityIndustrialWandRecharge) entity); - } else { - return null; - } + switch (ID) { + case 0: + if (entity != null && entity instanceof TileEntityIndustrialWandRecharge) { + return new ContainerIndustrialWandRecharge(player.inventory, (TileEntityIndustrialWandRecharge) entity); + } else { + return null; + } + case 1: + if (entity != null && entity instanceof TileEntityEtherealMacerator) { + return new ContainerEtheralMacerator(player.inventory, (TileEntityEtherealMacerator) entity); + } else { + return null; + } + default: + return null; + } + } - case 1: - if (entity != null && entity instanceof TileEntityEtherealMacerator) { - return new ContainerEtheralMacerator(player.inventory, (TileEntityEtherealMacerator) entity); - } else { - return null; - } - default: - return null; - } - } + @Override + public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + TileEntity entity = world.getTileEntity(x, y, z); - @Override - public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - TileEntity entity = world.getTileEntity(x, y, z); + switch (ID) { + case 0: + if (entity != null && entity instanceof TileEntityIndustrialWandRecharge) { + return new GuiIndustrialWandRecharger(player.inventory, (TileEntityIndustrialWandRecharge) entity); + } else { + return null; + } + case 1: + if (entity != null && entity instanceof TileEntityEtherealMacerator) { + return new GuiEtherealMacerator(player.inventory, (TileEntityEtherealMacerator) entity); + } else { + return null; + } + default: + return null; - switch (ID) { - case 0: - if (entity != null && entity instanceof TileEntityIndustrialWandRecharge) { - return new GuiIndustrialWandRecharger(player.inventory, (TileEntityIndustrialWandRecharge) entity); - } else { - return null; - } - - case 1: - if (entity != null && entity instanceof TileEntityEtherealMacerator) { - return new GuiEtherealMacerator(player.inventory, (TileEntityEtherealMacerator) entity); - } else { - return null; - } - default: - return null; - - } - } + } + } } diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/Config.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/Config.java index 38aea23..9b163e9 100644 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/Config.java +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/Config.java @@ -1,178 +1,191 @@ /******************************************************************************* * Copyright (c) 2014 Tombenpotter. * All rights reserved. - * + * * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * + * * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ package electricMagicTools.tombenpotter.electricmagictools.common; -import net.minecraftforge.common.config.Configuration; import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.common.config.Configuration; public class Config { - public static int essentiaGeneratorsDelay; - public static int etherealProcessorBaseSpeed; - public static int etherealProcessorBonus; - public static int chargeFocusProduction; - public static int armorBaubleProduction; - public static int inventoryBaubleProdution; - public static int wandChargeFocusCost; + public static int essentiaGeneratorsDelay; + public static int etherealProcessorBaseSpeed; + public static int etherealProcessorBonus; + public static int chargeFocusProduction; + public static int armorBaubleProduction; + public static int inventoryBaubleProdution; + public static int wandChargeFocusCost; - public static double potentiaGenOutput; - public static double arborGenOutput; - public static double auramGenOutput; - public static double ignisGenOutput; - public static double saxumGenOutput; - public static double wandChargerConsumption; - public static double compressedSolarOutput; - public static double doubleCompressedSolarOutput; - public static double nanoBootsSpeed; - public static double quantumBootsSpeed; - public static double nanoBootsJump; - public static double quantumBootsJump; - public static double tripleCompressedSolarOutput; + public static double potentiaGenOutput; + public static double arborGenOutput; + public static double auramGenOutput; + public static double ignisGenOutput; + public static double saxumGenOutput; + public static double wandChargerConsumption; + public static double compressedSolarOutput; + public static double doubleCompressedSolarOutput; + public static double nanoBootsSpeed; + public static double quantumBootsSpeed; + public static double nanoBootsJump; + public static double quantumBootsJump; + public static double tripleCompressedSolarOutput; - public static boolean capesOn; - public static boolean toolsInBore; - public static boolean nightVisionOff; - public static boolean enchanting; - public static boolean smoke; - public static boolean oneRingSpawn; + public static boolean capesOn; + public static boolean toolsInBore; + public static boolean nightVisionOff; + public static boolean enchanting; + public static boolean smoke; + public static boolean oneRingSpawn; + public static boolean removeAmberAndCinnabarMacerating; - public static boolean thaumiumDrillResearch; - public static boolean thaumiumChainsawResearch; - public static boolean thaumiumOmnitoolResearch; - public static boolean rockbreakerDrillResearch; - public static boolean streamChainsawResearch; - public static boolean electricGooglesResearch; - public static boolean nanoGooglesResearch; - public static boolean quantumGooglesResearch; - public static boolean ironOmnitoolResearch; - public static boolean diamondOmnitoolResearch; - public static boolean explosionFocusResearch; - public static boolean christmasFocusResearch; - public static boolean shieldFocusResearch; - public static boolean shieldBlockResearch; - public static boolean potentiaGeneratorResearch; - public static boolean ignisGeneratorResearch; - public static boolean auramGeneratorResearch; - public static boolean arborGeneratorResearch; - public static boolean wandChargingSationResearch; - public static boolean tinyUraniumResearch; - public static boolean thorHammerResearch; - public static boolean superchargedThorHammerResearch; - public static boolean compressedSolarsResearch; - public static boolean solarHelmetResearch; - public static boolean electricBootsResearch; - public static boolean nanoBootsResearch; - public static boolean quantumBootsResearch; - public static boolean electricScribingToolsResearch; - public static boolean etherealProcessorResearch; - public static boolean waterSolarsResearch; - public static boolean darkSolarsResearch; - public static boolean orderSolarsResearch; - public static boolean fireSolarsResearch; - public static boolean airSolarsResearch; - public static boolean earthSolarsResearch; - public static boolean saxumGenResearch; - public static boolean uuMInfusionResearch; - public static boolean portableNodeResarch; - public static boolean electricHoeGrowthResearch; - public static boolean chargeFocusResearch; - public static boolean wandChargeFocusResearch; - public static boolean inventoryChargingRing; - public static boolean armorChargingRing; + public static int chanceOneRing; + public static int chanceTaintedMjolnir; - public static String CATEGORY_RESEARCH = "Research"; - public static String CATEGORY_VALUES = "Numeric Values"; + public static boolean thaumiumDrillResearch; + public static boolean thaumiumChainsawResearch; + public static boolean thaumiumOmnitoolResearch; + public static boolean rockbreakerDrillResearch; + public static boolean streamChainsawResearch; + public static boolean electricGooglesResearch; + public static boolean nanoGooglesResearch; + public static boolean quantumGooglesResearch; + public static boolean ironOmnitoolResearch; + public static boolean diamondOmnitoolResearch; + public static boolean explosionFocusResearch; + public static boolean christmasFocusResearch; + public static boolean shieldFocusResearch; + public static boolean shieldBlockResearch; + public static boolean potentiaGeneratorResearch; + public static boolean ignisGeneratorResearch; + public static boolean auramGeneratorResearch; + public static boolean arborGeneratorResearch; + public static boolean wandChargingSationResearch; + public static boolean tinyUraniumResearch; + public static boolean thorHammerResearch; + public static boolean superchargedThorHammerResearch; + public static boolean compressedSolarsResearch; + public static boolean solarHelmetResearch; + public static boolean electricBootsResearch; + public static boolean nanoBootsResearch; + public static boolean quantumBootsResearch; + public static boolean electricScribingToolsResearch; + public static boolean etherealProcessorResearch; + public static boolean waterSolarsResearch; + public static boolean darkSolarsResearch; + public static boolean orderSolarsResearch; + public static boolean fireSolarsResearch; + public static boolean airSolarsResearch; + public static boolean earthSolarsResearch; + public static boolean saxumGenResearch; + public static boolean uuMInfusionResearch; + public static boolean portableNodeResarch; + public static boolean electricHoeGrowthResearch; + public static boolean chargeFocusResearch; + public static boolean wandChargeFocusResearch; + public static boolean inventoryChargingRing; + public static boolean armorChargingRing; + public static boolean thaumiumWingResearch; + public static boolean nanoWingResearch; + public static boolean quantumWingsResearch; - public static void create(FMLPreInitializationEvent event) { - Configuration config = new Configuration(event.getSuggestedConfigurationFile()); - config.addCustomCategoryComment(CATEGORY_VALUES, "The only way to change some numbers that my machines uses."); - config.addCustomCategoryComment(CATEGORY_RESEARCH, "The only way to disable some researches. " + "Be careful, if you disable some researches, " + "all researches linked to it will be removed too. " + "Really, don't touch that unless you know exactly what you are doing."); + public static String CATEGORY_RESEARCH = "Research"; + public static String CATEGORY_VALUES = "Numeric Values"; - config.load(); + public static void create(FMLPreInitializationEvent event) { + Configuration config = new Configuration(event.getSuggestedConfigurationFile()); + config.addCustomCategoryComment(CATEGORY_VALUES, "The only way to change some numbers that my machines uses."); + config.addCustomCategoryComment(CATEGORY_RESEARCH, "The only way to disable some researches. " + "Be careful, if you disable some researches, " + "all researches linked to it will be removed too. " + "Really, don't touch that unless you know exactly what you are doing."); - /** Random Booleans **/ - capesOn = config.get(Configuration.CATEGORY_GENERAL, "Enable showing capes", true, "This config option is to enable or disable capes for people who have them. " + "Seriously, you shouldn't touch that unless you have another cape and " + "it conflicts with it.").getBoolean(capesOn); - toolsInBore = config.get(Configuration.CATEGORY_GENERAL, "Making the tools worth begin used in the Arcane Bore.", false, "This will augment the durablilty of the tools, and will also decrease the EU cost to 1. " + "The tools should have the same number of uses than before.").getBoolean(toolsInBore); - nightVisionOff = config.get(Configuration.CATEGORY_GENERAL, "Disable totally the nightvision ability of the Nanosuit Googles of Revealing, " + "Quantum Googles of Revealing and of the Quantum Solar Helmet of Revealing", false).getBoolean(nightVisionOff); - enchanting = config.get(Configuration.CATEGORY_GENERAL, "Enable enchanting my tools and amors", false).getBoolean(enchanting); - smoke = config.get(Configuration.CATEGORY_GENERAL, "Disable the smoke effect for the Electric/Nano/Quantum Boots of the Traveller", false).getBoolean(smoke); - oneRingSpawn = config.get(Configuration.CATEGORY_GENERAL, "Disable the One Ring spawning in dungeon chests", false, "There is no other way to get this item.").getBoolean(oneRingSpawn); + config.load(); - /** EU Yield/Consumption modifier **/ - potentiaGenOutput = config.get("Numeric Values", "Potentia Generator EU Output", 3500, "This is the number you have to modify if you want to make the Potentia Generator yield " + "more or less EU per unit of essentia.").getDouble(potentiaGenOutput); - arborGenOutput = config.get("Numeric Values", "Arbor Generator EU Output", 325, "This is the number you have to modify if you want to make the Arbor Generator yield " + "more or less EU per unit of essentia.").getDouble(arborGenOutput); - auramGenOutput = config.get("Numeric Values", "Auram Generator EU Output", 3200, "This is the number you have to modify if you want to make the Auram Generator yield " + "more or less EU per unit of essentia.").getDouble(auramGenOutput); - ignisGenOutput = config.get("Numeric Values", "Ignis Generator EU Output", 3200, "This is the number you have to modify if you want to make the Ignis Generator yield " + "more or less EU per unit of essentia.").getDouble(ignisGenOutput); - saxumGenOutput = config.get("Numeric Values", "Saxum Generator Output", 350, "This is the number you have to modify if you want to make the Saxum Generator yield " + "more or less EU per unit of essentia.").getDouble(saxumGenOutput); - wandChargerConsumption = config.get("Numeric Values", "Industrial Wand Charging Station EU Consumption", 50000, "This is the number you have to modify if you want to make the Industrial Wand Charging " + "Station use more or less EU to charge 1 unit of Vis on your wand.").getDouble(wandChargerConsumption); - compressedSolarOutput = config.get("Numeric Values", "Compressed Solar Panel EU Output", 10, "This is the number you have to modify if you want to make the Compressed Solar Panel yield " + "more or less EU per tick. Really, you shouldn't touch that, " + "since it's pretty balanced as it is.").getDouble(compressedSolarOutput); - doubleCompressedSolarOutput = config.get("Numeric Values", "Double Compressed Solar Panel EU Output", 100, "This is the number you have to modify if you want to make the Double Compressed Solar Panel " + "yield more or less EU per tick. Really, you shouldn't touch that, " + "since it's pretty balanced as it is.").getDouble(doubleCompressedSolarOutput); - tripleCompressedSolarOutput = config.get("Numeric Values", "Triple Compressed Solar Panel EU Output", 1000, "This is the number you have to modify if you want to make the Triple Compressed Solar Panel " + "yield more or less EU per tick. Really, you shouldn't touch that, " + "since it's pretty balanced as it is.").getDouble(tripleCompressedSolarOutput); - essentiaGeneratorsDelay = config.get("Numeric Values", "Essentia Generators draw rate", 120, "The number of ticks the Essentia Generators wait before using 2 Essentia. " + "If you want them to be slower, increase the number.").getInt(essentiaGeneratorsDelay); - nanoBootsSpeed = config.get("Numeric Values", "Speed of the Nano Boots of the Traveller", 0.25, "Watch out, that goes up REALLY quickly.").getDouble(nanoBootsSpeed); - quantumBootsSpeed = config.get("Numeric Values", "Speed of the Quantum Boots of the Traveller", 0.5, "Watch out, that goes up REALLY quickly.").getDouble(quantumBootsSpeed); - nanoBootsJump = config.get("Numeric Values", "Jump height for the Nano Boots of the Traveller", 0.6, "Watch out, that goes up REALLY quickly.").getDouble(nanoBootsJump); - quantumBootsJump = config.get("Numeric Values", "Jump height for the Quantum Boots of the Traveller", 0.9, "Watch out, that goes up REALLY quickly.").getDouble(nanoBootsJump); - etherealProcessorBaseSpeed = config.get("Numeric Values", "Base Time the Etheral Processor takes to process a single item in number of ticks.", 400).getInt(); - etherealProcessorBonus = config.get("Numeric Values", "Ethereal Processor Bonus", 10, "This number is the chance of getting a Thaumium Ingot as a bonus when " + "processing an item in the machine. It is 1 out of the number you will enter. " + "The default is 1/10 chance.").getInt(); - chargeFocusProduction = config.get("Numeric Values", "Wand Focus: Charge production in EU/T", 64).getInt(); - armorBaubleProduction = config.get("Numeric Values", "Armor Charging Ring produciton in EU/T", 32).getInt(); - inventoryBaubleProdution = config.get("Numeric Values", "Inventory Charging Ring produciton in EU/T", 32).getInt(); - wandChargeFocusCost = config.get("Numeric Values", "Wand Focus: Wand Charging Cost in EU/T", 40000).getInt(); + /** Random Booleans **/ + capesOn = config.get(Configuration.CATEGORY_GENERAL, "Enable showing capes", true, "This config option is to enable or disable capes for people who have them. " + "Seriously, you shouldn't touch that unless you have another cape and " + "it conflicts with it.").getBoolean(capesOn); + toolsInBore = config.get(Configuration.CATEGORY_GENERAL, "Making the tools worth begin used in the Arcane Bore.", false, "This will augment the durablilty of the tools, and will also decrease the EU cost to 1. " + "The tools should have the same number of uses than before.").getBoolean(toolsInBore); + nightVisionOff = config.get(Configuration.CATEGORY_GENERAL, "Disable totally the nightvision ability of the Nanosuit Googles of Revealing, " + "Quantum Googles of Revealing and of the Quantum Solar Helmet of Revealing", false, "This was added because of mods making you totally blind if using nightvision. For example, enable that when in the Deep Dark.").getBoolean(nightVisionOff); + enchanting = config.get(Configuration.CATEGORY_GENERAL, "Enable enchanting my tools and amors", false, "Warning: the enchantability is low.").getBoolean(enchanting); + smoke = config.get(Configuration.CATEGORY_GENERAL, "Disable the smoke effect for the Electric/Nano/Quantum Boots of the Traveller", false, "This effect only appears when the player isn't on the ground").getBoolean(smoke); + oneRingSpawn = config.get(Configuration.CATEGORY_GENERAL, "Disable the One Ring spawning in dungeon chests", false, "There is no other way to get this item.").getBoolean(oneRingSpawn); + chanceTaintedMjolnir = config.get(Configuration.CATEGORY_GENERAL, "Chance for the Tainted Mjolnir to spawn inside of dungeon chests", 25, "If you have a lot of mods adding dungeon loot, you should definetely increase this").getInt(); + chanceOneRing = config.get(Configuration.CATEGORY_GENERAL, "Chance for The One Ring to spawn inside of dungeon chests", 15, "If you have a lot of mods adding dungeon loot, you should definetely increase this").getInt(); + removeAmberAndCinnabarMacerating = config.get(Configuration.CATEGORY_GENERAL, "Remove Existing Amber and Cinnabar Macerating Recipes", true, "This is here because of conflicts between mods that add the same input and different outputs").getBoolean(removeAmberAndCinnabarMacerating); - /** Disable Researches **/ - thaumiumDrillResearch = config.get("Research", "Thaumium Drill", false).getBoolean(thaumiumDrillResearch); - thaumiumChainsawResearch = config.get("Research", "Thaumium Chainsaw", false).getBoolean(thaumiumChainsawResearch); - thaumiumDrillResearch = config.get("Research", "Thaumium Omnitool", false).getBoolean(thaumiumOmnitoolResearch); - rockbreakerDrillResearch = config.get("Research", "Drill of the Rockbreaker", false).getBoolean(rockbreakerDrillResearch); - streamChainsawResearch = config.get("Research", "Chainsaw of the Stream", false).getBoolean(streamChainsawResearch); - electricGooglesResearch = config.get("Research", "Electric Googles of Revealing", false).getBoolean(electricGooglesResearch); - nanoGooglesResearch = config.get("Research", "Nanosuit Googles of Revealing", false).getBoolean(nanoGooglesResearch); - quantumGooglesResearch = config.get("Research", "Quantum Googles of Revealing", false).getBoolean(quantumGooglesResearch); - ironOmnitoolResearch = config.get("Research", "Omnitool", false).getBoolean(ironOmnitoolResearch); - diamondOmnitoolResearch = config.get("Research", "Diamond Omnitool", false).getBoolean(diamondOmnitoolResearch); - explosionFocusResearch = config.get("Research", "Explosion Focus", false).getBoolean(explosionFocusResearch); - christmasFocusResearch = config.get("Research", "Kris-tmas Focus", false).getBoolean(christmasFocusResearch); - shieldFocusResearch = config.get("Research", "Shield Focus", false).getBoolean(shieldFocusResearch); - shieldBlockResearch = config.get("Research", "Shield Block", false).getBoolean(shieldBlockResearch); - potentiaGeneratorResearch = config.get("Research", "Potentia Generator", false).getBoolean(potentiaGeneratorResearch); - ignisGeneratorResearch = config.get("Research", "Ignis Generator", false).getBoolean(ignisGeneratorResearch); - auramGeneratorResearch = config.get("Research", "Auram Generator", false).getBoolean(auramGeneratorResearch); - arborGeneratorResearch = config.get("Research", "Arbor Generator", false).getBoolean(arborGeneratorResearch); - wandChargingSationResearch = config.get("Research", "Industrial Wand Charging Station", false).getBoolean(wandChargingSationResearch); - tinyUraniumResearch = config.get("Research", "Tiny Piles of Uranium", false).getBoolean(tinyUraniumResearch); - thorHammerResearch = config.get("Research", "Mjolnir", false).getBoolean(thorHammerResearch); - superchargedThorHammerResearch = config.get("Research", "Supercharged Mjolnir", false).getBoolean(superchargedThorHammerResearch); - compressedSolarsResearch = config.get("Research", "Compressed Solars", false).getBoolean(compressedSolarsResearch); - solarHelmetResearch = config.get("Research", "Solar Helmet of Revealing", false).getBoolean(solarHelmetResearch); - electricBootsResearch = config.get("Research", "Electric Boots of the Traveller", false).getBoolean(electricBootsResearch); - nanoBootsResearch = config.get("Research", "Nano Boots of the Traveller", false).getBoolean(nanoBootsResearch); - quantumBootsResearch = config.get("Research", "Quantum Boots of the Traveller", false).getBoolean(quantumBootsResearch); - electricScribingToolsResearch = config.get("Research", "Electric Scribing Tools", false).getBoolean(electricScribingToolsResearch); - etherealProcessorResearch = config.get("Research", "Ethereal Processor", false).getBoolean(etherealProcessorResearch); - waterSolarsResearch = config.get("Research", "Water Solar Panels", false).getBoolean(waterSolarsResearch); - darkSolarsResearch = config.get("Research", "Entropy Solar Panels", false).getBoolean(darkSolarsResearch); - orderSolarsResearch = config.get("Research", "Order Solar Panels", false).getBoolean(orderSolarsResearch); - fireSolarsResearch = config.get("Research", "Fire Solar Panels", false).getBoolean(fireSolarsResearch); - airSolarsResearch = config.get("Research", "Air Solar Panels", false).getBoolean(airSolarsResearch); - earthSolarsResearch = config.get("Research", "Earth Solar Panels", false).getBoolean(earthSolarsResearch); - saxumGenResearch = config.get("Research", "Saxum Generator", false).getBoolean(saxumGenResearch); - uuMInfusionResearch = config.get("Research", "UU-Mater Infusion", false).getBoolean(uuMInfusionResearch); - portableNodeResarch = config.get("Research", "Portable Node", false).getBoolean(portableNodeResarch); - electricHoeGrowthResearch = config.get("Research", "Electric Hoe of Growth", false).getBoolean(electricHoeGrowthResearch); - chargeFocusResearch = config.get("Research", "Wand Focus: Charging", false).getBoolean(chargeFocusResearch); - wandChargeFocusResearch = config.get("Research", "Wand Focus: Wand Charging", false).getBoolean(wandChargeFocusResearch); - inventoryChargingRing = config.get("Research", "Inventory Charging Ring", false).getBoolean(inventoryChargingRing); - armorChargingRing = config.get("Research", "Armor Charging Ring", false).getBoolean(armorChargingRing); + /** EU Yield/Consumption modifier **/ + potentiaGenOutput = config.get("Numeric Values", "Potentia Generator EU Output", 3500, "This is the number you have to modify if you want to make the Potentia Generator yield " + "more or less EU per unit of essentia.").getDouble(potentiaGenOutput); + arborGenOutput = config.get("Numeric Values", "Arbor Generator EU Output", 325, "This is the number you have to modify if you want to make the Arbor Generator yield " + "more or less EU per unit of essentia.").getDouble(arborGenOutput); + auramGenOutput = config.get("Numeric Values", "Auram Generator EU Output", 3200, "This is the number you have to modify if you want to make the Auram Generator yield " + "more or less EU per unit of essentia.").getDouble(auramGenOutput); + ignisGenOutput = config.get("Numeric Values", "Ignis Generator EU Output", 3200, "This is the number you have to modify if you want to make the Ignis Generator yield " + "more or less EU per unit of essentia.").getDouble(ignisGenOutput); + saxumGenOutput = config.get("Numeric Values", "Saxum Generator Output", 350, "This is the number you have to modify if you want to make the Saxum Generator yield " + "more or less EU per unit of essentia.").getDouble(saxumGenOutput); + wandChargerConsumption = config.get("Numeric Values", "Industrial Wand Charging Station EU Consumption", 50000, "This is the number you have to modify if you want to make the Industrial Wand Charging " + "Station use more or less EU to charge 1 unit of Vis on your wand.").getDouble(wandChargerConsumption); + compressedSolarOutput = config.get("Numeric Values", "Compressed Solar Panel EU Output", 10, "This is the number you have to modify if you want to make the Compressed Solar Panel yield " + "more or less EU per tick. Really, you shouldn't touch that, " + "since it's pretty balanced as it is.").getDouble(compressedSolarOutput); + doubleCompressedSolarOutput = config.get("Numeric Values", "Double Compressed Solar Panel EU Output", 100, "This is the number you have to modify if you want to make the Double Compressed Solar Panel " + "yield more or less EU per tick. Really, you shouldn't touch that, " + "since it's pretty balanced as it is.").getDouble(doubleCompressedSolarOutput); + tripleCompressedSolarOutput = config.get("Numeric Values", "Triple Compressed Solar Panel EU Output", 1000, "This is the number you have to modify if you want to make the Triple Compressed Solar Panel " + "yield more or less EU per tick. Really, you shouldn't touch that, " + "since it's pretty balanced as it is.").getDouble(tripleCompressedSolarOutput); + essentiaGeneratorsDelay = config.get("Numeric Values", "Essentia Generators draw rate", 120, "The number of ticks the Essentia Generators wait before using 2 Essentia. " + "If you want them to be slower, increase the number.").getInt(essentiaGeneratorsDelay); + nanoBootsSpeed = config.get("Numeric Values", "Speed of the Nano Boots of the Traveller", 0.25, "Watch out, that goes up REALLY quickly.").getDouble(nanoBootsSpeed); + quantumBootsSpeed = config.get("Numeric Values", "Speed of the Quantum Boots of the Traveller", 0.5, "Watch out, that goes up REALLY quickly.").getDouble(quantumBootsSpeed); + nanoBootsJump = config.get("Numeric Values", "Jump height for the Nano Boots of the Traveller", 0.6, "Watch out, that goes up REALLY quickly.").getDouble(nanoBootsJump); + quantumBootsJump = config.get("Numeric Values", "Jump height for the Quantum Boots of the Traveller", 0.9, "Watch out, that goes up REALLY quickly.").getDouble(nanoBootsJump); + etherealProcessorBaseSpeed = config.get("Numeric Values", "Base Time the Etheral Processor takes to process a single item in number of ticks.", 400, "Default is 400, the double of a regular furnace").getInt(); + etherealProcessorBonus = config.get("Numeric Values", "Ethereal Processor Bonus", 10, "This number is the chance of getting a Thaumium Ingot as a bonus when " + "processing an item in the machine. It is 1 out of the number you will enter. " + "The default is 1/10 chance.").getInt(); + chargeFocusProduction = config.get("Numeric Values", "Wand Focus: Charge production in EU/T", 64, "Default is 64").getInt(); + armorBaubleProduction = config.get("Numeric Values", "Armor Charging Ring produciton in EU/T", 32, "Default is 32").getInt(); + inventoryBaubleProdution = config.get("Numeric Values", "Inventory Charging Ring produciton in EU/T", 32, "Default is 32").getInt(); + wandChargeFocusCost = config.get("Numeric Values", "Wand Focus: Wand Charging Cost in EU/T", 40000, "Default is 40000").getInt(); - config.save(); - } + /** Disable Researches **/ + thaumiumDrillResearch = config.get("Research", "Thaumium Drill", false).getBoolean(thaumiumDrillResearch); + thaumiumChainsawResearch = config.get("Research", "Thaumium Chainsaw", false).getBoolean(thaumiumChainsawResearch); + thaumiumDrillResearch = config.get("Research", "Thaumium Omnitool", false).getBoolean(thaumiumOmnitoolResearch); + rockbreakerDrillResearch = config.get("Research", "Drill of the Rockbreaker", false).getBoolean(rockbreakerDrillResearch); + streamChainsawResearch = config.get("Research", "Chainsaw of the Stream", false).getBoolean(streamChainsawResearch); + electricGooglesResearch = config.get("Research", "Electric Googles of Revealing", false).getBoolean(electricGooglesResearch); + nanoGooglesResearch = config.get("Research", "Nanosuit Googles of Revealing", false).getBoolean(nanoGooglesResearch); + quantumGooglesResearch = config.get("Research", "Quantum Googles of Revealing", false).getBoolean(quantumGooglesResearch); + ironOmnitoolResearch = config.get("Research", "Omnitool", false).getBoolean(ironOmnitoolResearch); + diamondOmnitoolResearch = config.get("Research", "Diamond Omnitool", false).getBoolean(diamondOmnitoolResearch); + explosionFocusResearch = config.get("Research", "Explosion Focus", false).getBoolean(explosionFocusResearch); + christmasFocusResearch = config.get("Research", "Kris-tmas Focus", false).getBoolean(christmasFocusResearch); + shieldFocusResearch = config.get("Research", "Shield Focus", false).getBoolean(shieldFocusResearch); + shieldBlockResearch = config.get("Research", "Shield Block", false).getBoolean(shieldBlockResearch); + potentiaGeneratorResearch = config.get("Research", "Potentia Generator", false).getBoolean(potentiaGeneratorResearch); + ignisGeneratorResearch = config.get("Research", "Ignis Generator", false).getBoolean(ignisGeneratorResearch); + auramGeneratorResearch = config.get("Research", "Auram Generator", false).getBoolean(auramGeneratorResearch); + arborGeneratorResearch = config.get("Research", "Arbor Generator", false).getBoolean(arborGeneratorResearch); + wandChargingSationResearch = config.get("Research", "Industrial Wand Charging Station", false).getBoolean(wandChargingSationResearch); + tinyUraniumResearch = config.get("Research", "Tiny Piles of Uranium", false).getBoolean(tinyUraniumResearch); + thorHammerResearch = config.get("Research", "Mjolnir", false).getBoolean(thorHammerResearch); + superchargedThorHammerResearch = config.get("Research", "Supercharged Mjolnir", false).getBoolean(superchargedThorHammerResearch); + compressedSolarsResearch = config.get("Research", "Compressed Solars", false).getBoolean(compressedSolarsResearch); + solarHelmetResearch = config.get("Research", "Solar Helmet of Revealing", false).getBoolean(solarHelmetResearch); + electricBootsResearch = config.get("Research", "Electric Boots of the Traveller", false).getBoolean(electricBootsResearch); + nanoBootsResearch = config.get("Research", "Nano Boots of the Traveller", false).getBoolean(nanoBootsResearch); + quantumBootsResearch = config.get("Research", "Quantum Boots of the Traveller", false).getBoolean(quantumBootsResearch); + electricScribingToolsResearch = config.get("Research", "Electric Scribing Tools", false).getBoolean(electricScribingToolsResearch); + etherealProcessorResearch = config.get("Research", "Ethereal Processor", false).getBoolean(etherealProcessorResearch); + waterSolarsResearch = config.get("Research", "Water Solar Panels", false).getBoolean(waterSolarsResearch); + darkSolarsResearch = config.get("Research", "Entropy Solar Panels", false).getBoolean(darkSolarsResearch); + orderSolarsResearch = config.get("Research", "Order Solar Panels", false).getBoolean(orderSolarsResearch); + fireSolarsResearch = config.get("Research", "Fire Solar Panels", false).getBoolean(fireSolarsResearch); + airSolarsResearch = config.get("Research", "Air Solar Panels", false).getBoolean(airSolarsResearch); + earthSolarsResearch = config.get("Research", "Earth Solar Panels", false).getBoolean(earthSolarsResearch); + saxumGenResearch = config.get("Research", "Saxum Generator", false).getBoolean(saxumGenResearch); + uuMInfusionResearch = config.get("Research", "UU-Mater Infusion", false).getBoolean(uuMInfusionResearch); + portableNodeResarch = config.get("Research", "Portable Node", false).getBoolean(portableNodeResarch); + electricHoeGrowthResearch = config.get("Research", "Electric Hoe of Growth", false).getBoolean(electricHoeGrowthResearch); + chargeFocusResearch = config.get("Research", "Wand Focus: Charging", false).getBoolean(chargeFocusResearch); + wandChargeFocusResearch = config.get("Research", "Wand Focus: Wand Charging", false).getBoolean(wandChargeFocusResearch); + inventoryChargingRing = config.get("Research", "Inventory Charging Ring", false).getBoolean(inventoryChargingRing); + armorChargingRing = config.get("Research", "Armor Charging Ring", false).getBoolean(armorChargingRing); + thaumiumWingResearch = config.get("Research", "Thaumium Reinforced Wings", false).getBoolean(thaumiumWingResearch); + nanoWingResearch = config.get("Research", "Nanosuit Wings", false).getBoolean(nanoWingResearch); + quantumWingsResearch = config.get("Research", "Quantum Wings", false).getBoolean(quantumWingsResearch); + + config.save(); + } } diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/CreativeTab.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/CreativeTab.java index 60e03a3..77f07a9 100644 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/CreativeTab.java +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/CreativeTab.java @@ -1,10 +1,10 @@ /******************************************************************************* * Copyright (c) 2014 Tombenpotter. * All rights reserved. - * + * * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * + * * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. * http://www.minecraftforum.net/topic/1585216- @@ -15,10 +15,10 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; public class CreativeTab { - public static CreativeTabs tabTombenpotter = new CreativeTabs("Electro-Magic Tools") { - @Override - public Item getTabIconItem() { - return ItemRegistry.thaumiumDrill; - } - }; + public static CreativeTabs tabTombenpotter = new CreativeTabs("Electro-Magic Tools") { + @Override + public Item getTabIconItem() { + return ItemRegistry.thaumiumDrill; + } + }; } diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/DungeonChestGenerator.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/DungeonChestGenerator.java new file mode 100644 index 0000000..540c79e --- /dev/null +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/DungeonChestGenerator.java @@ -0,0 +1,18 @@ +package electricMagicTools.tombenpotter.electricmagictools.common; + +import net.minecraft.item.ItemStack; +import net.minecraft.util.WeightedRandomChestContent; +import net.minecraftforge.common.ChestGenHooks; + +public class DungeonChestGenerator { + + public static void generateLoot() { + if (Config.thorHammerResearch == false) { + ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST).addItem(new WeightedRandomChestContent(new ItemStack(ItemRegistry.taintedThorHammer), 0, 1, Config.chanceTaintedMjolnir)); + } + if (Config.oneRingSpawn == false) { + ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST).addItem(new WeightedRandomChestContent(new ItemStack(ItemRegistry.emtBauble, 1, 2), 0, 1, Config.chanceOneRing)); + } + } + +} diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/EMTEntityRegistry.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/EMTEntityRegistry.java index e712de9..acfec60 100644 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/EMTEntityRegistry.java +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/EMTEntityRegistry.java @@ -1,50 +1,50 @@ /******************************************************************************* * Copyright (c) 2014 Tombenpotter. * All rights reserved. - * + * * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * + * * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ package electricMagicTools.tombenpotter.electricmagictools.common; +import cpw.mods.fml.common.registry.EntityRegistry; +import electricMagicTools.tombenpotter.electricmagictools.common.entities.EntityArcher; +import electricMagicTools.tombenpotter.electricmagictools.common.entities.EntityLaser; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList; import net.minecraft.entity.EntityList.EntityEggInfo; import net.minecraft.entity.EntityLiving; -import cpw.mods.fml.common.registry.EntityRegistry; -import electricMagicTools.tombenpotter.electricmagictools.common.entities.EntityArcher; -import electricMagicTools.tombenpotter.electricmagictools.common.entities.EntityLaser; public class EMTEntityRegistry { - private static int startEID = 300; - private static int entityIDs = 0; - private static final Class ARCHER_CLASS = EntityArcher.class; + private static int startEID = 300; + private static int entityIDs = 0; + private static final Class ARCHER_CLASS = EntityArcher.class; - private static int getUniqueEntityID() { + private static int getUniqueEntityID() { - do { - startEID++; - } while (EntityList.getStringFromID(startEID) != null); - return startEID; - } + do { + startEID++; + } while (EntityList.getStringFromID(startEID) != null); + return startEID; + } - @SuppressWarnings("unchecked") - public static void registerEntityEgg(Class entity, int colPrim, int colSec) { - int id = getUniqueEntityID(); - EntityList.IDtoClassMapping.put(id, entity); - EntityList.entityEggs.put(id, new EntityEggInfo(id, colPrim, colSec)); - return; - } + @SuppressWarnings("unchecked") + public static void registerEntityEgg(Class entity, int colPrim, int colSec) { + int id = getUniqueEntityID(); + EntityList.IDtoClassMapping.put(id, entity); + EntityList.entityEggs.put(id, new EntityEggInfo(id, colPrim, colSec)); + return; + } - public static void registerEMTEntities() { + public static void registerEMTEntities() { - EntityRegistry.registerModEntity(EntityLaser.class, "entityLaser", entityIDs++, ElectricMagicTools.instance, 80, 3, true); - EntityRegistry.registerModEntity(EntityArcher.class, "entityArcher", entityIDs++, ElectricMagicTools.instance, 80, 3, true); - registerEntityEgg(ARCHER_CLASS, 0x99111F, 0xE5685); - } + EntityRegistry.registerModEntity(EntityLaser.class, "entityLaser", entityIDs++, ElectricMagicTools.instance, 80, 3, true); + EntityRegistry.registerModEntity(EntityArcher.class, "entityArcher", entityIDs++, ElectricMagicTools.instance, 80, 3, true); + registerEntityEgg(ARCHER_CLASS, 0x99111F, 0xE5685); + } } diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/EMTEventHandler.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/EMTEventHandler.java index 4d092dd..c820a05 100644 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/EMTEventHandler.java +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/EMTEventHandler.java @@ -1,34 +1,38 @@ /******************************************************************************* * Copyright (c) 2014 Tombenpotter. * All rights reserved. - * + * * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * + * * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ package electricMagicTools.tombenpotter.electricmagictools.common; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.monster.EntityCreeper; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraftforge.event.entity.living.LivingDropsEvent; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import thaumcraft.common.entities.monster.EntityTaintChicken; public class EMTEventHandler { - @SubscribeEvent - public void onEntityLivingDrops(LivingDropsEvent event) { - if (event.source.getEntity() != null && event.source.getEntity() instanceof EntityPlayer) { - if (event.entityLiving instanceof EntityCreeper) { - EntityCreeper creeper = (EntityCreeper) event.entityLiving; - if (creeper.getPowered()) { - event.drops.add(new EntityItem(event.entityLiving.worldObj, event.entityLiving.posX, event.entityLiving.posY, event.entityLiving.posZ, new ItemStack(ItemRegistry.lightningSummoner))); - } - } - } - } + @SubscribeEvent + public void onEntityLivingDrops(LivingDropsEvent event) { + if (event.source.getEntity() != null && event.source.getEntity() instanceof EntityPlayer) { + if (event.entityLiving instanceof EntityCreeper) { + EntityCreeper creeper = (EntityCreeper) event.entityLiving; + if (creeper.getPowered()) { + event.drops.add(new EntityItem(event.entityLiving.worldObj, event.entityLiving.posX, event.entityLiving.posY, event.entityLiving.posZ, new ItemStack(ItemRegistry.itemEMTItems, 1, 6))); + } + } + if (event.entityLiving instanceof EntityTaintChicken) { + event.drops.add(new EntityItem(event.entityLiving.worldObj, event.entityLiving.posX, event.entityLiving.posY, event.entityLiving.posZ, new ItemStack(ItemRegistry.itemEMTItems, 1, 14))); + } + } + } } diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/EMTResearchItem.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/EMTResearchItem.java index 8d770bd..9d8176c 100644 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/EMTResearchItem.java +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/EMTResearchItem.java @@ -1,25 +1,27 @@ /******************************************************************************* * Copyright (c) 2014 Tombenpotter. * All rights reserved. - * + * * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * + * * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. * http://www.minecraftforum.net/topic/1585216- - * + * * Attention: this class originally belongs to the ThaumicTinkerer mod. * All I did was modifying it to fulfill my needs. - * + * * ThaumicTinkerer is Open Source and distributed under a * Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License * (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB) - * + * * http://www.minecraftforum.net/topic/1813058- ******************************************************************************/ package electricMagicTools.tombenpotter.electricmagictools.common; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; @@ -27,54 +29,52 @@ import thaumcraft.api.aspects.AspectList; import thaumcraft.api.research.ResearchItem; import thaumcraft.api.research.ResearchPage; import thaumcraft.api.research.ResearchPage.PageType; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class EMTResearchItem extends ResearchItem { - public EMTResearchItem(String par1, String par2) { - super(par1, par2); - } + public EMTResearchItem(String par1, String par2) { + super(par1, par2); + } - public EMTResearchItem(String par1, String par2, AspectList tags, int par3, int par4, int par5, ItemStack icon) { - super(par1, par2, tags, par3, par4, par5, icon); - } + public EMTResearchItem(String par1, String par2, AspectList tags, int par3, int par4, int par5, ItemStack icon) { + super(par1, par2, tags, par3, par4, par5, icon); + } - public EMTResearchItem(String par1, String par2, AspectList tags, int par3, int par4, int par5, ResourceLocation icon) { - super(par1, par2, tags, par3, par4, par5, icon); - } + public EMTResearchItem(String par1, String par2, AspectList tags, int par3, int par4, int par5, ResourceLocation icon) { + super(par1, par2, tags, par3, par4, par5, icon); + } - @Override - @SideOnly(Side.CLIENT) - public String getName() { - return StatCollector.translateToLocal(key); - } + @Override + @SideOnly(Side.CLIENT) + public String getName() { + return StatCollector.translateToLocal(key); + } - @Override - @SideOnly(Side.CLIENT) - public String getText() { - return StatCollector.translateToLocal("[EMT] ") + StatCollector.translateToLocal("emt.tag." + key); - } + @Override + @SideOnly(Side.CLIENT) + public String getText() { + return StatCollector.translateToLocal("[EMT] ") + StatCollector.translateToLocal("emt.tag." + key); + } - @Override - public ResearchItem setPages(ResearchPage... par) { - for (ResearchPage page : par) { - if (page.type == PageType.TEXT) - page.text = "emt.text." + key; + @Override + public ResearchItem setPages(ResearchPage... par) { + for (ResearchPage page : par) { + if (page.type == PageType.TEXT) + page.text = "emt.text." + key; - if (page.type == PageType.INFUSION_CRAFTING) { - if (parentsHidden == null || parentsHidden.length == 0) - parentsHidden = new String[] { "INFUSION" }; - else { - String[] newParents = new String[parentsHidden.length + 1]; - newParents[0] = "INFUSION"; - for (int i = 0; i < parentsHidden.length; i++) - newParents[i + 1] = parentsHidden[i]; - parentsHidden = newParents; - } - } - } + if (page.type == PageType.INFUSION_CRAFTING) { + if (parentsHidden == null || parentsHidden.length == 0) + parentsHidden = new String[]{"INFUSION"}; + else { + String[] newParents = new String[parentsHidden.length + 1]; + newParents[0] = "INFUSION"; + for (int i = 0; i < parentsHidden.length; i++) + newParents[i + 1] = parentsHidden[i]; + parentsHidden = newParents; + } + } + } - return super.setPages(par); - } + return super.setPages(par); + } } diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/ElectricMagicTools.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/ElectricMagicTools.java index d94ed44..51bb5f8 100644 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/ElectricMagicTools.java +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/ElectricMagicTools.java @@ -1,20 +1,17 @@ /******************************************************************************* * Copyright (c) 2014 Tombenpotter. * All rights reserved. - * + * * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * + * * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ package electricMagicTools.tombenpotter.electricmagictools.common; -import net.minecraft.item.ItemStack; -import net.minecraft.util.WeightedRandomChestContent; -import net.minecraftforge.common.ChestGenHooks; -import net.minecraftforge.common.MinecraftForge; +import cpw.mods.fml.common.FMLLog; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod.EventHandler; import cpw.mods.fml.common.Mod.Instance; @@ -28,81 +25,99 @@ import electricMagicTools.tombenpotter.electricmagictools.client.CapeEventHandle import electricMagicTools.tombenpotter.electricmagictools.common.recipes.EMTInitRecipes; import electricMagicTools.tombenpotter.electricmagictools.common.recipes.EMTPostInitRecipes; import electricMagicTools.tombenpotter.electricmagictools.common.recipes.UuMInfusionRecipes; +import net.minecraftforge.common.MinecraftForge; -@Mod(modid = ElectricMagicTools.modid, name = "Electro-MagicTools", version = "1.1.0", dependencies = "required-after:Thaumcraft ; required-after:IC2") +@Mod(modid = ElectricMagicTools.modid, name = "Electro-MagicTools", version = "1.1.1", dependencies = "required-after:Thaumcraft ; required-after:IC2") public class ElectricMagicTools { - @SidedProxy(clientSide = "electricMagicTools.tombenpotter.electricmagictools.client.ClientProxy", serverSide = "electricMagicTools.tombenpotter.electricmagictools.common.CommonProxy") - public static CommonProxy proxy; - @Instance(ElectricMagicTools.modid) - public static ElectricMagicTools instance; + @SidedProxy(clientSide = "electricMagicTools.tombenpotter.electricmagictools.client.ClientProxy", serverSide = "electricMagicTools.tombenpotter.electricmagictools.common.CommonProxy") + public static CommonProxy proxy; + @Instance(ElectricMagicTools.modid) + public static ElectricMagicTools instance; - public static final String modid = "Electro-MagicTools"; + public static final String modid = "Electro-MagicTools"; + public static final String texturePath = "electricmagictools"; - @EventHandler - public void preInit(FMLPreInitializationEvent event) { - /** Creating the config file **/ - Config.create(event); + @EventHandler + public void preInit(FMLPreInitializationEvent event) { + FMLLog.info("[EMT] Electro-Magic Tools : Starting planning the world domination"); - /** Items Registry **/ - ItemRegistry.registerEMTItems(); + /** Creating the config file **/ + FMLLog.info("[EMT] Electro-Magic Tools : Creating/Reading the config file"); + Config.create(event); - /** Blocks registry **/ - BlockRegistry.registerEMTBlocks(); + /** Items Registry **/ + FMLLog.info("[EMT] Electro-Magic Tools : Registering the mod items"); + ItemRegistry.registerEMTItems(); - System.out.println("[EMT] Electro-Magic Tools : Successful PreInit"); - } + /** Blocks registry **/ + FMLLog.info("[EMT] Electro-Magic Tools : Registering the mod blocks"); + BlockRegistry.registerEMTBlocks(); - @EventHandler - public void load(FMLInitializationEvent event) { - /** Loading the proxies **/ - proxy.load(); + FMLLog.info("[EMT] Electro-Magic Tools : Planning complete"); + } - /** Making mobs drop additional items **/ - MinecraftForge.EVENT_BUS.register(new EMTEventHandler()); + @EventHandler + public void load(FMLInitializationEvent event) { + FMLLog.info("[EMT] Electro-Magic Tools : Starting gathering allies"); - /** Tile entities registry **/ - TileEntityRegistry.registerEMTTileEntites(); + /** Loading the proxies **/ + FMLLog.info("[EMT] Electro-Magic Tools : Loading the proxies"); + proxy.load(); - /** Generating in dungeon chests **/ - if (Config.thorHammerResearch == false) { - ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST).addItem(new WeightedRandomChestContent(new ItemStack(ItemRegistry.taintedThorHammer), 1, 1, 5)); - } - if (Config.oneRingSpawn == false) { - ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST).addItem(new WeightedRandomChestContent(new ItemStack(ItemRegistry.emtBauble, 1, 2), 1, 1, 3)); - } + /** Making mobs drop additional items **/ + FMLLog.info("[EMT] Electro-Magic Tools : Making mobs drop additional items"); + MinecraftForge.EVENT_BUS.register(new EMTEventHandler()); - /** Adding the recipes that go in Init **/ - EMTInitRecipes.add(); + /** Tile entities registry **/ + FMLLog.info("[EMT] Electro-Magic Tools : Registering Tile entities"); + TileEntityRegistry.registerEMTTileEntites(); - /** Entities Registry **/ - EMTEntityRegistry.registerEMTEntities(); + /** Generating loot in dungeon chests **/ + FMLLog.info("[EMT] Electro-Magic Tools : Generating loot in dungeon chests"); + DungeonChestGenerator.generateLoot(); - /** GUI Handler Registry **/ - NetworkRegistry.INSTANCE.registerGuiHandler(this, proxy); + /** Adding the recipes that go in Init **/ + FMLLog.info("[EMT] Electro-Magic Tools : Adding the Init recipes"); + EMTInitRecipes.add(); - /** Adds Capes **/ - if (event.getSide() == Side.CLIENT && Config.capesOn == true) { - MinecraftForge.EVENT_BUS.register(new CapeEventHandler()); - } + /** Entities Registry **/ + FMLLog.info("[EMT] Electro-Magic Tools : Registering entities"); + EMTEntityRegistry.registerEMTEntities(); - System.out.println("[EMT] Electro-Magic Tools : Successful Init"); - } + /** GUI Handler Registry **/ + FMLLog.info("[EMT] Electro-Magic Tools : Registering the GUI Handler"); + NetworkRegistry.INSTANCE.registerGuiHandler(this, proxy); - @EventHandler - public void postInit(FMLPostInitializationEvent event) { - /** Adding the recipes that go in PostInit **/ - EMTPostInitRecipes.add(); + /** Adds Capes **/ + if (event.getSide() == Side.CLIENT && Config.capesOn == true) { + FMLLog.info("[EMT] Electro-Magic Tools : Adding capes"); + MinecraftForge.EVENT_BUS.register(new CapeEventHandler()); + } - /** Adding the UU-Matter Infusion recipes **/ - UuMInfusionRecipes.add(); + FMLLog.info("[EMT] Electro-Magic Tools : Allies gathered."); + } - /** Adding the EMT research tab to the Thaumonomicon **/ - ThaumonomiconResearch.addResearchTab(); + @EventHandler + public void postInit(FMLPostInitializationEvent event) { + FMLLog.info("[EMT] Electro-Magic Tools : Starting the world takeover"); - /** Adding the actual research to the game **/ - ThaumonomiconResearch.addResearch(); + /** Adding the recipes that go in PostInit **/ + FMLLog.info("[EMT] Electro-Magic Tools : Adding PostInit recipes"); + EMTPostInitRecipes.add(); - System.out.println("[EMT] Electro-Magic Tools : Successful PostInit"); - } + /** Adding the UU-Matter Infusion recipes **/ + FMLLog.info("[EMT] Electro-Magic Tools : Adding the UU-Matter Infusion recipes"); + UuMInfusionRecipes.add(); + + /** Adding the EMT research tab to the Thaumonomicon **/ + FMLLog.info("[EMT] Electro-Magic Tools : Adding the EMT research tab to the Thaumonomicon"); + ThaumonomiconResearch.addResearchTab(); + + /** Adding the actual research to the game **/ + FMLLog.info("[EMT] Electro-Magic Tools : Adding research to the game"); + ThaumonomiconResearch.addResearch(); + + FMLLog.info("[EMT] Electro-Magic Tools : World takeover complete. Enjoy!"); + } } diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/ItemRegistry.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/ItemRegistry.java index c4b3c4c..97b8658 100644 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/ItemRegistry.java +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/ItemRegistry.java @@ -1,139 +1,135 @@ /******************************************************************************* * Copyright (c) 2014 Tombenpotter. * All rights reserved. - * + * * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * + * * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ package electricMagicTools.tombenpotter.electricmagictools.common; -import net.minecraft.item.Item; import cpw.mods.fml.common.registry.GameRegistry; import electricMagicTools.tombenpotter.electricmagictools.common.items.ItemEMTBaubles; import electricMagicTools.tombenpotter.electricmagictools.common.items.ItemEMTItems; import electricMagicTools.tombenpotter.electricmagictools.common.items.ItemElectricScribingTools; -import electricMagicTools.tombenpotter.electricmagictools.common.items.ItemLightningSummoner; -import electricMagicTools.tombenpotter.electricmagictools.common.items.ItemThaumiumPlate; -import electricMagicTools.tombenpotter.electricmagictools.common.items.armor.ItemElectricBootsTraveller; -import electricMagicTools.tombenpotter.electricmagictools.common.items.armor.ItemElectricGoggles; -import electricMagicTools.tombenpotter.electricmagictools.common.items.armor.ItemNanoBootsTraveller; -import electricMagicTools.tombenpotter.electricmagictools.common.items.armor.ItemNanoThaumicHelmet; -import electricMagicTools.tombenpotter.electricmagictools.common.items.armor.ItemQuantumBootsTraveller; -import electricMagicTools.tombenpotter.electricmagictools.common.items.armor.ItemQuantumThaumicHelmet; -import electricMagicTools.tombenpotter.electricmagictools.common.items.armor.ItemSolarHelmetRevealing; -import electricMagicTools.tombenpotter.electricmagictools.common.items.foci.ItemChargeFocus; -import electricMagicTools.tombenpotter.electricmagictools.common.items.foci.ItemChristmasFocus; -import electricMagicTools.tombenpotter.electricmagictools.common.items.foci.ItemExplosionFocus; -import electricMagicTools.tombenpotter.electricmagictools.common.items.foci.ItemShieldFocus; -import electricMagicTools.tombenpotter.electricmagictools.common.items.foci.ItemWandChargingFocus; -import electricMagicTools.tombenpotter.electricmagictools.common.items.tools.ItemDiamondChainsaw; -import electricMagicTools.tombenpotter.electricmagictools.common.items.tools.ItemElectricHoeGrowth; -import electricMagicTools.tombenpotter.electricmagictools.common.items.tools.ItemOmnitoolDiamond; -import electricMagicTools.tombenpotter.electricmagictools.common.items.tools.ItemOmnitoolIron; -import electricMagicTools.tombenpotter.electricmagictools.common.items.tools.ItemOmnitoolThaumium; -import electricMagicTools.tombenpotter.electricmagictools.common.items.tools.ItemRockbreakerDrill; -import electricMagicTools.tombenpotter.electricmagictools.common.items.tools.ItemStreamChainsaw; -import electricMagicTools.tombenpotter.electricmagictools.common.items.tools.ItemThaumiumChainsaw; -import electricMagicTools.tombenpotter.electricmagictools.common.items.tools.ItemThaumiumDrill; +import electricMagicTools.tombenpotter.electricmagictools.common.items.armor.boots.ItemElectricBootsTraveller; +import electricMagicTools.tombenpotter.electricmagictools.common.items.armor.boots.ItemNanoBootsTraveller; +import electricMagicTools.tombenpotter.electricmagictools.common.items.armor.boots.ItemQuantumBootsTraveller; +import electricMagicTools.tombenpotter.electricmagictools.common.items.armor.goggles.ItemElectricGoggles; +import electricMagicTools.tombenpotter.electricmagictools.common.items.armor.goggles.ItemNanoThaumicHelmet; +import electricMagicTools.tombenpotter.electricmagictools.common.items.armor.goggles.ItemQuantumThaumicHelmet; +import electricMagicTools.tombenpotter.electricmagictools.common.items.armor.goggles.ItemSolarHelmetRevealing; +import electricMagicTools.tombenpotter.electricmagictools.common.items.armor.wings.ItemFeatherWing; +import electricMagicTools.tombenpotter.electricmagictools.common.items.armor.wings.ItemNanoWing; +import electricMagicTools.tombenpotter.electricmagictools.common.items.armor.wings.ItemQuantumWing; +import electricMagicTools.tombenpotter.electricmagictools.common.items.armor.wings.ItemThaumiumReinforcedWing; +import electricMagicTools.tombenpotter.electricmagictools.common.items.foci.*; +import electricMagicTools.tombenpotter.electricmagictools.common.items.tools.*; import electricMagicTools.tombenpotter.electricmagictools.common.items.tools.hammer.ItemElectricThorHammer; import electricMagicTools.tombenpotter.electricmagictools.common.items.tools.hammer.ItemTaintedThorHammer; import electricMagicTools.tombenpotter.electricmagictools.common.items.tools.hammer.ItemThorHammer; +import net.minecraft.item.Item; public class ItemRegistry { - public static Item thaumiumDrill; - public static Item thaumiumChainsaw; - public static Item quantumThaumicHelmet; - public static Item diamondChainsaw; - public static Item ironOmnitool; - public static Item diamondOmnitool; - public static Item thaumiumOmnitool; - public static Item nanoThaumicHelmet; - public static Item explosionFocus; - public static Item christmasFocus; - public static Item shieldFocus; - public static Item electricGoggles; - public static Item streamChainsaw; - public static Item rockbreakerDrill; - public static Item thaumiumPlate; - public static Item solarHelmetRevealing; - public static Item thorHammer; - public static Item taintedThorHammer; - public static Item electricThorHammer; - public static Item lightningSummoner; - public static Item electricBootsTraveller; - public static Item quantumBootsTraveller; - public static Item nanoBootsTraveller; - public static Item electricScribingTools; - public static Item itemEMTItems; - public static Item electricHoeGrowth; - public static Item chargeFocus; - public static Item emtBauble; - public static Item wandChargeFocus; + public static Item thaumiumDrill; + public static Item thaumiumChainsaw; + public static Item quantumThaumicHelmet; + public static Item diamondChainsaw; + public static Item ironOmnitool; + public static Item diamondOmnitool; + public static Item thaumiumOmnitool; + public static Item nanoThaumicHelmet; + public static Item explosionFocus; + public static Item christmasFocus; + public static Item shieldFocus; + public static Item electricGoggles; + public static Item streamChainsaw; + public static Item rockbreakerDrill; + public static Item solarHelmetRevealing; + public static Item thorHammer; + public static Item taintedThorHammer; + public static Item electricThorHammer; + public static Item electricBootsTraveller; + public static Item quantumBootsTraveller; + public static Item nanoBootsTraveller; + public static Item electricScribingTools; + public static Item itemEMTItems; + public static Item electricHoeGrowth; + public static Item chargeFocus; + public static Item emtBauble; + public static Item wandChargeFocus; + public static Item featherWing; + public static Item thaumiumWing; + public static Item nanoWing; + public static Item quantumWing; - public static void registerEMTItems() { - thaumiumDrill = new ItemThaumiumDrill().setUnlocalizedName("thaumiumdrill"); - thaumiumChainsaw = new ItemThaumiumChainsaw().setUnlocalizedName("thaumiumchainsaw"); - quantumThaumicHelmet = new ItemQuantumThaumicHelmet(3, 0).setUnlocalizedName("quantumthaumichelmet"); - diamondChainsaw = new ItemDiamondChainsaw().setUnlocalizedName("diamondchainsaw"); - ironOmnitool = new ItemOmnitoolIron().setUnlocalizedName("ironomnitool"); - diamondOmnitool = new ItemOmnitoolDiamond().setUnlocalizedName("diamondomnitool"); - thaumiumOmnitool = new ItemOmnitoolThaumium().setUnlocalizedName("thaumiumomnitool"); - nanoThaumicHelmet = new ItemNanoThaumicHelmet(3, 0).setUnlocalizedName("nanothaumichelmet"); - explosionFocus = new ItemExplosionFocus().setUnlocalizedName("laserfocus"); - christmasFocus = new ItemChristmasFocus().setUnlocalizedName("christmasfocus"); - shieldFocus = new ItemShieldFocus().setUnlocalizedName("shieldfocus"); - electricGoggles = new ItemElectricGoggles(3, 0).setUnlocalizedName("electricgoggles"); - streamChainsaw = new ItemStreamChainsaw().setUnlocalizedName("streamchainsaw"); - rockbreakerDrill = new ItemRockbreakerDrill().setUnlocalizedName("rockbreakerdrill"); - thaumiumPlate = new ItemThaumiumPlate().setUnlocalizedName("thaumiumplate"); - solarHelmetRevealing = new ItemSolarHelmetRevealing(3, 0).setUnlocalizedName("solarhelmetrevealing"); - thorHammer = new ItemThorHammer().setUnlocalizedName("hammerthor"); - taintedThorHammer = new ItemTaintedThorHammer().setUnlocalizedName("taintedthorhammer"); - lightningSummoner = new ItemLightningSummoner().setUnlocalizedName("lightningsummoner"); - electricThorHammer = new ItemElectricThorHammer().setUnlocalizedName("electricthorhammer"); - electricBootsTraveller = new ItemElectricBootsTraveller(3, 3).setUnlocalizedName("electricboots"); - nanoBootsTraveller = new ItemNanoBootsTraveller(3, 3).setUnlocalizedName("nanobootstraveller"); - quantumBootsTraveller = new ItemQuantumBootsTraveller(3, 3).setUnlocalizedName("quantumbootstraveller"); - electricScribingTools = new ItemElectricScribingTools().setUnlocalizedName("electricscribingtools"); - itemEMTItems = new ItemEMTItems().setUnlocalizedName("itememtitems"); - electricHoeGrowth = new ItemElectricHoeGrowth().setUnlocalizedName("electrichoeofgrowth"); - chargeFocus = new ItemChargeFocus().setUnlocalizedName("chargefocus"); - emtBauble = new ItemEMTBaubles().setUnlocalizedName("emtbauble"); - wandChargeFocus = new ItemWandChargingFocus().setUnlocalizedName("wandchargefocus"); + public static void registerEMTItems() { + thaumiumDrill = new ItemThaumiumDrill().setUnlocalizedName("thaumiumdrill"); + thaumiumChainsaw = new ItemThaumiumChainsaw().setUnlocalizedName("thaumiumchainsaw"); + quantumThaumicHelmet = new ItemQuantumThaumicHelmet(3, 0).setUnlocalizedName("quantumthaumichelmet"); + diamondChainsaw = new ItemDiamondChainsaw().setUnlocalizedName("diamondchainsaw"); + ironOmnitool = new ItemOmnitoolIron().setUnlocalizedName("ironomnitool"); + diamondOmnitool = new ItemOmnitoolDiamond().setUnlocalizedName("diamondomnitool"); + thaumiumOmnitool = new ItemOmnitoolThaumium().setUnlocalizedName("thaumiumomnitool"); + nanoThaumicHelmet = new ItemNanoThaumicHelmet(3, 0).setUnlocalizedName("nanothaumichelmet"); + explosionFocus = new ItemExplosionFocus().setUnlocalizedName("laserfocus"); + christmasFocus = new ItemChristmasFocus().setUnlocalizedName("christmasfocus"); + shieldFocus = new ItemShieldFocus().setUnlocalizedName("shieldfocus"); + electricGoggles = new ItemElectricGoggles(3, 0).setUnlocalizedName("electricgoggles"); + streamChainsaw = new ItemStreamChainsaw().setUnlocalizedName("streamchainsaw"); + rockbreakerDrill = new ItemRockbreakerDrill().setUnlocalizedName("rockbreakerdrill"); + solarHelmetRevealing = new ItemSolarHelmetRevealing(3, 0).setUnlocalizedName("solarhelmetrevealing"); + thorHammer = new ItemThorHammer().setUnlocalizedName("hammerthor"); + taintedThorHammer = new ItemTaintedThorHammer().setUnlocalizedName("taintedthorhammer"); + electricThorHammer = new ItemElectricThorHammer().setUnlocalizedName("electricthorhammer"); + electricBootsTraveller = new ItemElectricBootsTraveller(3, 3).setUnlocalizedName("electricboots"); + nanoBootsTraveller = new ItemNanoBootsTraveller(3, 3).setUnlocalizedName("nanobootstraveller"); + quantumBootsTraveller = new ItemQuantumBootsTraveller(3, 3).setUnlocalizedName("quantumbootstraveller"); + electricScribingTools = new ItemElectricScribingTools().setUnlocalizedName("electricscribingtools"); + itemEMTItems = new ItemEMTItems().setUnlocalizedName("itememtitems"); + electricHoeGrowth = new ItemElectricHoeGrowth().setUnlocalizedName("electrichoeofgrowth"); + chargeFocus = new ItemChargeFocus().setUnlocalizedName("chargefocus"); + emtBauble = new ItemEMTBaubles().setUnlocalizedName("emtbauble"); + wandChargeFocus = new ItemWandChargingFocus().setUnlocalizedName("wandchargefocus"); + featherWing = new ItemFeatherWing().setUnlocalizedName("featherwing"); + thaumiumWing = new ItemThaumiumReinforcedWing().setUnlocalizedName("thaumiumwing"); + nanoWing = new ItemNanoWing().setUnlocalizedName("nanowing"); + quantumWing = new ItemQuantumWing().setUnlocalizedName("quantumwing"); - GameRegistry.registerItem(thaumiumDrill, "Thaumium Drill"); - GameRegistry.registerItem(thaumiumChainsaw, "Thaumium Chainsaw"); - GameRegistry.registerItem(quantumThaumicHelmet, "Quantum Goggles of Revealing"); - GameRegistry.registerItem(diamondChainsaw, "Diamond Chainsaw"); - GameRegistry.registerItem(ironOmnitool, "Omnitool"); - GameRegistry.registerItem(diamondOmnitool, "Diamond Omnitool"); - GameRegistry.registerItem(thaumiumOmnitool, "Thaumium Omnitool"); - GameRegistry.registerItem(nanoThaumicHelmet, "Nanosuit Goggles of Revealing"); - GameRegistry.registerItem(explosionFocus, "Wand Focus: Explosion"); - GameRegistry.registerItem(christmasFocus, "Wand Focus : Kris-tmas"); - GameRegistry.registerItem(shieldFocus, "Wand Focus : Shield"); - GameRegistry.registerItem(electricGoggles, "Electric Goggles of Revealing"); - GameRegistry.registerItem(streamChainsaw, "Chainsaw of the Stream"); - GameRegistry.registerItem(rockbreakerDrill, "Drill of the Rockbreaker"); - GameRegistry.registerItem(thaumiumPlate, "Thaumium Plate"); - GameRegistry.registerItem(solarHelmetRevealing, "Quantum Solar Helmet of Revealing"); - GameRegistry.registerItem(thorHammer, "Mjolnir"); - GameRegistry.registerItem(taintedThorHammer, "Broken Relic of Mjolnir"); - GameRegistry.registerItem(lightningSummoner, "Lightning Summoner"); - GameRegistry.registerItem(electricThorHammer, "Supercharged Mjolnir"); - GameRegistry.registerItem(electricBootsTraveller, "Electric Boots of the Traveller"); - GameRegistry.registerItem(nanoBootsTraveller, "Nano Boots of the Traveller"); - GameRegistry.registerItem(quantumBootsTraveller, "Quantum Boots of the Traveller"); - GameRegistry.registerItem(electricScribingTools, "Electric Scribing Tools"); - GameRegistry.registerItem(electricHoeGrowth, "Electric Hoe of Growth"); - GameRegistry.registerItem(chargeFocus, "Wand Focus: Charging"); - GameRegistry.registerItem(itemEMTItems, "EMT Items"); - GameRegistry.registerItem(emtBauble, "EMT Baubles"); - GameRegistry.registerItem(wandChargeFocus, "Wand Focus: Wand Charging"); - } + GameRegistry.registerItem(thaumiumDrill, "Thaumium Drill"); + GameRegistry.registerItem(thaumiumChainsaw, "Thaumium Chainsaw"); + GameRegistry.registerItem(quantumThaumicHelmet, "Quantum Goggles of Revealing"); + GameRegistry.registerItem(diamondChainsaw, "Diamond Chainsaw"); + GameRegistry.registerItem(ironOmnitool, "Omnitool"); + GameRegistry.registerItem(diamondOmnitool, "Diamond Omnitool"); + GameRegistry.registerItem(thaumiumOmnitool, "Thaumium Omnitool"); + GameRegistry.registerItem(nanoThaumicHelmet, "Nanosuit Goggles of Revealing"); + GameRegistry.registerItem(explosionFocus, "Wand Focus: Explosion"); + GameRegistry.registerItem(christmasFocus, "Wand Focus : Kris-tmas"); + GameRegistry.registerItem(shieldFocus, "Wand Focus : Shield"); + GameRegistry.registerItem(electricGoggles, "Electric Goggles of Revealing"); + GameRegistry.registerItem(streamChainsaw, "Chainsaw of the Stream"); + GameRegistry.registerItem(rockbreakerDrill, "Drill of the Rockbreaker"); + GameRegistry.registerItem(solarHelmetRevealing, "Quantum Solar Helmet of Revealing"); + GameRegistry.registerItem(thorHammer, "Mjolnir"); + GameRegistry.registerItem(taintedThorHammer, "Broken Relic of Mjolnir"); + GameRegistry.registerItem(electricThorHammer, "Supercharged Mjolnir"); + GameRegistry.registerItem(electricBootsTraveller, "Electric Boots of the Traveller"); + GameRegistry.registerItem(nanoBootsTraveller, "Nano Boots of the Traveller"); + GameRegistry.registerItem(quantumBootsTraveller, "Quantum Boots of the Traveller"); + GameRegistry.registerItem(electricScribingTools, "Electric Scribing Tools"); + GameRegistry.registerItem(electricHoeGrowth, "Electric Hoe of Growth"); + GameRegistry.registerItem(chargeFocus, "Wand Focus: Charging"); + GameRegistry.registerItem(itemEMTItems, "EMT Items"); + GameRegistry.registerItem(emtBauble, "EMT Baubles"); + GameRegistry.registerItem(wandChargeFocus, "Wand Focus: Wand Charging"); + GameRegistry.registerItem(featherWing, "Feather Wing"); + GameRegistry.registerItem(thaumiumWing, "Thaumium Reinforced Wing"); + GameRegistry.registerItem(nanoWing, "Nanosuit Wing"); + GameRegistry.registerItem(quantumWing, "Quantum Wing"); + } } diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/State of things.txt b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/State of things.txt deleted file mode 100644 index 440c5a2..0000000 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/State of things.txt +++ /dev/null @@ -1,12 +0,0 @@ -This .txt file is here so that I don't randomly forget to add stuff where it is needed. -Consider this as a TODO list. - - -Items---------------------------------------------------------------------------------------------------- -Iridium Wand cap-- 15% discount for everything -Rubberwood wand core-- Dunno yet - -Blocks--------------------------------------------------------------------------------------------------- -Electric deconstruction table-- A block that will decompose aspects faster, and be able to store more than one. -Unwanted Node Generator-- An advanced version of the generators that basically acts as a "trash can" for unwanted nodes? It accepts a node in a jar and consumes it, adding the power stored (based on aspects) to an internal battery? -Magical Windmillz diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/ThaumonomiconResearch.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/ThaumonomiconResearch.java index 0bde5d5..e76b6b8 100644 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/ThaumonomiconResearch.java +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/ThaumonomiconResearch.java @@ -1,16 +1,20 @@ /******************************************************************************* * Copyright (c) 2014 Tombenpotter. * All rights reserved. - * + * * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * + * * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ package electricMagicTools.tombenpotter.electricmagictools.common; +import electricMagicTools.tombenpotter.electricmagictools.common.lib.ResearchAspects; +import electricMagicTools.tombenpotter.electricmagictools.common.recipes.EMTInitRecipes; +import electricMagicTools.tombenpotter.electricmagictools.common.recipes.EMTPostInitRecipes; +import electricMagicTools.tombenpotter.electricmagictools.common.recipes.UuMInfusionRecipes; import ic2.api.item.IC2Items; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; @@ -18,351 +22,369 @@ import thaumcraft.api.aspects.AspectList; import thaumcraft.api.research.ResearchCategories; import thaumcraft.api.research.ResearchItem; import thaumcraft.api.research.ResearchPage; -import electricMagicTools.tombenpotter.electricmagictools.common.lib.ResearchAspects; -import electricMagicTools.tombenpotter.electricmagictools.common.recipes.EMTInitRecipes; -import electricMagicTools.tombenpotter.electricmagictools.common.recipes.EMTPostInitRecipes; -import electricMagicTools.tombenpotter.electricmagictools.common.recipes.UuMInfusionRecipes; public class ThaumonomiconResearch { - public static void addResearchTab() { - ResourceLocation background = new ResourceLocation("thaumcraft", "textures/gui/gui_researchback.png"); - ResearchCategories.registerCategory("EMT", new ResourceLocation("electricmagictools:textures/misc/emt.png"), background); - } + public static void addResearchTab() { + ResourceLocation background = new ResourceLocation("thaumcraft", "textures/gui/gui_researchback.png"); + ResearchCategories.registerCategory("EMT", new ResourceLocation("electricmagictools:textures/misc/emt.png"), background); + } - public static void addResearch() { - ResearchItem research; - String text; - // String text2; + public static void addResearch() { + ResearchItem research; + String text; + // String text2; - /** Research that can't be disabled **/ - text = "1"; - research = new EMTResearchItem("Electric Magic Tools", "EMT", new AspectList(), 0, 0, 0, new ResourceLocation("electricmagictools:textures/misc/emt.png")).setRound().setAutoUnlock().registerResearchItem(); - research.setPages(new ResearchPage(text)); + /** Research that can't be disabled **/ + text = "1"; + research = new EMTResearchItem("Electric Magic Tools", "EMT", new AspectList(), 0, 0, 0, new ResourceLocation("electricmagictools:textures/misc/emt.png")).setRound().setAutoUnlock().registerResearchItem(); + research.setPages(new ResearchPage(text)); - text = "1"; - research = new EMTResearchItem("Diamond Chainsaw", "EMT", new AspectList(), 5, -6, 0, new ItemStack(ItemRegistry.diamondChainsaw)).setRound().setAutoUnlock().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTInitRecipes.diamondChainsaw)); + text = "1"; + research = new EMTResearchItem("Diamond Chainsaw", "EMT", new AspectList(), 5, -6, 0, new ItemStack(ItemRegistry.diamondChainsaw)).setRound().setAutoUnlock().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(EMTInitRecipes.diamondChainsaw)); - text = "1"; - research = new EMTResearchItem("Thaumium Plate", "EMT", new AspectList(), 6, -6, 0, new ItemStack(ItemRegistry.thaumiumPlate)).setRound().setAutoUnlock().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.thaumiumPlate)); + text = "1"; + research = new EMTResearchItem("Thaumium Plate", "EMT", new AspectList(), 6, -6, 0, new ItemStack(ItemRegistry.itemEMTItems, 1, 5)).setRound().setAutoUnlock().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.thaumiumPlate)); - text = "1"; - research = new EMTResearchItem("Macerating Native Ore Clusters", "EMT", new AspectList(), 5, -7, 0, IC2Items.getItem("smallGoldDust")).setRound().setAutoUnlock().registerResearchItem(); - research.setPages(new ResearchPage(text)); + text = "1"; + research = new EMTResearchItem("Macerating Native Ore Clusters", "EMT", new AspectList(), 5, -7, 0, IC2Items.getItem("smallGoldDust")).setRound().setAutoUnlock().registerResearchItem(); + research.setPages(new ResearchPage(text)); - text = "1"; - research = new EMTResearchItem("The Legend", "EMT", new AspectList(), 5, -5, 0, new ItemStack(ItemRegistry.taintedThorHammer)).setRound().setAutoUnlock().registerResearchItem(); - research.setPages(new ResearchPage(text)); + text = "1"; + research = new EMTResearchItem("The Legend", "EMT", new AspectList(), 5, -5, 0, new ItemStack(ItemRegistry.taintedThorHammer)).setRound().setAutoUnlock().registerResearchItem(); + research.setPages(new ResearchPage(text)); - text = "1"; - research = new EMTResearchItem("Lightning Summoner", "EMT", new AspectList(), 6, -5, 0, new ItemStack(ItemRegistry.lightningSummoner)).setRound().setAutoUnlock().registerResearchItem(); - research.setPages(new ResearchPage(text)); + text = "1"; + research = new EMTResearchItem("Lightning Summoner", "EMT", new AspectList(), 6, -5, 0, new ItemStack(ItemRegistry.itemEMTItems, 1, 6)).setRound().setAutoUnlock().registerResearchItem(); + research.setPages(new ResearchPage(text)); - text = "1"; - research = new EMTResearchItem("The One Ring", "EMT", new AspectList(), 6, -7, 0, new ItemStack(ItemRegistry.emtBauble, 1, 2)).setRound().setAutoUnlock().registerResearchItem(); - research.setPages(new ResearchPage(text)); + text = "1"; + research = new EMTResearchItem("The One Ring", "EMT", new AspectList(), 6, -7, 0, new ItemStack(ItemRegistry.emtBauble, 1, 2)).setRound().setAutoUnlock().registerResearchItem(); + research.setPages(new ResearchPage(text)); - /** Research that can be disabled **/ - if (Config.thaumiumDrillResearch == false) { - text = "1"; - research = new EMTResearchItem("Thaumium Drill", "EMT", ResearchAspects.thaumiumDrillResearch, -1, -2, 1, new ItemStack(ItemRegistry.thaumiumDrill)).setSecondary().setParents("Electric Magic Tools").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.thaumiumDrill)); - } + text = "1"; + research = new EMTResearchItem("Feather Wings", "EMT", new AspectList(), 0, 2, 0, new ItemStack(ItemRegistry.featherWing)).setRound().setAutoUnlock().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(EMTInitRecipes.rubberBall), new ResearchPage(EMTInitRecipes.ductTape), new ResearchPage(EMTInitRecipes.featherMesh), new ResearchPage(EMTInitRecipes.cardboard), new ResearchPage(EMTInitRecipes.featherWing), new ResearchPage(EMTInitRecipes.featherWings)); - if (Config.thaumiumChainsawResearch == false) { - text = "1"; - research = new EMTResearchItem("Thaumium Chainsaw", "EMT", ResearchAspects.thaumiumChainsawResearch, -2, -2, 1, new ItemStack(ItemRegistry.thaumiumChainsaw)).setSecondary().setParents("Electric Magic Tools").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.thaumiumChainsaw)); - } + /** Research that can be disabled **/ + if (Config.thaumiumDrillResearch == false) { + text = "1"; + research = new EMTResearchItem("Thaumium Drill", "EMT", ResearchAspects.thaumiumDrillResearch, -1, -2, 1, new ItemStack(ItemRegistry.thaumiumDrill)).setSecondary().setParents("Electric Magic Tools").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.thaumiumDrill)); + } - if (Config.electricGooglesResearch == false) { - text = "1"; - research = new EMTResearchItem("Electric Goggles", "EMT", ResearchAspects.electricGogglesResearch, 1, -2, 1, new ItemStack(ItemRegistry.electricGoggles)).setSecondary().setParents("Electric Magic Tools").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.electricGoggles)); - } + if (Config.thaumiumChainsawResearch == false) { + text = "1"; + research = new EMTResearchItem("Thaumium Chainsaw", "EMT", ResearchAspects.thaumiumChainsawResearch, -2, -2, 1, new ItemStack(ItemRegistry.thaumiumChainsaw)).setSecondary().setParents("Electric Magic Tools").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.thaumiumChainsaw)); + } - if (Config.electricGooglesResearch == false) { - if (Config.nanoGooglesResearch == false) { - text = "1"; - research = new EMTResearchItem("Nanosuit Goggles of Revealing", "EMT", ResearchAspects.thaumicNanoHelmet, 2, -2, 2, new ItemStack(ItemRegistry.nanoThaumicHelmet)).setParents("Electric Goggles").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.thaumicNanoHelmet)); - } - } + if (Config.electricGooglesResearch == false) { + text = "1"; + research = new EMTResearchItem("Electric Goggles", "EMT", ResearchAspects.electricGogglesResearch, 1, -2, 1, new ItemStack(ItemRegistry.electricGoggles)).setSecondary().setParents("Electric Magic Tools").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.electricGoggles)); + } - if (Config.electricGooglesResearch == false) { - if (Config.nanoGooglesResearch == false) { - if (Config.quantumGooglesResearch == false) { - text = "1"; - research = new EMTResearchItem("Quantum Goggles of Revealing", "EMT", ResearchAspects.thaumicQuantumHelmet, 3, -2, 3, new ItemStack(ItemRegistry.quantumThaumicHelmet)).setParents("Nanosuit Goggles of Revealing").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.thaumicQuantumHelmet)); - } - } - } + if (Config.electricGooglesResearch == false) { + if (Config.nanoGooglesResearch == false) { + text = "1"; + research = new EMTResearchItem("Nanosuit Goggles of Revealing", "EMT", ResearchAspects.thaumicNanoHelmet, 2, -2, 2, new ItemStack(ItemRegistry.nanoThaumicHelmet)).setParents("Electric Goggles").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.thaumicNanoHelmet)); + } + } - if (Config.ironOmnitoolResearch == false) { - text = "1"; - research = new EMTResearchItem("Iron Omnitool", "EMT", new AspectList(), -2, 0, 0, new ItemStack(ItemRegistry.ironOmnitool)).setParents("Electric Magic Tools").setRound().setAutoUnlock().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTInitRecipes.ironOmnitool)); - } + if (Config.electricGooglesResearch == false) { + if (Config.nanoGooglesResearch == false) { + if (Config.quantumGooglesResearch == false) { + text = "1"; + research = new EMTResearchItem("Quantum Goggles of Revealing", "EMT", ResearchAspects.thaumicQuantumHelmet, 3, -2, 3, new ItemStack(ItemRegistry.quantumThaumicHelmet)).setParents("Nanosuit Goggles of Revealing").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.thaumicQuantumHelmet)); + } + } + } - if (Config.ironOmnitoolResearch == false) { - if (Config.diamondOmnitoolResearch == false) { - text = "1"; - research = new EMTResearchItem("Diamond Omnitool", "EMT", ResearchAspects.diamondOmnitoolResearch, -4, 0, 1, new ItemStack(ItemRegistry.diamondOmnitool)).setSecondary().setParents("Electric Magic Tools").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.diamondOmnitool), new ResearchPage(EMTPostInitRecipes.ironOmnitoolToDiamond)); - } - } + if (Config.ironOmnitoolResearch == false) { + text = "1"; + research = new EMTResearchItem("Iron Omnitool", "EMT", new AspectList(), -2, 0, 0, new ItemStack(ItemRegistry.ironOmnitool)).setParents("Electric Magic Tools").setRound().setAutoUnlock().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(EMTInitRecipes.ironOmnitool)); + } - if (Config.thaumiumDrillResearch == false && Config.thaumiumChainsawResearch == false) { - if (Config.thaumiumOmnitoolResearch == false) { - text = "1"; - research = new EMTResearchItem("Thaumium Omnitool", "EMT", ResearchAspects.thaumiumOmnitoolResearch, -6, 0, 2, new ItemStack(ItemRegistry.thaumiumOmnitool)).setParentsHidden("Thaumium Drill", "Thaumium Chainsaw").setParents("Diamond Omnitool").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.thaumiumOmnitool), new ResearchPage(EMTPostInitRecipes.diamondOmnitoolToThaumium)); - } - } + if (Config.ironOmnitoolResearch == false) { + if (Config.diamondOmnitoolResearch == false) { + text = "1"; + research = new EMTResearchItem("Diamond Omnitool", "EMT", ResearchAspects.diamondOmnitoolResearch, -4, 0, 1, new ItemStack(ItemRegistry.diamondOmnitool)).setSecondary().setParents("Electric Magic Tools").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.diamondOmnitool), new ResearchPage(EMTPostInitRecipes.ironOmnitoolToDiamond)); + } + } - if (Config.explosionFocusResearch == false) { - text = "1"; - research = new EMTResearchItem("Explosion Focus", "EMT", ResearchAspects.laserFocusResearch, 2, 3, 2, new ItemStack(ItemRegistry.explosionFocus)).setParents("Electric Magic Tools").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.explosionFocus)); - } + if (Config.thaumiumDrillResearch == false && Config.thaumiumChainsawResearch == false) { + if (Config.thaumiumOmnitoolResearch == false) { + text = "1"; + research = new EMTResearchItem("Thaumium Omnitool", "EMT", ResearchAspects.thaumiumOmnitoolResearch, -6, 0, 2, new ItemStack(ItemRegistry.thaumiumOmnitool)).setParentsHidden("Thaumium Drill", "Thaumium Chainsaw").setParents("Diamond Omnitool").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.thaumiumOmnitool), new ResearchPage(EMTPostInitRecipes.diamondOmnitoolToThaumium)); + } + } - if (Config.christmasFocusResearch == false) { - text = "1"; - research = new EMTResearchItem("Kris-tmas Focus", "EMT", ResearchAspects.christmasFocusResearch, 3, 3, 1, new ItemStack(ItemRegistry.christmasFocus)).setSecondary().setParents("Electric Magic Tools").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.christmasFocus)); - } + if (Config.explosionFocusResearch == false) { + text = "1"; + research = new EMTResearchItem("Explosion Focus", "EMT", ResearchAspects.laserFocusResearch, 2, 3, 2, new ItemStack(ItemRegistry.explosionFocus)).setParents("Electric Magic Tools").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.explosionFocus)); + } - if (Config.shieldFocusResearch == false) { - text = "1"; - research = new EMTResearchItem("Shield Focus", "EMT", ResearchAspects.shieldFocusResearch, 4, 3, 2, new ItemStack(ItemRegistry.shieldFocus)).setParents("Electric Magic Tools").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.shieldFocus)); - } + if (Config.christmasFocusResearch == false) { + text = "1"; + research = new EMTResearchItem("Kris-tmas Focus", "EMT", ResearchAspects.christmasFocusResearch, 3, 3, 1, new ItemStack(ItemRegistry.christmasFocus)).setSecondary().setParents("Electric Magic Tools").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.christmasFocus)); + } - if (Config.shieldFocusResearch == false) { - if (Config.shieldBlockResearch == false) { - text = "1"; - research = new EMTResearchItem("Shield Block", "EMT", ResearchAspects.shieldBlockResearch, 4, 5, 1, new ItemStack(BlockRegistry.shield)).setSecondary().setParents("Shield Focus").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.shieldBlock)); - } - } + if (Config.shieldFocusResearch == false) { + text = "1"; + research = new EMTResearchItem("Shield Focus", "EMT", ResearchAspects.shieldFocusResearch, 4, 3, 2, new ItemStack(ItemRegistry.shieldFocus)).setParents("Electric Magic Tools").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.shieldFocus)); + } - if (Config.potentiaGeneratorResearch == false) { - text = "1"; - research = new EMTResearchItem("Potentia Generator", "EMT", ResearchAspects.potentiaGeneratorResearch, -2, 3, 3, new ItemStack(BlockRegistry.essentiaGens, 1, 0)).setParents("Electric Magic Tools").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.potentiaGenerator)); - } + if (Config.shieldFocusResearch == false) { + if (Config.shieldBlockResearch == false) { + text = "1"; + research = new EMTResearchItem("Shield Block", "EMT", ResearchAspects.shieldBlockResearch, 4, 5, 1, new ItemStack(BlockRegistry.shield)).setSecondary().setParents("Shield Focus").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.shieldBlock)); + } + } - if (Config.potentiaGeneratorResearch == false) { - if (Config.ignisGeneratorResearch == false) { - text = "1"; - research = new EMTResearchItem("Ignis Generator", "EMT", ResearchAspects.ignisGeneratorResearch, -3, 4, 1, new ItemStack(BlockRegistry.essentiaGens, 1, 1)).setSecondary().setParents("Potentia Generator").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.ignisGenerator)); - } - } + if (Config.potentiaGeneratorResearch == false) { + text = "1"; + research = new EMTResearchItem("Potentia Generator", "EMT", ResearchAspects.potentiaGeneratorResearch, -2, 3, 3, new ItemStack(BlockRegistry.essentiaGens, 1, 0)).setParents("Electric Magic Tools").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.potentiaGenerator)); + } - if (Config.potentiaGeneratorResearch == false) { - if (Config.auramGeneratorResearch == false) { - text = "1"; - research = new EMTResearchItem("Auram Generator", "EMT", ResearchAspects.auramGeneratorResearch, -1, 4, 1, new ItemStack(BlockRegistry.essentiaGens, 1, 2)).setSecondary().setParents("Potentia Generator").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.auramGenerator)); - } - } + if (Config.potentiaGeneratorResearch == false) { + if (Config.ignisGeneratorResearch == false) { + text = "1"; + research = new EMTResearchItem("Ignis Generator", "EMT", ResearchAspects.ignisGeneratorResearch, -3, 4, 1, new ItemStack(BlockRegistry.essentiaGens, 1, 1)).setSecondary().setParents("Potentia Generator").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.ignisGenerator)); + } + } - if (Config.potentiaGeneratorResearch == false) { - if (Config.arborGeneratorResearch == false) { - text = "1"; - research = new EMTResearchItem("Arbor Generator", "EMT", ResearchAspects.arborGeneratorResearch, -2, 5, 1, new ItemStack(BlockRegistry.essentiaGens, 1, 3)).setSecondary().setParents("Potentia Generator").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.arborGenerator)); - } - } + if (Config.potentiaGeneratorResearch == false) { + if (Config.auramGeneratorResearch == false) { + text = "1"; + research = new EMTResearchItem("Auram Generator", "EMT", ResearchAspects.auramGeneratorResearch, -1, 4, 1, new ItemStack(BlockRegistry.essentiaGens, 1, 2)).setSecondary().setParents("Potentia Generator").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.auramGenerator)); + } + } - // if(Config.potentiaGeneratorResearch == false) { - // if(Config.wandChargingSationResearch = false) { - text = "1"; - research = new EMTResearchItem("Industrial Wand Charging Station", "EMT", ResearchAspects.wandCharger, -4, 2, 3, new ItemStack(BlockRegistry.emtMachines, 1, 0)).setParents("Potentia Generator").registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.wandRecharger)); - // } - // } + if (Config.potentiaGeneratorResearch == false) { + if (Config.arborGeneratorResearch == false) { + text = "1"; + research = new EMTResearchItem("Arbor Generator", "EMT", ResearchAspects.arborGeneratorResearch, -2, 5, 1, new ItemStack(BlockRegistry.essentiaGens, 1, 3)).setSecondary().setParents("Potentia Generator").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.arborGenerator)); + } + } - if (Config.thaumiumChainsawResearch == false) { - if (Config.streamChainsawResearch == false) { - text = "1"; - research = new EMTResearchItem("Chainsaw of the Stream", "EMT", ResearchAspects.streamChainsawResearch, -3, -4, 3, new ItemStack(ItemRegistry.streamChainsaw)).setParents("Thaumium Chainsaw").registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.streamChainsaw)); - } - } + // if(Config.potentiaGeneratorResearch == false) { + // if(Config.wandChargingSationResearch = false) { + text = "1"; + research = new EMTResearchItem("Industrial Wand Charging Station", "EMT", ResearchAspects.wandCharger, -4, 2, 3, new ItemStack(BlockRegistry.emtMachines, 1, 0)).setParents("Potentia Generator").registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.wandRecharger)); + // } + // } - if (Config.thaumiumDrillResearch == false) { - if (Config.rockbreakerDrillResearch == false) { - text = "1"; - research = new EMTResearchItem("Drill of the Rockbreaker", "EMT", ResearchAspects.rockbreakerDrillResearch, 0, -4, 3, new ItemStack(ItemRegistry.rockbreakerDrill)).setParents("Thaumium Drill").registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.rockbreakerDrill)); - } - } + if (Config.thaumiumChainsawResearch == false) { + if (Config.streamChainsawResearch == false) { + text = "1"; + research = new EMTResearchItem("Chainsaw of the Stream", "EMT", ResearchAspects.streamChainsawResearch, -3, -4, 3, new ItemStack(ItemRegistry.streamChainsaw)).setParents("Thaumium Chainsaw").registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.streamChainsaw)); + } + } - if (Config.tinyUraniumResearch == false) { - text = "1"; - research = new EMTResearchItem("Tiny Uranium", "EMT", ResearchAspects.tinyUraniumResearch, -5, -5, 1, IC2Items.getItem("Uran238")).setSecondary().setParentsHidden("Electric Magic Tools").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.tinyUranium)); - } + if (Config.thaumiumDrillResearch == false) { + if (Config.rockbreakerDrillResearch == false) { + text = "1"; + research = new EMTResearchItem("Drill of the Rockbreaker", "EMT", ResearchAspects.rockbreakerDrillResearch, 0, -4, 3, new ItemStack(ItemRegistry.rockbreakerDrill)).setParents("Thaumium Drill").registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.rockbreakerDrill)); + } + } - if (Config.thorHammerResearch == false) { - text = "1"; - research = new EMTResearchItem("Mjolnir", "EMT", ResearchAspects.thorHammerResearch, -5, 5, 3, new ItemStack(ItemRegistry.thorHammer)).setParentsHidden("Electric Magic Tools").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.thorHammer)); - } + if (Config.tinyUraniumResearch == false) { + text = "1"; + research = new EMTResearchItem("Tiny Uranium", "EMT", ResearchAspects.tinyUraniumResearch, -5, -5, 1, IC2Items.getItem("Uran238")).setSecondary().setParentsHidden("Electric Magic Tools").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.tinyUranium)); + } - if (Config.thorHammerResearch == false) { - if (Config.superchargedThorHammerResearch == false) { - text = "1"; - research = new EMTResearchItem("Supercharged Mjolnir", "EMT", ResearchAspects.superchargedThorHammerResearch, -6, 6, 3, new ItemStack(ItemRegistry.electricThorHammer)).setParents("Mjolnir").registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.superchargedThorHammer)); - } - } + if (Config.thorHammerResearch == false) { + text = "1"; + research = new EMTResearchItem("Mjolnir", "EMT", ResearchAspects.thorHammerResearch, -5, 5, 3, new ItemStack(ItemRegistry.thorHammer)).setParentsHidden("Electric Magic Tools").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.thorHammer)); + } - if (Config.compressedSolarsResearch == false) { - text = "1"; - research = new EMTResearchItem("Compressed Solars", "EMT", ResearchAspects.compressedSolars, -4, -5, 2, new ItemStack(BlockRegistry.emtSolars)).setParentsHidden("Potentia Generator").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.compressedSolar), new ResearchPage(EMTPostInitRecipes.doubleCompressedSolar), new ResearchPage(EMTPostInitRecipes.tripleCompressedSolar)); - } + if (Config.thorHammerResearch == false) { + if (Config.superchargedThorHammerResearch == false) { + text = "1"; + research = new EMTResearchItem("Supercharged Mjolnir", "EMT", ResearchAspects.superchargedThorHammerResearch, -6, 6, 3, new ItemStack(ItemRegistry.electricThorHammer)).setParents("Mjolnir").registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.superchargedThorHammer)); + } + } - if (Config.compressedSolarsResearch == false) { - if (Config.solarHelmetResearch == false) { - text = "1"; - research = new EMTResearchItem("Solar Helmet of Revealing", "EMT", ResearchAspects.solarHelmetRevealing, -2, -5, 1, new ItemStack(ItemRegistry.solarHelmetRevealing)).setSecondary().setParents("Compressed Solars").setParentsHidden("Quantum Goggles of Revealing").registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.solarHelmetRevealing)); - } - } + if (Config.compressedSolarsResearch == false) { + text = "1"; + research = new EMTResearchItem("Compressed Solars", "EMT", ResearchAspects.compressedSolars, -4, -5, 2, new ItemStack(BlockRegistry.emtSolars)).setParentsHidden("Potentia Generator").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.compressedSolar), new ResearchPage(EMTPostInitRecipes.doubleCompressedSolar), new ResearchPage(EMTPostInitRecipes.tripleCompressedSolar)); + } - if (Config.electricBootsResearch == false) { - text = "1"; - research = new EMTResearchItem("Electric Boots of the Traveller", "EMT", ResearchAspects.electricBootsTravel, 2, 0, 1, new ItemStack(ItemRegistry.electricBootsTraveller)).setSecondary().setParents("Electric Magic Tools").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.electricBootsTravel)); - } + if (Config.compressedSolarsResearch == false) { + if (Config.solarHelmetResearch == false) { + text = "1"; + research = new EMTResearchItem("Solar Helmet of Revealing", "EMT", ResearchAspects.solarHelmetRevealing, -2, -5, 1, new ItemStack(ItemRegistry.solarHelmetRevealing)).setSecondary().setParents("Compressed Solars").setParentsHidden("Quantum Goggles of Revealing").registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.solarHelmetRevealing)); + } + } - if (Config.electricBootsResearch == false) { - if (Config.nanoBootsResearch == false) { - text = "1"; - research = new EMTResearchItem("Nano Boots of the Traveller", "EMT", ResearchAspects.nanoBootsTravel, 4, 0, 2, new ItemStack(ItemRegistry.nanoBootsTraveller)).setParents("Electric Boots of the Traveller").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.nanoBootsTravel)); - } - } + if (Config.electricBootsResearch == false) { + text = "1"; + research = new EMTResearchItem("Electric Boots of the Traveller", "EMT", ResearchAspects.electricBootsTravel, 2, 0, 1, new ItemStack(ItemRegistry.electricBootsTraveller)).setSecondary().setParents("Electric Magic Tools").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.electricBootsTravel)); + } - if (Config.electricBootsResearch == false) { - if (Config.nanoBootsResearch == false) { - if (Config.quantumBootsResearch == false) { - text = "1"; - research = new EMTResearchItem("Quantum Boots of the Traveller", "EMT", ResearchAspects.quantumBootsTravel, 6, 0, 3, new ItemStack(ItemRegistry.quantumBootsTraveller)).setParents("Nano Boots of the Traveller").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.quantumBootsTravel)); - } - } - } + if (Config.electricBootsResearch == false) { + if (Config.nanoBootsResearch == false) { + text = "1"; + research = new EMTResearchItem("Nano Boots of the Traveller", "EMT", ResearchAspects.nanoBootsTravel, 4, 0, 2, new ItemStack(ItemRegistry.nanoBootsTraveller)).setParents("Electric Boots of the Traveller").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.nanoBootsTravel)); + } + } - if (Config.electricScribingToolsResearch == false) { - text = "1"; - research = new EMTResearchItem("Electric Scribing Tools", "EMT", ResearchAspects.electricScribingTools, -6, -5, 1, new ItemStack(ItemRegistry.electricScribingTools)).setSecondary().setParentsHidden("Electric Magic Tools").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.electricScribingTools)); - } + if (Config.electricBootsResearch == false) { + if (Config.nanoBootsResearch == false) { + if (Config.quantumBootsResearch == false) { + text = "1"; + research = new EMTResearchItem("Quantum Boots of the Traveller", "EMT", ResearchAspects.quantumBootsTravel, 6, 0, 3, new ItemStack(ItemRegistry.quantumBootsTraveller)).setParents("Nano Boots of the Traveller").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.quantumBootsTravel)); + } + } + } - if (Config.etherealProcessorResearch == false) { - text = "1"; - research = new EMTResearchItem("Etheral Processor", "EMT", ResearchAspects.etherealProcessor, -1, 2, 2, new ItemStack(BlockRegistry.emtMachines, 1, 1)).setParents("Electric Magic Tools").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.etheralProcessor)); - } + if (Config.electricScribingToolsResearch == false) { + text = "1"; + research = new EMTResearchItem("Electric Scribing Tools", "EMT", ResearchAspects.electricScribingTools, -6, -5, 1, new ItemStack(ItemRegistry.electricScribingTools)).setSecondary().setParentsHidden("Electric Magic Tools").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.electricScribingTools)); + } - if (Config.compressedSolarsResearch == false) { - if (Config.waterSolarsResearch == false) { - text = "1"; - research = new EMTResearchItem("Water Infused Solar Panels", "EMT", ResearchAspects.waterSolars, -7, -7, 1, new ItemStack(BlockRegistry.emtSolars, 1, 3)).setSecondary().setParents("Compressed Solars").registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.waterSolar), new ResearchPage(EMTPostInitRecipes.doubleWaterSolar), new ResearchPage(EMTPostInitRecipes.tripleWaterSolar)); + if (Config.etherealProcessorResearch == false) { + text = "1"; + research = new EMTResearchItem("Etheral Processor", "EMT", ResearchAspects.etherealProcessor, -1, 2, 2, new ItemStack(BlockRegistry.emtMachines, 1, 1)).setParents("Electric Magic Tools").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.etheralProcessor)); + } - } - } + if (Config.compressedSolarsResearch == false) { + if (Config.waterSolarsResearch == false) { + text = "1"; + research = new EMTResearchItem("Water Infused Solar Panels", "EMT", ResearchAspects.waterSolars, -7, -7, 1, new ItemStack(BlockRegistry.emtSolars, 1, 3)).setSecondary().setParents("Compressed Solars").registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.waterSolar), new ResearchPage(EMTPostInitRecipes.doubleWaterSolar), new ResearchPage(EMTPostInitRecipes.tripleWaterSolar)); - if (Config.compressedSolarsResearch == false) { - if (Config.darkSolarsResearch == false) { - text = "1"; - research = new EMTResearchItem("Entropy Infused Solar Panels", "EMT", ResearchAspects.darkSolars, -8, -6, 1, new ItemStack(BlockRegistry.emtSolars, 1, 6)).setSecondary().setParents("Compressed Solars").registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.darkSolar), new ResearchPage(EMTPostInitRecipes.doubleDarkSolar), new ResearchPage(EMTPostInitRecipes.tripleDarkSolar)); - } - } + } + } - if (Config.compressedSolarsResearch == false) { - if (Config.orderSolarsResearch == false) { - text = "1"; - research = new EMTResearchItem("Order Infused Solar Panels", "EMT", ResearchAspects.orderSolars, -6, -8, 1, new ItemStack(BlockRegistry.emtSolars, 1, 9)).setSecondary().setParents("Compressed Solars").registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.orderSolar), new ResearchPage(EMTPostInitRecipes.doubleOrderSolar), new ResearchPage(EMTPostInitRecipes.tripleOrderSolar)); - } - } + if (Config.compressedSolarsResearch == false) { + if (Config.darkSolarsResearch == false) { + text = "1"; + research = new EMTResearchItem("Entropy Infused Solar Panels", "EMT", ResearchAspects.darkSolars, -8, -6, 1, new ItemStack(BlockRegistry.emtSolars, 1, 6)).setSecondary().setParents("Compressed Solars").registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.darkSolar), new ResearchPage(EMTPostInitRecipes.doubleDarkSolar), new ResearchPage(EMTPostInitRecipes.tripleDarkSolar)); + } + } - if (Config.compressedSolarsResearch == false) { - if (Config.fireSolarsResearch == false) { - text = "1"; - research = new EMTResearchItem("Fire Infused Solar Panels", "EMT", ResearchAspects.fireSolars, -5, -7, 1, new ItemStack(BlockRegistry.emtSolars, 1, 12)).setSecondary().setParents("Compressed Solars").registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.fireSolar), new ResearchPage(EMTPostInitRecipes.doubleFireSolar), new ResearchPage(EMTPostInitRecipes.tripleFireSolar)); - } - } + if (Config.compressedSolarsResearch == false) { + if (Config.orderSolarsResearch == false) { + text = "1"; + research = new EMTResearchItem("Order Infused Solar Panels", "EMT", ResearchAspects.orderSolars, -6, -8, 1, new ItemStack(BlockRegistry.emtSolars, 1, 9)).setSecondary().setParents("Compressed Solars").registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.orderSolar), new ResearchPage(EMTPostInitRecipes.doubleOrderSolar), new ResearchPage(EMTPostInitRecipes.tripleOrderSolar)); + } + } - if (Config.compressedSolarsResearch == false) { - if (Config.airSolarsResearch == false) { - text = "1"; - research = new EMTResearchItem("Air Infused Solar Panels", "EMT", ResearchAspects.airSolars, -4, -6, 1, new ItemStack(BlockRegistry.emtSolars, 1, 15)).setSecondary().setParents("Compressed Solars").registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.airSolar), new ResearchPage(EMTPostInitRecipes.doubleAirSolar), new ResearchPage(EMTPostInitRecipes.tripleAirSolar)); - } - } + if (Config.compressedSolarsResearch == false) { + if (Config.fireSolarsResearch == false) { + text = "1"; + research = new EMTResearchItem("Fire Infused Solar Panels", "EMT", ResearchAspects.fireSolars, -5, -7, 1, new ItemStack(BlockRegistry.emtSolars, 1, 12)).setSecondary().setParents("Compressed Solars").registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.fireSolar), new ResearchPage(EMTPostInitRecipes.doubleFireSolar), new ResearchPage(EMTPostInitRecipes.tripleFireSolar)); + } + } - if (Config.compressedSolarsResearch == false) { - if (Config.earthSolarsResearch == false) { - text = "1"; - research = new EMTResearchItem("Earth Infused Solar Panels", "EMT", ResearchAspects.earthSolars, -6, -7, 1, new ItemStack(BlockRegistry.emtSolars2, 1, 2)).setSecondary().setParents("Compressed Solars").registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.earthSolar), new ResearchPage(EMTPostInitRecipes.doubleEarthSolar), new ResearchPage(EMTPostInitRecipes.tripleEarthSolar)); - } - } + if (Config.compressedSolarsResearch == false) { + if (Config.airSolarsResearch == false) { + text = "1"; + research = new EMTResearchItem("Air Infused Solar Panels", "EMT", ResearchAspects.airSolars, -4, -6, 1, new ItemStack(BlockRegistry.emtSolars, 1, 15)).setSecondary().setParents("Compressed Solars").registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.airSolar), new ResearchPage(EMTPostInitRecipes.doubleAirSolar), new ResearchPage(EMTPostInitRecipes.tripleAirSolar)); + } + } - if (Config.uuMInfusionResearch == false) { - text = "1"; - research = new EMTResearchItem("UU-Matter Infusion", "EMT", ResearchAspects.uuMInfusion, 5, 5, 3, IC2Items.getItem("UuMatterCell")).setParentsHidden("Electric Magic Tools").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(UuMInfusionRecipes.charcoalToCoal), new ResearchPage(UuMInfusionRecipes.glowstoneDustToBlock), new ResearchPage(UuMInfusionRecipes.stoneBricksToIronOre), new ResearchPage(UuMInfusionRecipes.arcaneStoneToCopperOre), new ResearchPage(UuMInfusionRecipes.arcaneStoneBricksToTinOre), new ResearchPage(UuMInfusionRecipes.amberBlockToLeadOre), new ResearchPage(UuMInfusionRecipes.amberBricksToUraniumOre), new ResearchPage(UuMInfusionRecipes.shardToResin), new ResearchPage(UuMInfusionRecipes.shardToRedstone), new ResearchPage(UuMInfusionRecipes.shardToLapis), new ResearchPage(UuMInfusionRecipes.ironToGold), new ResearchPage(UuMInfusionRecipes.goldToDiamond), new ResearchPage(UuMInfusionRecipes.diamondToUranium), new ResearchPage( - UuMInfusionRecipes.uraniumToIridium)); - } + if (Config.compressedSolarsResearch == false) { + if (Config.earthSolarsResearch == false) { + text = "1"; + research = new EMTResearchItem("Earth Infused Solar Panels", "EMT", ResearchAspects.earthSolars, -6, -7, 1, new ItemStack(BlockRegistry.emtSolars2, 1, 2)).setSecondary().setParents("Compressed Solars").registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.earthSolar), new ResearchPage(EMTPostInitRecipes.doubleEarthSolar), new ResearchPage(EMTPostInitRecipes.tripleEarthSolar)); + } + } - if (Config.portableNodeResarch == false) { - text = "1"; - research = new EMTResearchItem("Portable Node", "EMT", ResearchAspects.portableNode, 2, 5, 3, new ItemStack(BlockRegistry.portableNode)).setParents("Electric Magic Tools").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.portableNode)); - } + if (Config.uuMInfusionResearch == false) { + text = "1"; + research = new EMTResearchItem("UU-Matter Infusion", "EMT", ResearchAspects.uuMInfusion, 5, 5, 3, IC2Items.getItem("UuMatterCell")).setParentsHidden("Electric Magic Tools").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(UuMInfusionRecipes.charcoalToCoal), new ResearchPage(UuMInfusionRecipes.glowstoneDustToBlock), new ResearchPage(UuMInfusionRecipes.stoneBricksToIronOre), new ResearchPage(UuMInfusionRecipes.arcaneStoneToCopperOre), new ResearchPage(UuMInfusionRecipes.arcaneStoneBricksToTinOre), new ResearchPage(UuMInfusionRecipes.amberBlockToLeadOre), new ResearchPage(UuMInfusionRecipes.amberBricksToUraniumOre), new ResearchPage(UuMInfusionRecipes.shardToResin), new ResearchPage(UuMInfusionRecipes.shardToRedstone), new ResearchPage(UuMInfusionRecipes.shardToLapis), new ResearchPage(UuMInfusionRecipes.ironToGold), new ResearchPage(UuMInfusionRecipes.goldToDiamond), new ResearchPage(UuMInfusionRecipes.diamondToUranium), new ResearchPage( + UuMInfusionRecipes.uraniumToIridium)); + } - if (Config.electricHoeGrowthResearch == false) { - text = "1"; - research = new EMTResearchItem("Electric Hoe of Growth", "EMT", ResearchAspects.electricHoeGrowth, -1, -4, 2, new ItemStack(ItemRegistry.electricHoeGrowth)).setParents("Electric Magic Tools").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.electricHoeGrowth)); - } + if (Config.portableNodeResarch == false) { + text = "1"; + research = new EMTResearchItem("Portable Node", "EMT", ResearchAspects.portableNode, 2, 5, 3, new ItemStack(BlockRegistry.portableNode)).setParents("Electric Magic Tools").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.portableNode)); + } - if (Config.chargeFocusResearch == false) { - text = "1"; - research = new EMTResearchItem("Wand Focus: Charging", "EMT", ResearchAspects.chargeFocus, 5, 3, 2, new ItemStack(ItemRegistry.chargeFocus)).setParents("Electric Magic Tools").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.chargeFocus)); - } + if (Config.electricHoeGrowthResearch == false) { + text = "1"; + research = new EMTResearchItem("Electric Hoe of Growth", "EMT", ResearchAspects.electricHoeGrowth, -1, -4, 2, new ItemStack(ItemRegistry.electricHoeGrowth)).setParents("Electric Magic Tools").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.electricHoeGrowth)); + } - if (Config.wandChargeFocusResearch == false) { - text = "1"; - research = new EMTResearchItem("Wand Focus: Wand Charging", "EMT", ResearchAspects.wandChargeFocus, 7, 3, 3, new ItemStack(ItemRegistry.wandChargeFocus)).setParents("Wand Focus: Charging").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.wandChargeFocus)); - } + if (Config.chargeFocusResearch == false) { + text = "1"; + research = new EMTResearchItem("Wand Focus: Charging", "EMT", ResearchAspects.chargeFocus, 5, 3, 2, new ItemStack(ItemRegistry.chargeFocus)).setParents("Electric Magic Tools").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.chargeFocus)); + } - if (Config.inventoryChargingRing == false) { - text = "1"; - research = new EMTResearchItem("Inventory Charging Ring", "EMT", ResearchAspects.inventoryChargingRing, 0, -5, 3, new ItemStack(ItemRegistry.emtBauble, 1, 1)).setParentsHidden("Electric Magic Tools").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.inventoryChargingRing)); - } + if (Config.wandChargeFocusResearch == false) { + text = "1"; + research = new EMTResearchItem("Wand Focus: Wand Charging", "EMT", ResearchAspects.wandChargeFocus, 7, 3, 3, new ItemStack(ItemRegistry.wandChargeFocus)).setParents("Wand Focus: Charging").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.wandChargeFocus)); + } - if (Config.armorChargingRing == false) { - text = "1"; - research = new EMTResearchItem("Armor Charging Ring", "EMT", ResearchAspects.armorChargingRing, 0, -7, 3, new ItemStack(ItemRegistry.emtBauble, 1, 0)).setSecondary().setParents("Inventory Charging Ring").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.armorChargingRing)); - } - } + if (Config.inventoryChargingRing == false) { + text = "1"; + research = new EMTResearchItem("Inventory Charging Ring", "EMT", ResearchAspects.inventoryChargingRing, 0, -5, 3, new ItemStack(ItemRegistry.emtBauble, 1, 1)).setParentsHidden("Electric Magic Tools").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.inventoryChargingRing)); + } + + if (Config.armorChargingRing == false) { + text = "1"; + research = new EMTResearchItem("Armor Charging Ring", "EMT", ResearchAspects.armorChargingRing, 0, -7, 3, new ItemStack(ItemRegistry.emtBauble, 1, 0)).setSecondary().setParents("Inventory Charging Ring").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.armorChargingRing)); + } + + if (Config.thaumiumWingResearch == false) { + text = "1"; + research = new EMTResearchItem("Thaumium Reinforced Wings", "EMT", ResearchAspects.thaumiumWing, 0, 4, 0, new ItemStack(ItemRegistry.thaumiumWing)).setSecondary().setParents("Feather Wings").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.thaumiumWing), new ResearchPage(EMTPostInitRecipes.thaumiumWings)); + } + + if (Config.nanoWingResearch == false) { + text = "1"; + research = new EMTResearchItem("Nanosuit Wings", "EMT", ResearchAspects.nanoWing, 0, 6, 2, new ItemStack(ItemRegistry.nanoWing)).setParents("Thaumium Reinforced Wings").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.nanoWings)); + } + + if (Config.quantumWingsResearch == false) { + text = "1"; + research = new EMTResearchItem("Quantum Wings", "EMT", ResearchAspects.quantumWing, 0, 8, 3, new ItemStack(ItemRegistry.quantumWing)).setParents("Nanosuit Wings").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.quantumWings)); + } + } } diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/TileEntityRegistry.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/TileEntityRegistry.java index f14b91f..b837fbe 100644 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/TileEntityRegistry.java +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/TileEntityRegistry.java @@ -1,10 +1,10 @@ /******************************************************************************* * Copyright (c) 2014 Tombenpotter. * All rights reserved. - * + * * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * + * * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. * http://www.minecraftforum.net/topic/1585216- @@ -15,35 +15,35 @@ import cpw.mods.fml.common.registry.GameRegistry; public class TileEntityRegistry { - public static void registerEMTTileEntites() { + public static void registerEMTTileEntites() { - GameRegistry.registerTileEntity(electricMagicTools.tombenpotter.electricmagictools.common.tile.TileEntityPotentiaGenerator.class, "tileentityessentiagenerator"); - GameRegistry.registerTileEntity(electricMagicTools.tombenpotter.electricmagictools.common.tile.TileEntityIgnisGenerator.class, "tileentityignisgenerator"); - GameRegistry.registerTileEntity(electricMagicTools.tombenpotter.electricmagictools.common.tile.TileEntityAuramGenerator.class, "tileentityauramgenerator"); - GameRegistry.registerTileEntity(electricMagicTools.tombenpotter.electricmagictools.common.tile.TileEntityArborGenerator.class, "tileentityarborgenerator"); - GameRegistry.registerTileEntity(electricMagicTools.tombenpotter.electricmagictools.common.tile.TileEntityIndustrialWandRecharge.class, "tileentityindustrialwandrecharge"); - GameRegistry.registerTileEntity(electricMagicTools.tombenpotter.electricmagictools.common.tile.solars.TileEntityCompressedSolar.class, "tileentitycompressedsolar"); - GameRegistry.registerTileEntity(electricMagicTools.tombenpotter.electricmagictools.common.tile.solars.TileEntityDoubleCompressedSolar.class, "tileentitydoublecompressedsolar"); - GameRegistry.registerTileEntity(electricMagicTools.tombenpotter.electricmagictools.common.tile.solars.TileEntityTripleCompressedSolar.class, "tileentitytriplecompressedsolar"); - GameRegistry.registerTileEntity(electricMagicTools.tombenpotter.electricmagictools.common.tile.TileEntityEtherealMacerator.class, "tileentityetherealmacerator"); - GameRegistry.registerTileEntity(electricMagicTools.tombenpotter.electricmagictools.common.tile.solars.TileEntityWaterSolar.class, "tileentitywatersolar"); - GameRegistry.registerTileEntity(electricMagicTools.tombenpotter.electricmagictools.common.tile.solars.TileEntityDoubleWaterSolar.class, "tileentitydoublewatersolar"); - GameRegistry.registerTileEntity(electricMagicTools.tombenpotter.electricmagictools.common.tile.solars.TileEntityTripleWaterSolar.class, "tileentitytriplewatersolar"); - GameRegistry.registerTileEntity(electricMagicTools.tombenpotter.electricmagictools.common.tile.solars.TileEntityDarkSolar.class, "tileentitydarksolar"); - GameRegistry.registerTileEntity(electricMagicTools.tombenpotter.electricmagictools.common.tile.solars.TileEntityDoubleDarkSolar.class, "tileentitydoubledarksolar"); - GameRegistry.registerTileEntity(electricMagicTools.tombenpotter.electricmagictools.common.tile.solars.TileEntityTripleDarkSolar.class, "tileentitytripledarksolar"); - GameRegistry.registerTileEntity(electricMagicTools.tombenpotter.electricmagictools.common.tile.solars.TileEntityOrderSolar.class, "tileentityordersolar"); - GameRegistry.registerTileEntity(electricMagicTools.tombenpotter.electricmagictools.common.tile.solars.TileEntityDoubleOrderSolar.class, "tileentitydoubleordersolar"); - GameRegistry.registerTileEntity(electricMagicTools.tombenpotter.electricmagictools.common.tile.solars.TileEntityTripleOrderSolar.class, "tileentitytripleordersolar"); - GameRegistry.registerTileEntity(electricMagicTools.tombenpotter.electricmagictools.common.tile.solars.TileEntityFireSolar.class, "tileentityfiresolar"); - GameRegistry.registerTileEntity(electricMagicTools.tombenpotter.electricmagictools.common.tile.solars.TileEntityDoubleFireSolar.class, "tileentitydoublefiresolar"); - GameRegistry.registerTileEntity(electricMagicTools.tombenpotter.electricmagictools.common.tile.solars.TileEntityTripleFireSolar.class, "tileentitytriplefiresolar"); - GameRegistry.registerTileEntity(electricMagicTools.tombenpotter.electricmagictools.common.tile.solars.TileEntityAirSolar.class, "tileentityairsolar"); - GameRegistry.registerTileEntity(electricMagicTools.tombenpotter.electricmagictools.common.tile.solars.TileEntityDoubleAirSolar.class, "tileentitydoubleairsolar"); - GameRegistry.registerTileEntity(electricMagicTools.tombenpotter.electricmagictools.common.tile.solars.TileEntityTripleAirSolar.class, "tileentitytripleairsolar"); - GameRegistry.registerTileEntity(electricMagicTools.tombenpotter.electricmagictools.common.tile.solars.TileEntityEarthSolar.class, "tileentityearthsolar"); - GameRegistry.registerTileEntity(electricMagicTools.tombenpotter.electricmagictools.common.tile.solars.TileEntityDoubleEarthSolar.class, "tileentitydoubleearthsolar"); - GameRegistry.registerTileEntity(electricMagicTools.tombenpotter.electricmagictools.common.tile.solars.TileEntityTripleEarthSolar.class, "tileentitytripleearthsolar"); - GameRegistry.registerTileEntity(electricMagicTools.tombenpotter.electricmagictools.common.tile.TileEntityPortableNode.class, "tileentityportablenode"); - } + GameRegistry.registerTileEntity(electricMagicTools.tombenpotter.electricmagictools.common.tile.TileEntityPotentiaGenerator.class, "tileentityessentiagenerator"); + GameRegistry.registerTileEntity(electricMagicTools.tombenpotter.electricmagictools.common.tile.TileEntityIgnisGenerator.class, "tileentityignisgenerator"); + GameRegistry.registerTileEntity(electricMagicTools.tombenpotter.electricmagictools.common.tile.TileEntityAuramGenerator.class, "tileentityauramgenerator"); + GameRegistry.registerTileEntity(electricMagicTools.tombenpotter.electricmagictools.common.tile.TileEntityArborGenerator.class, "tileentityarborgenerator"); + GameRegistry.registerTileEntity(electricMagicTools.tombenpotter.electricmagictools.common.tile.TileEntityIndustrialWandRecharge.class, "tileentityindustrialwandrecharge"); + GameRegistry.registerTileEntity(electricMagicTools.tombenpotter.electricmagictools.common.tile.solars.TileEntityCompressedSolar.class, "tileentitycompressedsolar"); + GameRegistry.registerTileEntity(electricMagicTools.tombenpotter.electricmagictools.common.tile.solars.TileEntityDoubleCompressedSolar.class, "tileentitydoublecompressedsolar"); + GameRegistry.registerTileEntity(electricMagicTools.tombenpotter.electricmagictools.common.tile.solars.TileEntityTripleCompressedSolar.class, "tileentitytriplecompressedsolar"); + GameRegistry.registerTileEntity(electricMagicTools.tombenpotter.electricmagictools.common.tile.TileEntityEtherealMacerator.class, "tileentityetherealmacerator"); + GameRegistry.registerTileEntity(electricMagicTools.tombenpotter.electricmagictools.common.tile.solars.TileEntityWaterSolar.class, "tileentitywatersolar"); + GameRegistry.registerTileEntity(electricMagicTools.tombenpotter.electricmagictools.common.tile.solars.TileEntityDoubleWaterSolar.class, "tileentitydoublewatersolar"); + GameRegistry.registerTileEntity(electricMagicTools.tombenpotter.electricmagictools.common.tile.solars.TileEntityTripleWaterSolar.class, "tileentitytriplewatersolar"); + GameRegistry.registerTileEntity(electricMagicTools.tombenpotter.electricmagictools.common.tile.solars.TileEntityDarkSolar.class, "tileentitydarksolar"); + GameRegistry.registerTileEntity(electricMagicTools.tombenpotter.electricmagictools.common.tile.solars.TileEntityDoubleDarkSolar.class, "tileentitydoubledarksolar"); + GameRegistry.registerTileEntity(electricMagicTools.tombenpotter.electricmagictools.common.tile.solars.TileEntityTripleDarkSolar.class, "tileentitytripledarksolar"); + GameRegistry.registerTileEntity(electricMagicTools.tombenpotter.electricmagictools.common.tile.solars.TileEntityOrderSolar.class, "tileentityordersolar"); + GameRegistry.registerTileEntity(electricMagicTools.tombenpotter.electricmagictools.common.tile.solars.TileEntityDoubleOrderSolar.class, "tileentitydoubleordersolar"); + GameRegistry.registerTileEntity(electricMagicTools.tombenpotter.electricmagictools.common.tile.solars.TileEntityTripleOrderSolar.class, "tileentitytripleordersolar"); + GameRegistry.registerTileEntity(electricMagicTools.tombenpotter.electricmagictools.common.tile.solars.TileEntityFireSolar.class, "tileentityfiresolar"); + GameRegistry.registerTileEntity(electricMagicTools.tombenpotter.electricmagictools.common.tile.solars.TileEntityDoubleFireSolar.class, "tileentitydoublefiresolar"); + GameRegistry.registerTileEntity(electricMagicTools.tombenpotter.electricmagictools.common.tile.solars.TileEntityTripleFireSolar.class, "tileentitytriplefiresolar"); + GameRegistry.registerTileEntity(electricMagicTools.tombenpotter.electricmagictools.common.tile.solars.TileEntityAirSolar.class, "tileentityairsolar"); + GameRegistry.registerTileEntity(electricMagicTools.tombenpotter.electricmagictools.common.tile.solars.TileEntityDoubleAirSolar.class, "tileentitydoubleairsolar"); + GameRegistry.registerTileEntity(electricMagicTools.tombenpotter.electricmagictools.common.tile.solars.TileEntityTripleAirSolar.class, "tileentitytripleairsolar"); + GameRegistry.registerTileEntity(electricMagicTools.tombenpotter.electricmagictools.common.tile.solars.TileEntityEarthSolar.class, "tileentityearthsolar"); + GameRegistry.registerTileEntity(electricMagicTools.tombenpotter.electricmagictools.common.tile.solars.TileEntityDoubleEarthSolar.class, "tileentitydoubleearthsolar"); + GameRegistry.registerTileEntity(electricMagicTools.tombenpotter.electricmagictools.common.tile.solars.TileEntityTripleEarthSolar.class, "tileentitytripleearthsolar"); + GameRegistry.registerTileEntity(electricMagicTools.tombenpotter.electricmagictools.common.tile.TileEntityPortableNode.class, "tileentityportablenode"); + } } diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/blocks/BlockEMT.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/blocks/BlockEMT.java new file mode 100644 index 0000000..a024de5 --- /dev/null +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/blocks/BlockEMT.java @@ -0,0 +1,81 @@ +package electricMagicTools.tombenpotter.electricmagictools.common.blocks; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import electricMagicTools.tombenpotter.electricmagictools.common.tile.TileEntityEMT; +import net.minecraft.block.BlockContainer; +import net.minecraft.block.material.Material; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; +import net.minecraft.util.MathHelper; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; + +public abstract class BlockEMT extends BlockContainer { + + public IIcon[] top = new IIcon[16]; + public IIcon[] bottom = new IIcon[16]; + public IIcon[] side = new IIcon[16]; + public IIcon[] frontOff = new IIcon[16]; + public IIcon[] frontOn = new IIcon[16]; + + protected BlockEMT(Material material) { + super(material); + } + + @Override + public TileEntity createNewTileEntity(World var1, int var2) { + return null; + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(IBlockAccess access, int x, int y, int z, int side) { + TileEntityEMT tile = (TileEntityEMT) access.getTileEntity(x, y, z); + int i = access.getBlockMetadata(x, y, z); + + if (side == 0) { + return this.bottom[i]; + } else if (side == 1) { + return this.top[i]; + } else if (side != tile.facing) { + return this.side[i]; + } else if (tile.isOn) { + return this.frontOn[i]; + } else { + return this.frontOff[i]; + } + } + + @Override + public IIcon getIcon(int side, int meta) { + if (side < 1) { + return this.bottom[meta]; + } + if (side == 1) { + return this.top[meta]; + } + if (side == 3) { + return this.frontOff[meta]; + } + return this.side[meta]; + } + + @Override + public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase entity, ItemStack itemStack) { + int facing = MathHelper.floor_double(entity.rotationYaw * 4.0F / 360.0F + 0.5D) & 3; + TileEntityEMT tile = (TileEntityEMT) world.getTileEntity(x, y, z); + + if (facing == 0) tile.facing = 2; + else if (facing == 1) tile.facing = 5; + else if (facing == 2) tile.facing = 3; + else if (facing == 3) tile.facing = 4; + } + + @Override + public int damageDropped(int meta) { + return meta; + } +} diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/blocks/BlockEMTMachines.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/blocks/BlockEMTMachines.java index e9d7f6b..66fb3b1 100644 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/blocks/BlockEMTMachines.java +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/blocks/BlockEMTMachines.java @@ -1,21 +1,23 @@ /******************************************************************************* * Copyright (c) 2014 Tombenpotter. * All rights reserved. - * + * * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * + * * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ package electricMagicTools.tombenpotter.electricmagictools.common.blocks; -import java.util.List; -import java.util.Random; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import electricMagicTools.tombenpotter.electricmagictools.common.CreativeTab; +import electricMagicTools.tombenpotter.electricmagictools.common.ElectricMagicTools; +import electricMagicTools.tombenpotter.electricmagictools.common.tile.TileEntityEtherealMacerator; +import electricMagicTools.tombenpotter.electricmagictools.common.tile.TileEntityIndustrialWandRecharge; import net.minecraft.block.Block; -import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -26,149 +28,105 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import electricMagicTools.tombenpotter.electricmagictools.common.CreativeTab; -import electricMagicTools.tombenpotter.electricmagictools.common.ElectricMagicTools; -import electricMagicTools.tombenpotter.electricmagictools.common.tile.TileEntityEtherealMacerator; -import electricMagicTools.tombenpotter.electricmagictools.common.tile.TileEntityIndustrialWandRecharge; -public class BlockEMTMachines extends BlockContainer { +import java.util.List; +import java.util.Random; - public IIcon[] wandCharger = new IIcon[4]; - public IIcon[] etherealProcessor = new IIcon[4]; +public class BlockEMTMachines extends BlockEMT { - public BlockEMTMachines() { - super(Material.iron); - this.setCreativeTab(CreativeTab.tabTombenpotter); - this.setHardness(4.0F); - } + public BlockEMTMachines() { + super(Material.iron); + this.setCreativeTab(CreativeTab.tabTombenpotter); + this.setHardness(4.0F); + } - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister ir) { - this.wandCharger[0] = ir.registerIcon("electricmagictools:machines/top"); - this.wandCharger[1] = ir.registerIcon("electricmagictools:machines/bottom"); - this.wandCharger[2] = ir.registerIcon("electricmagictools:machines/side"); - this.wandCharger[3] = ir.registerIcon("electricmagictools:machines/wandcharger"); + @Override + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister ir) { + this.blockIcon = ir.registerIcon(ElectricMagicTools.texturePath + ":machines/top"); - this.etherealProcessor[0] = ir.registerIcon("electricmagictools:machines/etherealmaceratortop"); - this.etherealProcessor[1] = ir.registerIcon("electricmagictools:machines/etherealmacerator"); - this.etherealProcessor[2] = ir.registerIcon("electricmagictools:machines/etherealmaceratorfront"); - this.etherealProcessor[3] = ir.registerIcon("electricmagictools:machines/etherealmaceratorfrontactive"); - } + this.top[0] = ir.registerIcon(ElectricMagicTools.texturePath + ":machines/top"); + this.top[1] = ir.registerIcon(ElectricMagicTools.texturePath + ":machines/etherealmaceratortop"); - @SuppressWarnings({ "rawtypes", "unchecked" }) - @SideOnly(Side.CLIENT) - public void getSubBlocks(Item id, CreativeTabs tab, List list) { - list.add(new ItemStack(id, 1, 0)); - list.add(new ItemStack(id, 1, 1)); - } + this.bottom[0] = ir.registerIcon(ElectricMagicTools.texturePath + ":machines/side"); + this.bottom[1] = ir.registerIcon(ElectricMagicTools.texturePath + ":machines/etherealmacerator"); - @Override - public IIcon getIcon(int side, int meta) { - if (meta == 0) { - if (side <= 1) { - return this.wandCharger[0]; - } - if (side > 1) { - return this.wandCharger[3]; - } - } + this.side[0] = ir.registerIcon(ElectricMagicTools.texturePath + ":machines/side"); + this.side[1] = ir.registerIcon(ElectricMagicTools.texturePath + ":machines/etherealmacerator"); - if (meta == 1) { - if (side == 0) { - return this.etherealProcessor[1]; - } - if (side == 1) { - return this.etherealProcessor[0]; - } - if (side == 2) { - return this.etherealProcessor[3]; - } - if (side == 3) { - return this.etherealProcessor[3]; - } - } - return this.etherealProcessor[2]; - } + this.frontOff[0] = ir.registerIcon(ElectricMagicTools.texturePath + ":machines/wandcharger"); + this.frontOff[1] = ir.registerIcon(ElectricMagicTools.texturePath + ":machines/etherealmaceratorfront"); - @Override - public IIcon getIcon(IBlockAccess access, int i, int j, int k, int side) { - return super.getIcon(access, i, j, k, side); - } + this.frontOn[0] = ir.registerIcon(ElectricMagicTools.texturePath + ":machines/wandcharger"); + this.frontOn[1] = ir.registerIcon(ElectricMagicTools.texturePath + ":machines/etherealmaceratorfrontactive"); + } - @Override - public TileEntity createTileEntity(World world, int meta) { - if (meta == 0) { - return new TileEntityIndustrialWandRecharge(); - } - if (meta == 1) { - return new TileEntityEtherealMacerator(); - } - return super.createTileEntity(world, meta); - } + @SuppressWarnings({"rawtypes", "unchecked"}) + @SideOnly(Side.CLIENT) + public void getSubBlocks(Item id, CreativeTabs tab, List list) { + list.add(new ItemStack(id, 1, 0)); + list.add(new ItemStack(id, 1, 1)); + } - @Override - public TileEntity createNewTileEntity(World world, int md) { - return null; - } + @Override + public TileEntity createTileEntity(World world, int meta) { + if (meta == 0) { + return new TileEntityIndustrialWandRecharge(); + } + if (meta == 1) { + return new TileEntityEtherealMacerator(); + } + return super.createTileEntity(world, meta); + } - @Override - public int damageDropped(int meta) { - return meta; - } + @Override + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int par6, float par7, float par8, float par9) { + if (!world.isRemote && world.getTileEntity(x, y, z) instanceof TileEntityIndustrialWandRecharge) { + player.openGui(ElectricMagicTools.instance, 0, world, x, y, z); + } else if (!world.isRemote && world.getTileEntity(x, y, z) instanceof TileEntityEtherealMacerator) { + player.openGui(ElectricMagicTools.instance, 1, world, x, y, z); + } + return true; + } - @Override - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int par6, float par7, float par8, float par9) { - if (!world.isRemote && world.getTileEntity(x, y, z) instanceof TileEntityIndustrialWandRecharge) { - player.openGui(ElectricMagicTools.instance, 0, world, x, y, z); - } else if (!world.isRemote && world.getTileEntity(x, y, z) instanceof TileEntityEtherealMacerator) { - player.openGui(ElectricMagicTools.instance, 1, world, x, y, z); - } - return true; - } + @Override + public void breakBlock(World world, int x, int y, int z, Block par5, int par6) { + dropItems(world, x, y, z); + world.removeTileEntity(x, y, z); + super.breakBlock(world, x, y, z, par5, par6); + } - @Override - public void breakBlock(World world, int x, int y, int z, Block par5, int par6) { - dropItems(world, x, y, z); - world.removeTileEntity(x, y, z); - super.breakBlock(world, x, y, z, par5, par6); - } + private void dropItems(World world, int x, int y, int z) { + Random rand = new Random(); - private void dropItems(World world, int x, int y, int z) { - Random rand = new Random(); + TileEntity tileEntity = world.getTileEntity(x, y, z); + if (!(tileEntity instanceof IInventory)) { + return; + } + IInventory inventory = (IInventory) tileEntity; - TileEntity tileEntity = world.getTileEntity(x, y, z); - if (!(tileEntity instanceof IInventory)) { - return; - } - IInventory inventory = (IInventory) tileEntity; + for (int i = 0; i < inventory.getSizeInventory(); i++) { + ItemStack item = inventory.getStackInSlot(i); - for (int i = 0; i < inventory.getSizeInventory(); i++) { - ItemStack item = inventory.getStackInSlot(i); + if (item != null && item.stackSize > 0) { + float rx = rand.nextFloat() * 0.8F + 0.1F; + float ry = rand.nextFloat() * 0.8F + 0.1F; + float rz = rand.nextFloat() * 0.8F + 0.1F; - if (item != null && item.stackSize > 0) { - float rx = rand.nextFloat() * 0.8F + 0.1F; - float ry = rand.nextFloat() * 0.8F + 0.1F; - float rz = rand.nextFloat() * 0.8F + 0.1F; + EntityItem entityItem = new EntityItem(world, x + rx, y + ry, z + rz, new ItemStack(item.getItem(), item.stackSize, item.getItemDamage())); - EntityItem entityItem = new EntityItem(world, x + rx, y + ry, z + rz, new ItemStack(item.getItem(), item.stackSize, item.getItemDamage())); + if (item.hasTagCompound()) { + entityItem.getEntityItem().setTagCompound((NBTTagCompound) item.getTagCompound().copy()); + } - if (item.hasTagCompound()) { - entityItem.getEntityItem().setTagCompound((NBTTagCompound) item.getTagCompound().copy()); - } - - float factor = 0.05F; - entityItem.motionX = rand.nextGaussian() * factor; - entityItem.motionY = rand.nextGaussian() * factor + 0.2F; - entityItem.motionZ = rand.nextGaussian() * factor; - world.spawnEntityInWorld(entityItem); - item.stackSize = 0; - } - } - } + float factor = 0.05F; + entityItem.motionX = rand.nextGaussian() * factor; + entityItem.motionY = rand.nextGaussian() * factor + 0.2F; + entityItem.motionZ = rand.nextGaussian() * factor; + world.spawnEntityInWorld(entityItem); + item.stackSize = 0; + } + } + } } diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/blocks/BlockEMTSolars.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/blocks/BlockEMTSolars.java index ebd7363..90067fd 100644 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/blocks/BlockEMTSolars.java +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/blocks/BlockEMTSolars.java @@ -1,416 +1,176 @@ /******************************************************************************* * Copyright (c) 2014 Tombenpotter. * All rights reserved. - * + * * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * + * * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ package electricMagicTools.tombenpotter.electricmagictools.common.blocks; -import java.util.List; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import electricMagicTools.tombenpotter.electricmagictools.common.CreativeTab; +import electricMagicTools.tombenpotter.electricmagictools.common.ElectricMagicTools; +import electricMagicTools.tombenpotter.electricmagictools.common.tile.solars.*; import net.minecraft.block.Block; -import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import electricMagicTools.tombenpotter.electricmagictools.common.CreativeTab; -import electricMagicTools.tombenpotter.electricmagictools.common.tile.solars.TileEntityAirSolar; -import electricMagicTools.tombenpotter.electricmagictools.common.tile.solars.TileEntityCompressedSolar; -import electricMagicTools.tombenpotter.electricmagictools.common.tile.solars.TileEntityDarkSolar; -import electricMagicTools.tombenpotter.electricmagictools.common.tile.solars.TileEntityDoubleCompressedSolar; -import electricMagicTools.tombenpotter.electricmagictools.common.tile.solars.TileEntityDoubleDarkSolar; -import electricMagicTools.tombenpotter.electricmagictools.common.tile.solars.TileEntityDoubleFireSolar; -import electricMagicTools.tombenpotter.electricmagictools.common.tile.solars.TileEntityDoubleOrderSolar; -import electricMagicTools.tombenpotter.electricmagictools.common.tile.solars.TileEntityDoubleWaterSolar; -import electricMagicTools.tombenpotter.electricmagictools.common.tile.solars.TileEntityFireSolar; -import electricMagicTools.tombenpotter.electricmagictools.common.tile.solars.TileEntityOrderSolar; -import electricMagicTools.tombenpotter.electricmagictools.common.tile.solars.TileEntityTripleCompressedSolar; -import electricMagicTools.tombenpotter.electricmagictools.common.tile.solars.TileEntityTripleDarkSolar; -import electricMagicTools.tombenpotter.electricmagictools.common.tile.solars.TileEntityTripleFireSolar; -import electricMagicTools.tombenpotter.electricmagictools.common.tile.solars.TileEntityTripleOrderSolar; -import electricMagicTools.tombenpotter.electricmagictools.common.tile.solars.TileEntityTripleWaterSolar; -import electricMagicTools.tombenpotter.electricmagictools.common.tile.solars.TileEntityWaterSolar; -public class BlockEMTSolars extends BlockContainer { +import java.util.List; - public IIcon[] compressedSolar = new IIcon[3]; - public IIcon[] doubleCompressedSolar = new IIcon[3]; - public IIcon[] tripleCompressedSolar = new IIcon[3]; - public IIcon[] waterSolar = new IIcon[3]; - public IIcon[] doubleWaterSolar = new IIcon[3]; - public IIcon[] tripleWaterSolar = new IIcon[3]; - public IIcon[] darkSolar = new IIcon[3]; - public IIcon[] doubleDarkSolar = new IIcon[3]; - public IIcon[] tripleDarkSolar = new IIcon[3]; - public IIcon[] orderSolar = new IIcon[3]; - public IIcon[] doubleOrderSolar = new IIcon[3]; - public IIcon[] tripleOrderSolar = new IIcon[3]; - public IIcon[] fireSolar = new IIcon[3]; - public IIcon[] doubleFireSolar = new IIcon[3]; - public IIcon[] tripleFireSolar = new IIcon[3]; - public IIcon[] airSolar = new IIcon[3]; +public class BlockEMTSolars extends BlockEMT { - public BlockEMTSolars() { - super(Material.iron); - this.setCreativeTab(CreativeTab.tabTombenpotter); - this.setHardness(4.0F); - } + public BlockEMTSolars() { + super(Material.iron); + this.setCreativeTab(CreativeTab.tabTombenpotter); + this.setHardness(4.0F); + } - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister ri) { - this.compressedSolar[0] = ri.registerIcon("electricmagictools:solars/solartop"); - this.compressedSolar[1] = ri.registerIcon("electricmagictools:solars/side"); - this.compressedSolar[2] = ri.registerIcon("electricmagictools:solars/bottom"); + @Override + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister ri) { + this.top[0] = ri.registerIcon(ElectricMagicTools.texturePath + ":solars/solartop"); + this.top[1] = ri.registerIcon(ElectricMagicTools.texturePath + ":solars/doublesolartop"); + this.top[2] = ri.registerIcon(ElectricMagicTools.texturePath + ":solars/triplesolartop"); + this.top[3] = ri.registerIcon(ElectricMagicTools.texturePath + ":solars/water/solartop"); + this.top[4] = ri.registerIcon(ElectricMagicTools.texturePath + ":solars/water/doublesolartop"); + this.top[5] = ri.registerIcon(ElectricMagicTools.texturePath + ":solars/water/triplesolartop"); + this.top[6] = ri.registerIcon(ElectricMagicTools.texturePath + ":solars/dark/solartop"); + this.top[7] = ri.registerIcon(ElectricMagicTools.texturePath + ":solars/dark/doublesolartop"); + this.top[8] = ri.registerIcon(ElectricMagicTools.texturePath + ":solars/dark/triplesolartop"); + this.top[9] = ri.registerIcon(ElectricMagicTools.texturePath + ":solars/order/solartop"); + this.top[10] = ri.registerIcon(ElectricMagicTools.texturePath + ":solars/order/doublesolartop"); + this.top[11] = ri.registerIcon(ElectricMagicTools.texturePath + ":solars/order/triplesolartop"); + this.top[12] = ri.registerIcon(ElectricMagicTools.texturePath + ":solars/fire/solartop"); + this.top[13] = ri.registerIcon(ElectricMagicTools.texturePath + ":solars/fire/doublesolartop"); + this.top[14] = ri.registerIcon(ElectricMagicTools.texturePath + ":solars/fire/triplesolartop"); + this.top[15] = ri.registerIcon(ElectricMagicTools.texturePath + ":solars/air/solartop"); - this.doubleCompressedSolar[0] = ri.registerIcon("electricmagictools:solars/doublesolartop"); - this.doubleCompressedSolar[1] = ri.registerIcon("electricmagictools:solars/side"); - this.doubleCompressedSolar[2] = ri.registerIcon("electricmagictools:solars/bottom"); + this.bottom[0] = ri.registerIcon(ElectricMagicTools.texturePath + ":solars/bottom"); + this.bottom[1] = ri.registerIcon(ElectricMagicTools.texturePath + ":solars/bottom"); + this.bottom[2] = ri.registerIcon(ElectricMagicTools.texturePath + ":solars/bottom"); + this.bottom[3] = ri.registerIcon(ElectricMagicTools.texturePath + ":solars/water/waterbottom"); + this.bottom[4] = ri.registerIcon(ElectricMagicTools.texturePath + ":solars/water/waterbottom"); + this.bottom[5] = ri.registerIcon(ElectricMagicTools.texturePath + ":solars/water/waterbottom"); + this.bottom[6] = ri.registerIcon(ElectricMagicTools.texturePath + ":solars/dark/darkbottom"); + this.bottom[7] = ri.registerIcon(ElectricMagicTools.texturePath + ":solars/dark/darkbottom"); + this.bottom[8] = ri.registerIcon(ElectricMagicTools.texturePath + ":solars/dark/darkbottom"); + this.bottom[9] = ri.registerIcon(ElectricMagicTools.texturePath + ":solars/order/orderbottom"); + this.bottom[10] = ri.registerIcon(ElectricMagicTools.texturePath + ":solars/order/orderbottom"); + this.bottom[11] = ri.registerIcon(ElectricMagicTools.texturePath + ":solars/order/orderbottom"); + this.bottom[12] = ri.registerIcon(ElectricMagicTools.texturePath + ":solars/fire/firebottom"); + this.bottom[13] = ri.registerIcon(ElectricMagicTools.texturePath + ":solars/fire/firebottom"); + this.bottom[14] = ri.registerIcon(ElectricMagicTools.texturePath + ":solars/fire/firebottom"); + this.bottom[15] = ri.registerIcon(ElectricMagicTools.texturePath + ":solars/air/airbottom"); - this.tripleCompressedSolar[0] = ri.registerIcon("electricmagictools:solars/triplesolartop"); - this.tripleCompressedSolar[1] = ri.registerIcon("electricmagictools:solars/side"); - this.tripleCompressedSolar[2] = ri.registerIcon("electricmagictools:solars/bottom"); + this.frontOff[0] = ri.registerIcon(ElectricMagicTools.texturePath + ":solars/side"); + this.frontOff[1] = ri.registerIcon(ElectricMagicTools.texturePath + ":solars/side"); + this.frontOff[2] = ri.registerIcon(ElectricMagicTools.texturePath + ":solars/side"); + this.frontOff[3] = ri.registerIcon(ElectricMagicTools.texturePath + ":solars/water/waterside"); + this.frontOff[4] = ri.registerIcon(ElectricMagicTools.texturePath + ":solars/water/waterside"); + this.frontOff[5] = ri.registerIcon(ElectricMagicTools.texturePath + ":solars/water/waterside"); + this.frontOff[6] = ri.registerIcon(ElectricMagicTools.texturePath + ":solars/dark/darkside"); + this.frontOff[7] = ri.registerIcon(ElectricMagicTools.texturePath + ":solars/dark/darkside"); + this.frontOff[8] = ri.registerIcon(ElectricMagicTools.texturePath + ":solars/dark/darkside"); + this.frontOff[9] = ri.registerIcon(ElectricMagicTools.texturePath + ":solars/order/orderside"); + this.frontOff[10] = ri.registerIcon(ElectricMagicTools.texturePath + ":solars/order/orderside"); + this.frontOff[11] = ri.registerIcon(ElectricMagicTools.texturePath + ":solars/order/orderside"); + this.frontOff[12] = ri.registerIcon(ElectricMagicTools.texturePath + ":solars/fire/fireside"); + this.frontOff[13] = ri.registerIcon(ElectricMagicTools.texturePath + ":solars/fire/fireside"); + this.frontOff[14] = ri.registerIcon(ElectricMagicTools.texturePath + ":solars/fire/fireside"); + this.frontOff[15] = ri.registerIcon(ElectricMagicTools.texturePath + ":solars/air/airside"); - this.waterSolar[0] = ri.registerIcon("electricmagictools:solars/solartop"); - this.waterSolar[1] = ri.registerIcon("electricmagictools:solars/waterside"); - this.waterSolar[2] = ri.registerIcon("electricmagictools:solars/waterbottom"); + this.side[0] = ri.registerIcon(ElectricMagicTools.texturePath + ":solars/side"); + this.side[1] = ri.registerIcon(ElectricMagicTools.texturePath + ":solars/side"); + this.side[2] = ri.registerIcon(ElectricMagicTools.texturePath + ":solars/side"); + this.side[3] = ri.registerIcon(ElectricMagicTools.texturePath + ":solars/water/waterside"); + this.side[4] = ri.registerIcon(ElectricMagicTools.texturePath + ":solars/water/waterside"); + this.side[5] = ri.registerIcon(ElectricMagicTools.texturePath + ":solars/water/waterside"); + this.side[6] = ri.registerIcon(ElectricMagicTools.texturePath + ":solars/dark/darkside"); + this.side[7] = ri.registerIcon(ElectricMagicTools.texturePath + ":solars/dark/darkside"); + this.side[8] = ri.registerIcon(ElectricMagicTools.texturePath + ":solars/dark/darkside"); + this.side[9] = ri.registerIcon(ElectricMagicTools.texturePath + ":solars/order/orderside"); + this.side[10] = ri.registerIcon(ElectricMagicTools.texturePath + ":solars/order/orderside"); + this.side[11] = ri.registerIcon(ElectricMagicTools.texturePath + ":solars/order/orderside"); + this.side[12] = ri.registerIcon(ElectricMagicTools.texturePath + ":solars/fire/fireside"); + this.side[13] = ri.registerIcon(ElectricMagicTools.texturePath + ":solars/fire/fireside"); + this.side[14] = ri.registerIcon(ElectricMagicTools.texturePath + ":solars/fire/fireside"); + this.side[15] = ri.registerIcon(ElectricMagicTools.texturePath + ":solars/air/airside"); + } - this.doubleWaterSolar[0] = ri.registerIcon("electricmagictools:solars/doublesolartop"); - this.doubleWaterSolar[1] = ri.registerIcon("electricmagictools:solars/waterside"); - this.doubleWaterSolar[2] = ri.registerIcon("electricmagictools:solars/waterbottom"); + @SideOnly(Side.CLIENT) + @SuppressWarnings({"unchecked", "rawtypes"}) + public void getSubBlocks(Item id, CreativeTabs tab, List list) { + for (int i = 0; i <= 15; i++) { + list.add(new ItemStack(id, 1, i)); + } + } - this.tripleWaterSolar[0] = ri.registerIcon("electricmagictools:solars/triplesolartop"); - this.tripleWaterSolar[1] = ri.registerIcon("electricmagictools:solars/waterside"); - this.tripleWaterSolar[2] = ri.registerIcon("electricmagictools:solars/waterbottom"); + @Override + public TileEntity createTileEntity(World world, int meta) { + if (meta == 0) { + return new TileEntityCompressedSolar(); + } + if (meta == 1) { + return new TileEntityDoubleCompressedSolar(); + } + if (meta == 2) { + return new TileEntityTripleCompressedSolar(); + } + if (meta == 3) { + return new TileEntityWaterSolar(); + } + if (meta == 4) { + return new TileEntityDoubleWaterSolar(); + } + if (meta == 5) { + return new TileEntityTripleWaterSolar(); + } + if (meta == 6) { + return new TileEntityDarkSolar(); + } + if (meta == 7) { + return new TileEntityDoubleDarkSolar(); + } + if (meta == 8) { + return new TileEntityTripleDarkSolar(); + } + if (meta == 9) { + return new TileEntityOrderSolar(); + } + if (meta == 10) { + return new TileEntityDoubleOrderSolar(); + } + if (meta == 11) { + return new TileEntityTripleOrderSolar(); + } + if (meta == 12) { + return new TileEntityFireSolar(); + } + if (meta == 13) { + return new TileEntityDoubleFireSolar(); + } + if (meta == 14) { + return new TileEntityTripleFireSolar(); + } + if (meta == 15) { + return new TileEntityAirSolar(); + } + return super.createTileEntity(world, meta); + } - this.darkSolar[0] = ri.registerIcon("electricmagictools:solars/solartop"); - this.darkSolar[1] = ri.registerIcon("electricmagictools:solars/darkside"); - this.darkSolar[2] = ri.registerIcon("electricmagictools:solars/darkbottom"); - - this.doubleDarkSolar[0] = ri.registerIcon("electricmagictools:solars/doublesolartop"); - this.doubleDarkSolar[1] = ri.registerIcon("electricmagictools:solars/darkside"); - this.doubleDarkSolar[2] = ri.registerIcon("electricmagictools:solars/darkbottom"); - - this.tripleDarkSolar[0] = ri.registerIcon("electricmagictools:solars/triplesolartop"); - this.tripleDarkSolar[1] = ri.registerIcon("electricmagictools:solars/darkside"); - this.tripleDarkSolar[2] = ri.registerIcon("electricmagictools:solars/darkbottom"); - - this.orderSolar[0] = ri.registerIcon("electricmagictools:solars/solartop"); - this.orderSolar[1] = ri.registerIcon("electricmagictools:solars/orderside"); - this.orderSolar[2] = ri.registerIcon("electricmagictools:solars/orderbottom"); - - this.doubleOrderSolar[0] = ri.registerIcon("electricmagictools:solars/doublesolartop"); - this.doubleOrderSolar[1] = ri.registerIcon("electricmagictools:solars/orderside"); - this.doubleOrderSolar[2] = ri.registerIcon("electricmagictools:solars/orderbottom"); - - this.tripleOrderSolar[0] = ri.registerIcon("electricmagictools:solars/triplesolartop"); - this.tripleOrderSolar[1] = ri.registerIcon("electricmagictools:solars/orderside"); - this.tripleOrderSolar[2] = ri.registerIcon("electricmagictools:solars/orderbottom"); - - this.fireSolar[0] = ri.registerIcon("electricmagictools:solars/solartop"); - this.fireSolar[1] = ri.registerIcon("electricmagictools:solars/fireside"); - this.fireSolar[2] = ri.registerIcon("electricmagictools:solars/firebottom"); - - this.doubleFireSolar[0] = ri.registerIcon("electricmagictools:solars/doublesolartop"); - this.doubleFireSolar[1] = ri.registerIcon("electricmagictools:solars/fireside"); - this.doubleFireSolar[2] = ri.registerIcon("electricmagictools:solars/firebottom"); - - this.tripleFireSolar[0] = ri.registerIcon("electricmagictools:solars/triplesolartop"); - this.tripleFireSolar[1] = ri.registerIcon("electricmagictools:solars/fireside"); - this.tripleFireSolar[2] = ri.registerIcon("electricmagictools:solars/firebottom"); - - this.airSolar[0] = ri.registerIcon("electricmagictools:solars/solartop"); - this.airSolar[1] = ri.registerIcon("electricmagictools:solars/airside"); - this.airSolar[2] = ri.registerIcon("electricmagictools:solars/airbottom"); - } - - @SideOnly(Side.CLIENT) - @SuppressWarnings({ "unchecked", "rawtypes" }) - public void getSubBlocks(Item id, CreativeTabs tab, List list) { - list.add(new ItemStack(id, 1, 0)); - list.add(new ItemStack(id, 1, 1)); - list.add(new ItemStack(id, 1, 2)); - list.add(new ItemStack(id, 1, 3)); - list.add(new ItemStack(id, 1, 4)); - list.add(new ItemStack(id, 1, 5)); - list.add(new ItemStack(id, 1, 6)); - list.add(new ItemStack(id, 1, 7)); - list.add(new ItemStack(id, 1, 8)); - list.add(new ItemStack(id, 1, 9)); - list.add(new ItemStack(id, 1, 10)); - list.add(new ItemStack(id, 1, 11)); - list.add(new ItemStack(id, 1, 12)); - list.add(new ItemStack(id, 1, 13)); - list.add(new ItemStack(id, 1, 14)); - list.add(new ItemStack(id, 1, 15)); - } - - @Override - public IIcon getIcon(int side, int meta) { - if (meta == 0) { - if (side == 1) { - return this.compressedSolar[0]; - } - if (side > 1) { - return this.compressedSolar[1]; - } - } - - if (meta == 1) { - if (side == 1) { - return this.doubleCompressedSolar[0]; - } - if (side > 1) { - return this.doubleCompressedSolar[1]; - } - } - - if (meta == 2) { - if (side == 1) { - return this.tripleCompressedSolar[0]; - } - if (side > 1) { - return this.tripleCompressedSolar[1]; - } - } - - if (meta == 3) { - if (side == 0) { - return this.waterSolar[2]; - } - if (side == 1) { - return this.waterSolar[0]; - } - if (side > 1) { - return this.waterSolar[1]; - } - } - - if (meta == 4) { - if (side == 0) { - return this.doubleWaterSolar[2]; - } - if (side == 1) { - return this.doubleWaterSolar[0]; - } - if (side > 1) { - return this.doubleWaterSolar[1]; - } - } - - if (meta == 5) { - if (side == 0) { - return this.tripleWaterSolar[2]; - } - if (side == 1) { - return this.tripleWaterSolar[0]; - } - if (side > 1) { - return this.tripleWaterSolar[1]; - } - } - - if (meta == 6) { - if (side == 0) { - return this.darkSolar[2]; - } - if (side == 1) { - return this.darkSolar[0]; - } - if (side > 1) { - return this.darkSolar[1]; - } - } - - if (meta == 7) { - if (side == 0) { - return this.doubleDarkSolar[2]; - } - if (side == 1) { - return this.doubleDarkSolar[0]; - } - if (side > 1) { - return this.doubleDarkSolar[1]; - } - } - - if (meta == 8) { - if (side == 0) { - return this.tripleDarkSolar[2]; - } - if (side == 1) { - return this.tripleDarkSolar[0]; - } - if (side > 1) { - return this.tripleDarkSolar[1]; - } - } - - if (meta == 9) { - if (side == 0) { - return this.orderSolar[2]; - } - if (side == 1) { - return this.orderSolar[0]; - } - if (side > 1) { - return this.orderSolar[1]; - } - } - - if (meta == 10) { - if (side == 0) { - return this.doubleOrderSolar[2]; - } - if (side == 1) { - return this.doubleOrderSolar[0]; - } - if (side > 1) { - return this.doubleOrderSolar[1]; - } - } - - if (meta == 11) { - if (side == 0) { - return this.tripleOrderSolar[2]; - } - if (side == 1) { - return this.tripleOrderSolar[0]; - } - if (side > 1) { - return this.tripleOrderSolar[1]; - } - } - - if (meta == 12) { - if (side == 0) { - return this.fireSolar[2]; - } - if (side == 1) { - return this.fireSolar[0]; - } - if (side > 1) { - return this.fireSolar[1]; - } - } - - if (meta == 13) { - if (side == 0) { - return this.doubleFireSolar[2]; - } - if (side == 1) { - return this.doubleFireSolar[0]; - } - if (side > 1) { - return this.doubleFireSolar[1]; - } - } - - if (meta == 14) { - if (side == 0) { - return this.tripleFireSolar[2]; - } - if (side == 1) { - return this.tripleFireSolar[0]; - } - if (side > 1) { - return this.tripleFireSolar[1]; - } - } - - if (meta == 15) { - if (side == 0) { - return this.airSolar[2]; - } - if (side == 1) { - return this.airSolar[0]; - } - if (side > 1) { - return this.airSolar[1]; - } - } - return this.compressedSolar[2]; - } - - @Override - public TileEntity createTileEntity(World world, int meta) { - if (meta == 0) { - return new TileEntityCompressedSolar(); - } - if (meta == 1) { - return new TileEntityDoubleCompressedSolar(); - } - if (meta == 2) { - return new TileEntityTripleCompressedSolar(); - } - if (meta == 3) { - return new TileEntityWaterSolar(); - } - if (meta == 4) { - return new TileEntityDoubleWaterSolar(); - } - if (meta == 5) { - return new TileEntityTripleWaterSolar(); - } - if (meta == 6) { - return new TileEntityDarkSolar(); - } - if (meta == 7) { - return new TileEntityDoubleDarkSolar(); - } - if (meta == 8) { - return new TileEntityTripleDarkSolar(); - } - if (meta == 9) { - return new TileEntityOrderSolar(); - } - if (meta == 10) { - return new TileEntityDoubleOrderSolar(); - } - if (meta == 11) { - return new TileEntityTripleOrderSolar(); - } - if (meta == 12) { - return new TileEntityFireSolar(); - } - if (meta == 13) { - return new TileEntityDoubleFireSolar(); - } - if (meta == 14) { - return new TileEntityTripleFireSolar(); - } - if (meta == 15) { - return new TileEntityAirSolar(); - } - - return super.createTileEntity(world, meta); - } - - @Override - public void breakBlock(World world, int x, int y, int z, Block par5, int par6) { - world.removeTileEntity(x, y, z); - super.breakBlock(world, x, y, z, par5, par6); - } - - @Override - public int damageDropped(int meta) { - return meta; - } - - @Override - public TileEntity createNewTileEntity(World var1, int var2) { - return null; - } + @Override + public void breakBlock(World world, int x, int y, int z, Block par5, int par6) { + world.removeTileEntity(x, y, z); + super.breakBlock(world, x, y, z, par5, par6); + } } diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/blocks/BlockEMTSolars2.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/blocks/BlockEMTSolars2.java index c5231b0..8c5f5f4 100644 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/blocks/BlockEMTSolars2.java +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/blocks/BlockEMTSolars2.java @@ -1,174 +1,99 @@ /******************************************************************************* * Copyright (c) 2014 Tombenpotter. * All rights reserved. - * + * * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * + * * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ package electricMagicTools.tombenpotter.electricmagictools.common.blocks; -import java.util.List; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import electricMagicTools.tombenpotter.electricmagictools.common.CreativeTab; +import electricMagicTools.tombenpotter.electricmagictools.common.ElectricMagicTools; +import electricMagicTools.tombenpotter.electricmagictools.common.tile.solars.*; import net.minecraft.block.Block; -import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import electricMagicTools.tombenpotter.electricmagictools.common.CreativeTab; -import electricMagicTools.tombenpotter.electricmagictools.common.tile.solars.TileEntityDoubleAirSolar; -import electricMagicTools.tombenpotter.electricmagictools.common.tile.solars.TileEntityDoubleEarthSolar; -import electricMagicTools.tombenpotter.electricmagictools.common.tile.solars.TileEntityEarthSolar; -import electricMagicTools.tombenpotter.electricmagictools.common.tile.solars.TileEntityTripleAirSolar; -import electricMagicTools.tombenpotter.electricmagictools.common.tile.solars.TileEntityTripleEarthSolar; -public class BlockEMTSolars2 extends BlockContainer { +import java.util.List; - public IIcon[] compressedSolar = new IIcon[3]; - public IIcon[] doubleAirSolar = new IIcon[3]; - public IIcon[] tripleAirSolar = new IIcon[3]; - public IIcon[] earthSolar = new IIcon[3]; - public IIcon[] doubleEarthSolar = new IIcon[3]; - public IIcon[] tripleEarthSolar = new IIcon[3]; +public class BlockEMTSolars2 extends BlockEMT { - public BlockEMTSolars2() { - super(Material.iron); - this.setCreativeTab(CreativeTab.tabTombenpotter); - this.setHardness(4.0F); - } + public BlockEMTSolars2() { + super(Material.iron); + this.setCreativeTab(CreativeTab.tabTombenpotter); + this.setHardness(4.0F); + } - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister ri) { - this.compressedSolar[0] = ri.registerIcon("electricmagictools:solars/solartop"); - this.compressedSolar[1] = ri.registerIcon("electricmagictools:solars/side"); - this.compressedSolar[2] = ri.registerIcon("electricmagictools:solars/bottom"); + @Override + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister ri) { + this.top[0] = ri.registerIcon(ElectricMagicTools.texturePath + ":solars/air/doublesolartop"); + this.top[1] = ri.registerIcon(ElectricMagicTools.texturePath + ":solars/air/triplesolartop"); + this.top[2] = ri.registerIcon(ElectricMagicTools.texturePath + ":solars/earth/solartop"); + this.top[3] = ri.registerIcon(ElectricMagicTools.texturePath + ":solars/earth/doublesolartop"); + this.top[4] = ri.registerIcon(ElectricMagicTools.texturePath + ":solars/earth/triplesolartop"); - this.doubleAirSolar[0] = ri.registerIcon("electricmagictools:solars/doublesolartop"); - this.doubleAirSolar[1] = ri.registerIcon("electricmagictools:solars/airside"); - this.doubleAirSolar[2] = ri.registerIcon("electricmagictools:solars/airbottom"); + this.bottom[0] = ri.registerIcon(ElectricMagicTools.texturePath + ":solars/air/airbottom"); + this.bottom[1] = ri.registerIcon(ElectricMagicTools.texturePath + ":solars/air/airbottom"); + this.bottom[2] = ri.registerIcon(ElectricMagicTools.texturePath + ":solars/earth/earthbottom"); + this.bottom[3] = ri.registerIcon(ElectricMagicTools.texturePath + ":solars/earth/earthbottom"); + this.bottom[4] = ri.registerIcon(ElectricMagicTools.texturePath + ":solars/earth/earthbottom"); - this.tripleAirSolar[0] = ri.registerIcon("electricmagictools:solars/triplesolartop"); - this.tripleAirSolar[1] = ri.registerIcon("electricmagictools:solars/airside"); - this.tripleAirSolar[2] = ri.registerIcon("electricmagictools:solars/airbottom"); + this.frontOff[0] = ri.registerIcon(ElectricMagicTools.texturePath + ":solars/air/airside"); + this.frontOff[1] = ri.registerIcon(ElectricMagicTools.texturePath + ":solars/air/airside"); + this.frontOff[2] = ri.registerIcon(ElectricMagicTools.texturePath + ":solars/earth/earthside"); + this.frontOff[3] = ri.registerIcon(ElectricMagicTools.texturePath + ":solars/earth/earthside"); + this.frontOff[4] = ri.registerIcon(ElectricMagicTools.texturePath + ":solars/earth/earthside"); - this.earthSolar[0] = ri.registerIcon("electricmagictools:solars/solartop"); - this.earthSolar[1] = ri.registerIcon("electricmagictools:solars/earthside"); - this.earthSolar[2] = ri.registerIcon("electricmagictools:solars/earthbottom"); + this.side[0] = ri.registerIcon(ElectricMagicTools.texturePath + ":solars/air/airside"); + this.side[1] = ri.registerIcon(ElectricMagicTools.texturePath + ":solars/air/airside"); + this.side[2] = ri.registerIcon(ElectricMagicTools.texturePath + ":solars/earth/earthside"); + this.side[3] = ri.registerIcon(ElectricMagicTools.texturePath + ":solars/earth/earthside"); + this.side[4] = ri.registerIcon(ElectricMagicTools.texturePath + ":solars/earth/earthside"); + } - this.doubleEarthSolar[0] = ri.registerIcon("electricmagictools:solars/doublesolartop"); - this.doubleEarthSolar[1] = ri.registerIcon("electricmagictools:solars/earthside"); - this.doubleEarthSolar[2] = ri.registerIcon("electricmagictools:solars/earthbottom"); + @SideOnly(Side.CLIENT) + @SuppressWarnings({"unchecked", "rawtypes"}) + public void getSubBlocks(Item id, CreativeTabs tab, List list) { + for (int i = 0; i <= 4; i++) { + list.add(new ItemStack(id, 1, i)); + } + } - this.tripleEarthSolar[0] = ri.registerIcon("electricmagictools:solars/triplesolartop"); - this.tripleEarthSolar[1] = ri.registerIcon("electricmagictools:solars/earthside"); - this.tripleEarthSolar[2] = ri.registerIcon("electricmagictools:solars/earthbottom"); - } + @Override + public TileEntity createTileEntity(World world, int meta) { + if (meta == 0) { + return new TileEntityDoubleAirSolar(); + } + if (meta == 1) { + return new TileEntityTripleAirSolar(); + } + if (meta == 2) { + return new TileEntityEarthSolar(); + } + if (meta == 3) { + return new TileEntityDoubleEarthSolar(); + } + if (meta == 4) { + return new TileEntityTripleEarthSolar(); + } + return super.createTileEntity(world, meta); + } - @SideOnly(Side.CLIENT) - @SuppressWarnings({ "unchecked", "rawtypes" }) - public void getSubBlocks(Item id, CreativeTabs tab, List list) { - list.add(new ItemStack(id, 1, 0)); - list.add(new ItemStack(id, 1, 1)); - list.add(new ItemStack(id, 1, 2)); - list.add(new ItemStack(id, 1, 3)); - list.add(new ItemStack(id, 1, 4)); - - } - - @Override - public IIcon getIcon(int side, int meta) { - if (meta == 0) { - if (side == 1) { - return this.doubleAirSolar[0]; - } - if (side > 1) { - return this.doubleAirSolar[1]; - } - } - - if (meta == 1) { - if (side == 1) { - return this.tripleAirSolar[0]; - } - if (side > 1) { - return this.tripleAirSolar[1]; - } - } - - if (meta == 2) { - if (side == 1) { - return this.earthSolar[0]; - } - if (side > 1) { - return this.earthSolar[1]; - } - } - - if (meta == 3) { - if (side == 1) { - return this.doubleEarthSolar[0]; - } - if (side > 1) { - return this.doubleEarthSolar[1]; - } - } - - if (meta == 4) { - if (side == 1) { - return this.tripleEarthSolar[0]; - } - if (side > 1) { - return this.tripleEarthSolar[1]; - } - } - return this.compressedSolar[2]; - } - - @Override - public TileEntity createTileEntity(World world, int meta) { - if (meta == 0) { - return new TileEntityDoubleAirSolar(); - } - if (meta == 1) { - return new TileEntityTripleAirSolar(); - } - if (meta == 2) { - return new TileEntityEarthSolar(); - } - if (meta == 3) { - return new TileEntityDoubleEarthSolar(); - } - if (meta == 4) { - return new TileEntityTripleEarthSolar(); - } - return super.createTileEntity(world, meta); - } - - @Override - public void breakBlock(World world, int x, int y, int z, Block par5, int par6) { - world.removeTileEntity(x, y, z); - super.breakBlock(world, x, y, z, par5, par6); - } - - @Override - public int damageDropped(int meta) { - return meta; - } - - @Override - public TileEntity createNewTileEntity(World var1, int var2) { - // TODO Auto-generated method stub - return null; - } + @Override + public void breakBlock(World world, int x, int y, int z, Block par5, int par6) { + world.removeTileEntity(x, y, z); + super.breakBlock(world, x, y, z, par5, par6); + } } diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/blocks/BlockEssentiaGenerators.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/blocks/BlockEssentiaGenerators.java index 6226a15..18359eb 100644 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/blocks/BlockEssentiaGenerators.java +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/blocks/BlockEssentiaGenerators.java @@ -1,162 +1,104 @@ /******************************************************************************* * Copyright (c) 2014 Tombenpotter. * All rights reserved. - * + * * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * + * * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ package electricMagicTools.tombenpotter.electricmagictools.common.blocks; -import java.util.List; -import java.util.Random; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import electricMagicTools.tombenpotter.electricmagictools.common.CreativeTab; +import electricMagicTools.tombenpotter.electricmagictools.common.ElectricMagicTools; +import electricMagicTools.tombenpotter.electricmagictools.common.tile.TileEntityArborGenerator; +import electricMagicTools.tombenpotter.electricmagictools.common.tile.TileEntityAuramGenerator; +import electricMagicTools.tombenpotter.electricmagictools.common.tile.TileEntityIgnisGenerator; +import electricMagicTools.tombenpotter.electricmagictools.common.tile.TileEntityPotentiaGenerator; import net.minecraft.block.Block; -import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import electricMagicTools.tombenpotter.electricmagictools.common.CreativeTab; -import electricMagicTools.tombenpotter.electricmagictools.common.tile.TileEntityArborGenerator; -import electricMagicTools.tombenpotter.electricmagictools.common.tile.TileEntityAuramGenerator; -import electricMagicTools.tombenpotter.electricmagictools.common.tile.TileEntityIgnisGenerator; -import electricMagicTools.tombenpotter.electricmagictools.common.tile.TileEntityPotentiaGenerator; -public class BlockEssentiaGenerators extends BlockContainer { +import java.util.List; +import java.util.Random; - public IIcon[] potentiaGen = new IIcon[3]; - public IIcon[] ignisGen = new IIcon[3]; - public IIcon[] auramGen = new IIcon[3]; - public IIcon[] arborGen = new IIcon[3]; - public IIcon[] saxumGen = new IIcon[3]; +public class BlockEssentiaGenerators extends BlockEMT { - public BlockEssentiaGenerators() { - super(Material.iron); - this.setCreativeTab(CreativeTab.tabTombenpotter); - this.setHardness(4.0F); - } + public BlockEssentiaGenerators() { + super(Material.iron); + this.setCreativeTab(CreativeTab.tabTombenpotter); + this.setHardness(4.0F); + } - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister ri) { - this.potentiaGen[0] = ri.registerIcon("electricmagictools:essentiagenerator/potentiafront"); - this.potentiaGen[1] = ri.registerIcon("electricmagictools:essentiagenerator/side"); - this.potentiaGen[2] = ri.registerIcon("electricmagictools:essentiagenerator/top"); + @Override + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister ri) { + this.blockIcon = ri.registerIcon(ElectricMagicTools.texturePath + ":machines/top"); - this.ignisGen[0] = ri.registerIcon("electricmagictools:essentiagenerator/ignisfront"); - this.ignisGen[1] = ri.registerIcon("electricmagictools:essentiagenerator/side"); - this.ignisGen[2] = ri.registerIcon("electricmagictools:essentiagenerator/top"); + for (int i = 0; i <= 3; i++) { + this.top[i] = ri.registerIcon(ElectricMagicTools.texturePath + ":essentiagenerator/top"); + } - this.auramGen[0] = ri.registerIcon("electricmagictools:essentiagenerator/auramfront"); - this.auramGen[1] = ri.registerIcon("electricmagictools:essentiagenerator/side"); - this.auramGen[2] = ri.registerIcon("electricmagictools:essentiagenerator/top"); + for (int i = 0; i <= 3; i++) { + this.bottom[i] = ri.registerIcon(ElectricMagicTools.texturePath + ":essentiagenerator/top"); + } - this.arborGen[0] = ri.registerIcon("electricmagictools:essentiagenerator/arborfront"); - this.arborGen[1] = ri.registerIcon("electricmagictools:essentiagenerator/side"); - this.arborGen[2] = ri.registerIcon("electricmagictools:essentiagenerator/top"); + for (int i = 0; i <= 3; i++) { + this.side[i] = ri.registerIcon(ElectricMagicTools.texturePath + ":essentiagenerator/side"); + } - this.saxumGen[0] = ri.registerIcon("electricmagictools:essentiagenerator/saxumfront"); - this.saxumGen[1] = ri.registerIcon("electricmagictools:essentiagenerator/side"); - this.saxumGen[2] = ri.registerIcon("electricmagictools:essentiagenerator/top"); - } + this.frontOff[0] = ri.registerIcon(ElectricMagicTools.texturePath + ":essentiagenerator/potentiafront"); + this.frontOff[1] = ri.registerIcon(ElectricMagicTools.texturePath + ":essentiagenerator/ignisfront"); + this.frontOff[2] = ri.registerIcon(ElectricMagicTools.texturePath + ":essentiagenerator/auramfront"); + this.frontOff[3] = ri.registerIcon(ElectricMagicTools.texturePath + ":essentiagenerator/arborfront"); + } - @SuppressWarnings({ "unchecked", "rawtypes" }) - @SideOnly(Side.CLIENT) - public void getSubBlocks(Item id, CreativeTabs tab, List list) { - list.add(new ItemStack(id, 1, 0)); - list.add(new ItemStack(id, 1, 1)); - list.add(new ItemStack(id, 1, 2)); - list.add(new ItemStack(id, 1, 3)); - } + @SuppressWarnings({"unchecked", "rawtypes"}) + @SideOnly(Side.CLIENT) + public void getSubBlocks(Item id, CreativeTabs tab, List list) { + list.add(new ItemStack(id, 1, 0)); + list.add(new ItemStack(id, 1, 1)); + list.add(new ItemStack(id, 1, 2)); + list.add(new ItemStack(id, 1, 3)); + } - @Override - public IIcon getIcon(int side, int meta) { - if (meta == 0) { - if (side == 1) { - return this.potentiaGen[2]; - } - if (side > 1) { - return this.potentiaGen[0]; - } - } + @Override + public TileEntity createTileEntity(World world, int meta) { + if (meta == 0) { + return new TileEntityPotentiaGenerator(); + } + if (meta == 1) { + return new TileEntityIgnisGenerator(); + } + if (meta == 2) { + return new TileEntityAuramGenerator(); + } + if (meta == 3) { + return new TileEntityArborGenerator(); + } + return super.createTileEntity(world, meta); + } - if (meta == 1) { - if (side == 1) { - return this.ignisGen[2]; - } - if (side > 1) { - return this.ignisGen[0]; - } - } + @Override + public void breakBlock(World world, int x, int y, int z, Block par5, int par6) { + world.removeTileEntity(x, y, z); + super.breakBlock(world, x, y, z, par5, par6); + } - if (meta == 2) { - if (side == 1) { - return this.auramGen[2]; - } - if (side > 1) { - return this.auramGen[0]; - } - } - - if (meta == 3) { - if (side == 1) { - return this.arborGen[2]; - } - if (side > 1) { - return this.arborGen[0]; - } - } - return this.potentiaGen[1]; - } - - @Override - public TileEntity createTileEntity(World world, int meta) { - if (meta == 0) { - return new TileEntityPotentiaGenerator(); - } - if (meta == 1) { - return new TileEntityIgnisGenerator(); - } - if (meta == 2) { - return new TileEntityAuramGenerator(); - } - if (meta == 3) { - return new TileEntityArborGenerator(); - } - return super.createTileEntity(world, meta); - } - - @Override - public void breakBlock(World world, int x, int y, int z, Block par5, int par6) { - world.removeTileEntity(x, y, z); - super.breakBlock(world, x, y, z, par5, par6); - } - - @Override - public int damageDropped(int par1) { - return par1; - } - - @SideOnly(Side.CLIENT) - public void randomDisplayTick(World par1World, int par2, int par3, int par4, Random par5Random) { - float f = (float) par2 + 0.5F; - float f1 = (float) par3 + 1.0F; - float f2 = (float) par4 + 0.5F; - par1World.spawnParticle("largesmoke", f, f1, f2, 0.0D, 0.0D, 0.0D); - } - - @Override - public TileEntity createNewTileEntity(World var1, int var2) { - return null; - } + @SideOnly(Side.CLIENT) + public void randomDisplayTick(World par1World, int par2, int par3, int par4, Random par5Random) { + float f = (float) par2 + 0.5F; + float f1 = (float) par3 + 1.0F; + float f2 = (float) par4 + 0.5F; + par1World.spawnParticle("largesmoke", f, f1, f2, 0.0D, 0.0D, 0.0D); + } } diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/blocks/BlockPortableNode.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/blocks/BlockPortableNode.java index 1e77cfb..18bf7a7 100644 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/blocks/BlockPortableNode.java +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/blocks/BlockPortableNode.java @@ -1,19 +1,21 @@ /******************************************************************************* * Copyright (c) 2014 Tombenpotter. * All rights reserved. - * + * * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * + * * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ package electricMagicTools.tombenpotter.electricmagictools.common.blocks; -import java.util.List; -import java.util.Random; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import electricMagicTools.tombenpotter.electricmagictools.common.CreativeTab; +import electricMagicTools.tombenpotter.electricmagictools.common.ElectricMagicTools; +import electricMagicTools.tombenpotter.electricmagictools.common.tile.TileEntityPortableNode; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; @@ -25,79 +27,78 @@ import net.minecraft.util.IIcon; import net.minecraft.world.Explosion; import net.minecraft.world.World; import thaumcraft.common.blocks.BlockAiry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import electricMagicTools.tombenpotter.electricmagictools.common.CreativeTab; -import electricMagicTools.tombenpotter.electricmagictools.common.tile.TileEntityPortableNode; + +import java.util.List; +import java.util.Random; public class BlockPortableNode extends BlockAiry { - public IIcon[] texture = new IIcon[1]; + public IIcon[] texture = new IIcon[1]; - public BlockPortableNode() { - this.setCreativeTab(CreativeTab.tabTombenpotter); - setBlockUnbreakable(); - } + public BlockPortableNode() { + this.setCreativeTab(CreativeTab.tabTombenpotter); + setBlockUnbreakable(); + } - @Override - public TileEntity createTileEntity(World world, int meta) { - return new TileEntityPortableNode(); - } + @Override + public TileEntity createTileEntity(World world, int meta) { + return new TileEntityPortableNode(); + } - @Override - public int quantityDropped(Random par1Random) { - return 0; - } + @Override + public int quantityDropped(Random par1Random) { + return 0; + } - @Override - public boolean isOpaqueCube() { - return false; - } + @Override + public boolean isOpaqueCube() { + return false; + } - @Override - public boolean renderAsNormalBlock() { - return false; - } + @Override + public boolean renderAsNormalBlock() { + return false; + } - @Override - protected boolean canSilkHarvest() { - return false; - } + @Override + protected boolean canSilkHarvest() { + return false; + } - public boolean canEntityDestroy(World world, int x, int y, int z, Entity entity) { - return false; - } + public boolean canEntityDestroy(World world, int x, int y, int z, Entity entity) { + return false; + } - public void onBlockExploded(World world, int x, int y, int z, Explosion explosion) { - } + public void onBlockExploded(World world, int x, int y, int z, Explosion explosion) { + } - public boolean canDragonDestroy(World world, int x, int y, int z) { - return false; - } + public boolean canDragonDestroy(World world, int x, int y, int z) { + return false; + } - @SideOnly(Side.CLIENT) - @Override - public void registerBlockIcons(IIconRegister ri) { - this.texture[0] = ri.registerIcon("electricmagictools:portablenode"); - } + @SideOnly(Side.CLIENT) + @Override + public void registerBlockIcons(IIconRegister ri) { + this.texture[0] = ri.registerIcon(ElectricMagicTools.texturePath + ":portablenode"); + } - @SideOnly(Side.CLIENT) - public IIcon getIcon(int side, int meta) { - return this.texture[0]; - } + @SideOnly(Side.CLIENT) + public IIcon getIcon(int side, int meta) { + return this.texture[0]; + } - @SuppressWarnings({ "rawtypes", "unchecked" }) - @SideOnly(Side.CLIENT) - public void getSubBlocks(Item id, CreativeTabs tab, List list) { - list.add(new ItemStack(id, 1, 0)); - } + @SuppressWarnings({"rawtypes", "unchecked"}) + @SideOnly(Side.CLIENT) + public void getSubBlocks(Item id, CreativeTabs tab, List list) { + list.add(new ItemStack(id, 1, 0)); + } - @Override - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int par6, float par7, float par8, float par9) { - if (!world.isRemote && player.isSneaking() && player.getHeldItem() == null) { - world.setBlockToAir(x, y, z); - world.removeTileEntity(x, y, z); - } - return true; - } + @Override + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int par6, float par7, float par8, float par9) { + if (!world.isRemote && player.isSneaking() && player.getHeldItem() == null) { + world.setBlockToAir(x, y, z); + world.removeTileEntity(x, y, z); + } + return true; + } } diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/blocks/BlockShield.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/blocks/BlockShield.java index 441f3d6..fb6a228 100644 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/blocks/BlockShield.java +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/blocks/BlockShield.java @@ -1,77 +1,78 @@ /******************************************************************************* * Copyright (c) 2014 Tombenpotter. * All rights reserved. - * + * * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * + * * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ package electricMagicTools.tombenpotter.electricmagictools.common.blocks; -import java.util.Random; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import electricMagicTools.tombenpotter.electricmagictools.common.CreativeTab; +import electricMagicTools.tombenpotter.electricmagictools.common.ElectricMagicTools; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.world.Explosion; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import electricMagicTools.tombenpotter.electricmagictools.common.CreativeTab; + +import java.util.Random; public class BlockShield extends Block { - public BlockShield() { - super(Material.rock); - this.setCreativeTab(CreativeTab.tabTombenpotter); - this.setHardness(1F); - this.setResistance(200000000F); - } + public BlockShield() { + super(Material.rock); + this.setCreativeTab(CreativeTab.tabTombenpotter); + this.setHardness(1F); + this.setResistance(200000000F); + } - @Override - public int quantityDropped(Random par1Random) { - return 0; - } + @Override + public int quantityDropped(Random par1Random) { + return 0; + } - @Override - @SideOnly(Side.CLIENT) - public int getRenderBlockPass() { - return 0; - } + @Override + @SideOnly(Side.CLIENT) + public int getRenderBlockPass() { + return 0; + } - @SideOnly(Side.CLIENT) - @Override - public void registerBlockIcons(IIconRegister iconRegister) { - this.blockIcon = iconRegister.registerIcon("electricmagictools:shield"); - } + @SideOnly(Side.CLIENT) + @Override + public void registerBlockIcons(IIconRegister iconRegister) { + this.blockIcon = iconRegister.registerIcon(ElectricMagicTools.texturePath + ":shield"); + } - @Override - public boolean isOpaqueCube() { - return false; - } + @Override + public boolean isOpaqueCube() { + return false; + } - @Override - public boolean renderAsNormalBlock() { - return false; - } + @Override + public boolean renderAsNormalBlock() { + return false; + } - @Override - protected boolean canSilkHarvest() { - return false; - } + @Override + protected boolean canSilkHarvest() { + return false; + } - public boolean canEntityDestroy(World world, int x, int y, int z, Entity entity) { - return false; - } + public boolean canEntityDestroy(World world, int x, int y, int z, Entity entity) { + return false; + } - public void onBlockExploded(World world, int x, int y, int z, Explosion explosion) { - } + public void onBlockExploded(World world, int x, int y, int z, Explosion explosion) { + } - public boolean canDragonDestroy(World world, int x, int y, int z) { - return false; - } + public boolean canDragonDestroy(World world, int x, int y, int z) { + return false; + } } diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/entities/EntityArcher.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/entities/EntityArcher.java index 1e1e867..a2b5265 100644 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/entities/EntityArcher.java +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/entities/EntityArcher.java @@ -1,10 +1,10 @@ /******************************************************************************* * Copyright (c) 2014 Tombenpotter. * All rights reserved. - * + * * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * + * * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. * http://www.minecraftforum.net/topic/1585216- @@ -36,95 +36,95 @@ import net.minecraftforge.common.IExtendedEntityProperties; public class EntityArcher extends EntitySnowman implements IExtendedEntityProperties { - public EntityArcher(World par1World) { - super(par1World); - this.isImmuneToFire = true; - this.tasks.addTask(1, new EntityAISwimming(this)); - this.tasks.addTask(2, new EntityAIWatchClosest(this, EntityPlayer.class, 6.0F)); - this.targetTasks.addTask(3, new EntityAINearestAttackableTarget(this, EntityLiving.class, 0, true, false, IMob.mobSelector)); - this.tasks.addTask(4, new EntityAIWander(this, 0.30D)); - } + public EntityArcher(World par1World) { + super(par1World); + this.isImmuneToFire = true; + this.tasks.addTask(1, new EntityAISwimming(this)); + this.tasks.addTask(2, new EntityAIWatchClosest(this, EntityPlayer.class, 6.0F)); + this.targetTasks.addTask(3, new EntityAINearestAttackableTarget(this, EntityLiving.class, 0, true, false, IMob.mobSelector)); + this.tasks.addTask(4, new EntityAIWander(this, 0.30D)); + } - @Override - protected void applyEntityAttributes() { - super.applyEntityAttributes(); - this.getEntityAttribute(SharedMonsterAttributes.movementSpeed).setBaseValue(0.30D); - this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(40.0D); - } + @Override + protected void applyEntityAttributes() { + super.applyEntityAttributes(); + this.getEntityAttribute(SharedMonsterAttributes.movementSpeed).setBaseValue(0.30D); + this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(40.0D); + } - @Override - public void onDeath(DamageSource par1DamageSource) { - super.onDeath(par1DamageSource); - this.worldObj.createExplosion(this, this.posX, this.posY, this.posZ, 1, true); - this.setDead(); - } + @Override + public void onDeath(DamageSource par1DamageSource) { + super.onDeath(par1DamageSource); + this.worldObj.createExplosion(this, this.posX, this.posY, this.posZ, 1, true); + this.setDead(); + } - @Override - protected Item getDropItem() { - return Items.arrow; - } + @Override + protected Item getDropItem() { + return Items.arrow; + } - @Override - protected void dropFewItems(boolean par1, int par2) { - int j; - int k; + @Override + protected void dropFewItems(boolean par1, int par2) { + int j; + int k; - j = this.rand.nextInt(3 + par2); + j = this.rand.nextInt(3 + par2); - for (k = 0; k < j; ++k) { - this.dropItem(Items.arrow, 1); - } - j = this.rand.nextInt(3 + par2); + for (k = 0; k < j; ++k) { + this.dropItem(Items.arrow, 1); + } + j = this.rand.nextInt(3 + par2); - for (k = 0; k < j; ++k) { - this.dropItem(Items.bone, 1); - } - } + for (k = 0; k < j; ++k) { + this.dropItem(Items.bone, 1); + } + } - @Override - protected void dropRareDrop(int par1) { - this.entityDropItem(new ItemStack(Blocks.web, 1, 1), 0.0F); - } + @Override + protected void dropRareDrop(int par1) { + this.entityDropItem(new ItemStack(Blocks.web, 1, 1), 0.0F); + } - protected void addRandomArmor() { - super.addRandomArmor(); - this.setCurrentItemOrArmor(0, new ItemStack(Items.bow)); - } + protected void addRandomArmor() { + super.addRandomArmor(); + this.setCurrentItemOrArmor(0, new ItemStack(Items.bow)); + } - @Override - public void attackEntityWithRangedAttack(EntityLivingBase par1EntityLivingBase, float par2) { - EntityArrow entityarrow = new EntityArrow(this.worldObj, this, par1EntityLivingBase, 1.6F, (float) (14 - this.worldObj.difficultySetting.getDifficultyId() * 4)); - int i = EnchantmentHelper.getEnchantmentLevel(Enchantment.power.effectId, this.getHeldItem()); - int j = EnchantmentHelper.getEnchantmentLevel(Enchantment.punch.effectId, this.getHeldItem()); - entityarrow.setDamage((double) (par2 * 2.0F) + this.rand.nextGaussian() * 0.25D + (double) ((float) this.worldObj.difficultySetting.getDifficultyId() * 0.11F)); + @Override + public void attackEntityWithRangedAttack(EntityLivingBase par1EntityLivingBase, float par2) { + EntityArrow entityarrow = new EntityArrow(this.worldObj, this, par1EntityLivingBase, 1.6F, (float) (14 - this.worldObj.difficultySetting.getDifficultyId() * 4)); + int i = EnchantmentHelper.getEnchantmentLevel(Enchantment.power.effectId, this.getHeldItem()); + int j = EnchantmentHelper.getEnchantmentLevel(Enchantment.punch.effectId, this.getHeldItem()); + entityarrow.setDamage((double) (par2 * 2.0F) + this.rand.nextGaussian() * 0.25D + (double) ((float) this.worldObj.difficultySetting.getDifficultyId() * 0.11F)); - if (i > 0) { - entityarrow.setDamage(entityarrow.getDamage() + (double) i * 0.5D + 0.5D); - } + if (i > 0) { + entityarrow.setDamage(entityarrow.getDamage() + (double) i * 0.5D + 0.5D); + } - if (j > 0) { - entityarrow.setKnockbackStrength(j); - } + if (j > 0) { + entityarrow.setKnockbackStrength(j); + } - if (EnchantmentHelper.getEnchantmentLevel(Enchantment.flame.effectId, this.getHeldItem()) > 0) { - entityarrow.setFire(100); - } + if (EnchantmentHelper.getEnchantmentLevel(Enchantment.flame.effectId, this.getHeldItem()) > 0) { + entityarrow.setFire(100); + } - this.playSound("random.bow", 1.0F, 1.0F / (this.getRNG().nextFloat() * 0.4F + 0.8F)); - this.worldObj.spawnEntityInWorld(entityarrow); - } + this.playSound("random.bow", 1.0F, 1.0F / (this.getRNG().nextFloat() * 0.4F + 0.8F)); + this.worldObj.spawnEntityInWorld(entityarrow); + } - @Override - public void saveNBTData(NBTTagCompound compound) { - } + @Override + public void saveNBTData(NBTTagCompound compound) { + } - @Override - public void loadNBTData(NBTTagCompound compound) { + @Override + public void loadNBTData(NBTTagCompound compound) { - } + } - @Override - public void init(Entity entity, World world) { - } + @Override + public void init(Entity entity, World world) { + } } diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/entities/EntityLaser.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/entities/EntityLaser.java index 3e1c31e..870cbb4 100644 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/entities/EntityLaser.java +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/entities/EntityLaser.java @@ -1,18 +1,18 @@ /******************************************************************************* * Copyright (c) 2014 Tombenpotter. * All rights reserved. - * + * * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * + * * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ package electricMagicTools.tombenpotter.electricmagictools.common.entities; -import java.util.List; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.Entity; @@ -25,326 +25,326 @@ import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.Vec3; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; + +import java.util.List; public class EntityLaser extends Entity implements IProjectile { - private int xTile = -1; - private int yTile = -1; - private int zTile = -1; - private Block inTile; - private int inData; - private boolean inGround; + private int xTile = -1; + private int yTile = -1; + private int zTile = -1; + private Block inTile; + private int inData; + private boolean inGround; - public Entity shootingEntity; - private int ticksInGround; - private int ticksInAir; + public Entity shootingEntity; + private int ticksInGround; + private int ticksInAir; - public EntityLaser(World par1World) { - super(par1World); - this.renderDistanceWeight = 10.0D; - this.setSize(0.5F, 0.5F); - } + public EntityLaser(World par1World) { + super(par1World); + this.renderDistanceWeight = 10.0D; + this.setSize(0.5F, 0.5F); + } - public EntityLaser(World par1World, double par2, double par4, double par6) { - super(par1World); - this.renderDistanceWeight = 10.0D; - this.setSize(0.5F, 0.5F); - this.setPosition(par2, par4, par6); - this.yOffset = 0.0F; - } + public EntityLaser(World par1World, double par2, double par4, double par6) { + super(par1World); + this.renderDistanceWeight = 10.0D; + this.setSize(0.5F, 0.5F); + this.setPosition(par2, par4, par6); + this.yOffset = 0.0F; + } - public EntityLaser(World par1World, EntityLivingBase par2EntityLivingBase, EntityLivingBase par3EntityLivingBase, float par4, float par5) { - super(par1World); - this.renderDistanceWeight = 10.0D; - this.shootingEntity = par2EntityLivingBase; + public EntityLaser(World par1World, EntityLivingBase par2EntityLivingBase, EntityLivingBase par3EntityLivingBase, float par4, float par5) { + super(par1World); + this.renderDistanceWeight = 10.0D; + this.shootingEntity = par2EntityLivingBase; - this.posY = par2EntityLivingBase.posY + (double) par2EntityLivingBase.getEyeHeight() - 0.10000000149011612D; - double d0 = par3EntityLivingBase.posX - par2EntityLivingBase.posX; - double d1 = par3EntityLivingBase.boundingBox.minY + (double) (par3EntityLivingBase.height / 3.0F) - this.posY; - double d2 = par3EntityLivingBase.posZ - par2EntityLivingBase.posZ; - double d3 = (double) MathHelper.sqrt_double(d0 * d0 + d2 * d2); + this.posY = par2EntityLivingBase.posY + (double) par2EntityLivingBase.getEyeHeight() - 0.10000000149011612D; + double d0 = par3EntityLivingBase.posX - par2EntityLivingBase.posX; + double d1 = par3EntityLivingBase.boundingBox.minY + (double) (par3EntityLivingBase.height / 3.0F) - this.posY; + double d2 = par3EntityLivingBase.posZ - par2EntityLivingBase.posZ; + double d3 = (double) MathHelper.sqrt_double(d0 * d0 + d2 * d2); - if (d3 >= 1.0E-7D) { - float f2 = (float) (Math.atan2(d2, d0) * 180.0D / Math.PI) - 90.0F; - float f3 = (float) (-(Math.atan2(d1, d3) * 180.0D / Math.PI)); - double d4 = d0 / d3; - double d5 = d2 / d3; - this.setLocationAndAngles(par2EntityLivingBase.posX + d4, this.posY, par2EntityLivingBase.posZ + d5, f2, f3); - this.yOffset = 0.0F; - float f4 = (float) d3 * 0.2F; - this.setThrowableHeading(d0, d1 + (double) f4, d2, par4, par5); - } - } + if (d3 >= 1.0E-7D) { + float f2 = (float) (Math.atan2(d2, d0) * 180.0D / Math.PI) - 90.0F; + float f3 = (float) (-(Math.atan2(d1, d3) * 180.0D / Math.PI)); + double d4 = d0 / d3; + double d5 = d2 / d3; + this.setLocationAndAngles(par2EntityLivingBase.posX + d4, this.posY, par2EntityLivingBase.posZ + d5, f2, f3); + this.yOffset = 0.0F; + float f4 = (float) d3 * 0.2F; + this.setThrowableHeading(d0, d1 + (double) f4, d2, par4, par5); + } + } - public EntityLaser(World par1World, EntityLivingBase par2EntityLivingBase, float par3) { - super(par1World); - this.renderDistanceWeight = 10.0D; - this.shootingEntity = par2EntityLivingBase; + public EntityLaser(World par1World, EntityLivingBase par2EntityLivingBase, float par3) { + super(par1World); + this.renderDistanceWeight = 10.0D; + this.shootingEntity = par2EntityLivingBase; - this.setSize(0.5F, 0.5F); - this.setLocationAndAngles(par2EntityLivingBase.posX, par2EntityLivingBase.posY + (double) par2EntityLivingBase.getEyeHeight(), par2EntityLivingBase.posZ, par2EntityLivingBase.rotationYaw, par2EntityLivingBase.rotationPitch); - this.posX -= (double) (MathHelper.cos(this.rotationYaw / 180.0F * (float) Math.PI) * 0.16F); - this.posY -= 0.10000000149011612D; - this.posZ -= (double) (MathHelper.sin(this.rotationYaw / 180.0F * (float) Math.PI) * 0.16F); - this.setPosition(this.posX, this.posY, this.posZ); - this.yOffset = 0.0F; - this.motionX = (double) (-MathHelper.sin(this.rotationYaw / 180.0F * (float) Math.PI) * MathHelper.cos(this.rotationPitch / 180.0F * (float) Math.PI)); - this.motionZ = (double) (MathHelper.cos(this.rotationYaw / 180.0F * (float) Math.PI) * MathHelper.cos(this.rotationPitch / 180.0F * (float) Math.PI)); - this.motionY = (double) (-MathHelper.sin(this.rotationPitch / 180.0F * (float) Math.PI)); - this.setThrowableHeading(this.motionX, this.motionY, this.motionZ, par3 * 1.5F, 1.0F); - } + this.setSize(0.5F, 0.5F); + this.setLocationAndAngles(par2EntityLivingBase.posX, par2EntityLivingBase.posY + (double) par2EntityLivingBase.getEyeHeight(), par2EntityLivingBase.posZ, par2EntityLivingBase.rotationYaw, par2EntityLivingBase.rotationPitch); + this.posX -= (double) (MathHelper.cos(this.rotationYaw / 180.0F * (float) Math.PI) * 0.16F); + this.posY -= 0.10000000149011612D; + this.posZ -= (double) (MathHelper.sin(this.rotationYaw / 180.0F * (float) Math.PI) * 0.16F); + this.setPosition(this.posX, this.posY, this.posZ); + this.yOffset = 0.0F; + this.motionX = (double) (-MathHelper.sin(this.rotationYaw / 180.0F * (float) Math.PI) * MathHelper.cos(this.rotationPitch / 180.0F * (float) Math.PI)); + this.motionZ = (double) (MathHelper.cos(this.rotationYaw / 180.0F * (float) Math.PI) * MathHelper.cos(this.rotationPitch / 180.0F * (float) Math.PI)); + this.motionY = (double) (-MathHelper.sin(this.rotationPitch / 180.0F * (float) Math.PI)); + this.setThrowableHeading(this.motionX, this.motionY, this.motionZ, par3 * 1.5F, 1.0F); + } - protected void entityInit() { - this.dataWatcher.addObject(16, Byte.valueOf((byte) 0)); - } + protected void entityInit() { + this.dataWatcher.addObject(16, Byte.valueOf((byte) 0)); + } - public void setThrowableHeading(double par1, double par3, double par5, float par7, float par8) { - float f2 = MathHelper.sqrt_double(par1 * par1 + par3 * par3 + par5 * par5); - par1 /= (double) f2; - par3 /= (double) f2; - par5 /= (double) f2; - par1 += this.rand.nextGaussian() * (double) (this.rand.nextBoolean() ? -1 : 1) * 0.007499999832361937D * (double) par8; - par3 += this.rand.nextGaussian() * (double) (this.rand.nextBoolean() ? -1 : 1) * 0.007499999832361937D * (double) par8; - par5 += this.rand.nextGaussian() * (double) (this.rand.nextBoolean() ? -1 : 1) * 0.007499999832361937D * (double) par8; - par1 *= (double) par7; - par3 *= (double) par7; - par5 *= (double) par7; - this.motionX = par1; - this.motionY = par3; - this.motionZ = par5; - float f3 = MathHelper.sqrt_double(par1 * par1 + par5 * par5); - this.prevRotationYaw = this.rotationYaw = (float) (Math.atan2(par1, par5) * 180.0D / Math.PI); - this.prevRotationPitch = this.rotationPitch = (float) (Math.atan2(par3, (double) f3) * 180.0D / Math.PI); - this.ticksInGround = 0; - } + public void setThrowableHeading(double par1, double par3, double par5, float par7, float par8) { + float f2 = MathHelper.sqrt_double(par1 * par1 + par3 * par3 + par5 * par5); + par1 /= (double) f2; + par3 /= (double) f2; + par5 /= (double) f2; + par1 += this.rand.nextGaussian() * (double) (this.rand.nextBoolean() ? -1 : 1) * 0.007499999832361937D * (double) par8; + par3 += this.rand.nextGaussian() * (double) (this.rand.nextBoolean() ? -1 : 1) * 0.007499999832361937D * (double) par8; + par5 += this.rand.nextGaussian() * (double) (this.rand.nextBoolean() ? -1 : 1) * 0.007499999832361937D * (double) par8; + par1 *= (double) par7; + par3 *= (double) par7; + par5 *= (double) par7; + this.motionX = par1; + this.motionY = par3; + this.motionZ = par5; + float f3 = MathHelper.sqrt_double(par1 * par1 + par5 * par5); + this.prevRotationYaw = this.rotationYaw = (float) (Math.atan2(par1, par5) * 180.0D / Math.PI); + this.prevRotationPitch = this.rotationPitch = (float) (Math.atan2(par3, (double) f3) * 180.0D / Math.PI); + this.ticksInGround = 0; + } - @SideOnly(Side.CLIENT) - public void setPositionAndRotation2(double par1, double par3, double par5, float par7, float par8, int par9) { - this.setPosition(par1, par3, par5); - this.setRotation(par7, par8); - } + @SideOnly(Side.CLIENT) + public void setPositionAndRotation2(double par1, double par3, double par5, float par7, float par8, int par9) { + this.setPosition(par1, par3, par5); + this.setRotation(par7, par8); + } - @SideOnly(Side.CLIENT) - public void setVelocity(double par1, double par3, double par5) { - this.motionX = par1; - this.motionY = par3; - this.motionZ = par5; + @SideOnly(Side.CLIENT) + public void setVelocity(double par1, double par3, double par5) { + this.motionX = par1; + this.motionY = par3; + this.motionZ = par5; - if (this.prevRotationPitch == 0.0F && this.prevRotationYaw == 0.0F) { - float f = MathHelper.sqrt_double(par1 + par5); - this.prevRotationYaw = this.rotationYaw = (float) (Math.atan2(par1, par5) / Math.PI); - this.prevRotationPitch = this.rotationPitch = (float) (Math.atan2(par3, (double) f) / Math.PI); - this.prevRotationPitch = this.rotationPitch; - this.prevRotationYaw = this.rotationYaw; - this.setLocationAndAngles(this.posX, this.posY, this.posZ, this.rotationYaw, this.rotationPitch); - this.ticksInGround = 0; - } - } + if (this.prevRotationPitch == 0.0F && this.prevRotationYaw == 0.0F) { + float f = MathHelper.sqrt_double(par1 + par5); + this.prevRotationYaw = this.rotationYaw = (float) (Math.atan2(par1, par5) / Math.PI); + this.prevRotationPitch = this.rotationPitch = (float) (Math.atan2(par3, (double) f) / Math.PI); + this.prevRotationPitch = this.rotationPitch; + this.prevRotationYaw = this.rotationYaw; + this.setLocationAndAngles(this.posX, this.posY, this.posZ, this.rotationYaw, this.rotationPitch); + this.ticksInGround = 0; + } + } - @SuppressWarnings("rawtypes") - public void onUpdate() { - super.onUpdate(); + @SuppressWarnings("rawtypes") + public void onUpdate() { + super.onUpdate(); - if (this.prevRotationPitch == 0.0F && this.prevRotationYaw == 0.0F) { - float f = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); - this.prevRotationYaw = this.rotationYaw = (float) (Math.atan2(this.motionX, this.motionZ) * 180.0D / Math.PI); - this.prevRotationPitch = this.rotationPitch = (float) (Math.atan2(this.motionY, (double) f) * 180.0D / Math.PI); - } + if (this.prevRotationPitch == 0.0F && this.prevRotationYaw == 0.0F) { + float f = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); + this.prevRotationYaw = this.rotationYaw = (float) (Math.atan2(this.motionX, this.motionZ) * 180.0D / Math.PI); + this.prevRotationPitch = this.rotationPitch = (float) (Math.atan2(this.motionY, (double) f) * 180.0D / Math.PI); + } - Block block = this.worldObj.getBlock(this.xTile, this.yTile, this.zTile); - if (block.getMaterial() != Material.air) { - block.setBlockBoundsBasedOnState(this.worldObj, this.xTile, this.yTile, this.zTile); - AxisAlignedBB axisalignedbb = block.getCollisionBoundingBoxFromPool(this.worldObj, this.xTile, this.yTile, this.zTile); + Block block = this.worldObj.getBlock(this.xTile, this.yTile, this.zTile); + if (block.getMaterial() != Material.air) { + block.setBlockBoundsBasedOnState(this.worldObj, this.xTile, this.yTile, this.zTile); + AxisAlignedBB axisalignedbb = block.getCollisionBoundingBoxFromPool(this.worldObj, this.xTile, this.yTile, this.zTile); - if (axisalignedbb != null && axisalignedbb.isVecInside(this.worldObj.getWorldVec3Pool().getVecFromPool(this.posX, this.posY, this.posZ))) { - this.inGround = true; - } - } - Block i = this.worldObj.getBlock(this.xTile, this.yTile, this.zTile); + if (axisalignedbb != null && axisalignedbb.isVecInside(this.worldObj.getWorldVec3Pool().getVecFromPool(this.posX, this.posY, this.posZ))) { + this.inGround = true; + } + } + Block i = this.worldObj.getBlock(this.xTile, this.yTile, this.zTile); - i.setBlockBoundsBasedOnState(this.worldObj, this.xTile, this.yTile, this.zTile); - AxisAlignedBB axisalignedbb = i.getCollisionBoundingBoxFromPool(this.worldObj, this.xTile, this.yTile, this.zTile); + i.setBlockBoundsBasedOnState(this.worldObj, this.xTile, this.yTile, this.zTile); + AxisAlignedBB axisalignedbb = i.getCollisionBoundingBoxFromPool(this.worldObj, this.xTile, this.yTile, this.zTile); - if (axisalignedbb != null && axisalignedbb.isVecInside(this.worldObj.getWorldVec3Pool().getVecFromPool(this.posX, this.posY, this.posZ))) { - this.inGround = true; - } + if (axisalignedbb != null && axisalignedbb.isVecInside(this.worldObj.getWorldVec3Pool().getVecFromPool(this.posX, this.posY, this.posZ))) { + this.inGround = true; + } - if (this.inGround) { - Block j = this.worldObj.getBlock(this.xTile, this.yTile, this.zTile); - int k = this.worldObj.getBlockMetadata(this.xTile, this.yTile, this.zTile); - this.worldObj.createExplosion(this, this.posX, this.posY, this.posZ, 3, true); - this.setDead(); - if (j == this.inTile && k == this.inData) { - ++this.ticksInGround; + if (this.inGround) { + Block j = this.worldObj.getBlock(this.xTile, this.yTile, this.zTile); + int k = this.worldObj.getBlockMetadata(this.xTile, this.yTile, this.zTile); + this.worldObj.createExplosion(this, this.posX, this.posY, this.posZ, 3, true); + this.setDead(); + if (j == this.inTile && k == this.inData) { + ++this.ticksInGround; - if (this.ticksInGround == 1200) { - this.setDead(); - } - } else { - this.inGround = false; - this.motionX *= (double) (this.rand.nextFloat() * 0.2F); - this.motionY *= (double) (this.rand.nextFloat() * 0.2F); - this.motionZ *= (double) (this.rand.nextFloat() * 0.2F); - this.ticksInGround = 0; - this.ticksInAir = 0; - } - } else { - ++this.ticksInAir; - Vec3 vec3 = this.worldObj.getWorldVec3Pool().getVecFromPool(this.posX, this.posY, this.posZ); - Vec3 vec31 = this.worldObj.getWorldVec3Pool().getVecFromPool(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ); - MovingObjectPosition movingobjectposition = this.worldObj.rayTraceBlocks(vec3, vec31, false); - vec3 = this.worldObj.getWorldVec3Pool().getVecFromPool(this.posX, this.posY, this.posZ); - vec31 = this.worldObj.getWorldVec3Pool().getVecFromPool(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ); + if (this.ticksInGround == 1200) { + this.setDead(); + } + } else { + this.inGround = false; + this.motionX *= (double) (this.rand.nextFloat() * 0.2F); + this.motionY *= (double) (this.rand.nextFloat() * 0.2F); + this.motionZ *= (double) (this.rand.nextFloat() * 0.2F); + this.ticksInGround = 0; + this.ticksInAir = 0; + } + } else { + ++this.ticksInAir; + Vec3 vec3 = this.worldObj.getWorldVec3Pool().getVecFromPool(this.posX, this.posY, this.posZ); + Vec3 vec31 = this.worldObj.getWorldVec3Pool().getVecFromPool(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ); + MovingObjectPosition movingobjectposition = this.worldObj.rayTraceBlocks(vec3, vec31, false); + vec3 = this.worldObj.getWorldVec3Pool().getVecFromPool(this.posX, this.posY, this.posZ); + vec31 = this.worldObj.getWorldVec3Pool().getVecFromPool(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ); - if (movingobjectposition != null) { - vec31 = this.worldObj.getWorldVec3Pool().getVecFromPool(movingobjectposition.hitVec.xCoord, movingobjectposition.hitVec.yCoord, movingobjectposition.hitVec.zCoord); - } + if (movingobjectposition != null) { + vec31 = this.worldObj.getWorldVec3Pool().getVecFromPool(movingobjectposition.hitVec.xCoord, movingobjectposition.hitVec.yCoord, movingobjectposition.hitVec.zCoord); + } - Entity entity = null; - List list = this.worldObj.getEntitiesWithinAABBExcludingEntity(this, this.boundingBox.addCoord(this.motionX, this.motionY, this.motionZ).expand(1.0D, 1.0D, 1.0D)); - double d0 = 0.0D; - int l; - float f1; + Entity entity = null; + List list = this.worldObj.getEntitiesWithinAABBExcludingEntity(this, this.boundingBox.addCoord(this.motionX, this.motionY, this.motionZ).expand(1.0D, 1.0D, 1.0D)); + double d0 = 0.0D; + int l; + float f1; - for (l = 0; l < list.size(); ++l) { - Entity entity1 = (Entity) list.get(l); + for (l = 0; l < list.size(); ++l) { + Entity entity1 = (Entity) list.get(l); - if (entity1.canBeCollidedWith() && (entity1 != this.shootingEntity || this.ticksInAir >= 5)) { - f1 = 0.3F; - AxisAlignedBB axisalignedbb1 = entity1.boundingBox.expand((double) f1, (double) f1, (double) f1); - MovingObjectPosition movingobjectposition1 = axisalignedbb1.calculateIntercept(vec3, vec31); + if (entity1.canBeCollidedWith() && (entity1 != this.shootingEntity || this.ticksInAir >= 5)) { + f1 = 0.3F; + AxisAlignedBB axisalignedbb1 = entity1.boundingBox.expand((double) f1, (double) f1, (double) f1); + MovingObjectPosition movingobjectposition1 = axisalignedbb1.calculateIntercept(vec3, vec31); - if (movingobjectposition1 != null) { - double d1 = vec3.distanceTo(movingobjectposition1.hitVec); + if (movingobjectposition1 != null) { + double d1 = vec3.distanceTo(movingobjectposition1.hitVec); - if (d1 < d0 || d0 == 0.0D) { - entity = entity1; - d0 = d1; - } - } - } - } + if (d1 < d0 || d0 == 0.0D) { + entity = entity1; + d0 = d1; + } + } + } + } - if (entity != null) { - movingobjectposition = new MovingObjectPosition(entity); - } + if (entity != null) { + movingobjectposition = new MovingObjectPosition(entity); + } - if (movingobjectposition != null && movingobjectposition.entityHit != null && movingobjectposition.entityHit instanceof EntityPlayer) { - EntityPlayer entityplayer = (EntityPlayer) movingobjectposition.entityHit; + if (movingobjectposition != null && movingobjectposition.entityHit != null && movingobjectposition.entityHit instanceof EntityPlayer) { + EntityPlayer entityplayer = (EntityPlayer) movingobjectposition.entityHit; - if (entityplayer.capabilities.disableDamage || this.shootingEntity instanceof EntityPlayer && !((EntityPlayer) this.shootingEntity).canAttackPlayer(entityplayer)) { - movingobjectposition = null; - } - } + if (entityplayer.capabilities.disableDamage || this.shootingEntity instanceof EntityPlayer && !((EntityPlayer) this.shootingEntity).canAttackPlayer(entityplayer)) { + movingobjectposition = null; + } + } - float f2; - float f3; + float f2; + float f3; - if (movingobjectposition != null) { - if (movingobjectposition.entityHit != null) { - f2 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionY * this.motionY + this.motionZ * this.motionZ); + if (movingobjectposition != null) { + if (movingobjectposition.entityHit != null) { + f2 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionY * this.motionY + this.motionZ * this.motionZ); - { - this.motionX *= -0.10000000149011612D; - this.motionY *= -0.10000000149011612D; - this.motionZ *= -0.10000000149011612D; - this.rotationYaw += 180.0F; - this.prevRotationYaw += 180.0F; - this.ticksInAir = 0; - } - } else { - this.xTile = movingobjectposition.blockX; - this.yTile = movingobjectposition.blockY; - this.zTile = movingobjectposition.blockZ; - this.inTile = this.worldObj.getBlock(this.xTile, this.yTile, this.zTile); - this.inData = this.worldObj.getBlockMetadata(this.xTile, this.yTile, this.zTile); - this.motionX = (double) ((float) (movingobjectposition.hitVec.xCoord - this.posX)); - this.motionY = (double) ((float) (movingobjectposition.hitVec.yCoord - this.posY)); - this.motionZ = (double) ((float) (movingobjectposition.hitVec.zCoord - this.posZ)); - f2 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionY * this.motionY + this.motionZ * this.motionZ); - this.posX -= this.motionX / (double) f2 * 0.05000000074505806D; - this.posY -= this.motionY / (double) f2 * 0.05000000074505806D; - this.posZ -= this.motionZ / (double) f2 * 0.05000000074505806D; - this.playSound("random.bowhit", 1.0F, 1.2F / (this.rand.nextFloat() * 0.2F + 0.9F)); - this.inGround = true; - } - } + { + this.motionX *= -0.10000000149011612D; + this.motionY *= -0.10000000149011612D; + this.motionZ *= -0.10000000149011612D; + this.rotationYaw += 180.0F; + this.prevRotationYaw += 180.0F; + this.ticksInAir = 0; + } + } else { + this.xTile = movingobjectposition.blockX; + this.yTile = movingobjectposition.blockY; + this.zTile = movingobjectposition.blockZ; + this.inTile = this.worldObj.getBlock(this.xTile, this.yTile, this.zTile); + this.inData = this.worldObj.getBlockMetadata(this.xTile, this.yTile, this.zTile); + this.motionX = (double) ((float) (movingobjectposition.hitVec.xCoord - this.posX)); + this.motionY = (double) ((float) (movingobjectposition.hitVec.yCoord - this.posY)); + this.motionZ = (double) ((float) (movingobjectposition.hitVec.zCoord - this.posZ)); + f2 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionY * this.motionY + this.motionZ * this.motionZ); + this.posX -= this.motionX / (double) f2 * 0.05000000074505806D; + this.posY -= this.motionY / (double) f2 * 0.05000000074505806D; + this.posZ -= this.motionZ / (double) f2 * 0.05000000074505806D; + this.playSound("random.bowhit", 1.0F, 1.2F / (this.rand.nextFloat() * 0.2F + 0.9F)); + this.inGround = true; + } + } - this.posX += this.motionX; - this.posY += this.motionY; - this.posZ += this.motionZ; - f2 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); - this.rotationYaw = (float) (Math.atan2(this.motionX, this.motionZ) * 180.0D / Math.PI); + this.posX += this.motionX; + this.posY += this.motionY; + this.posZ += this.motionZ; + f2 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); + this.rotationYaw = (float) (Math.atan2(this.motionX, this.motionZ) * 180.0D / Math.PI); - for (this.rotationPitch = (float) (Math.atan2(this.motionY, (double) f2) * 180.0D / Math.PI); this.rotationPitch - this.prevRotationPitch < -180.0F; this.prevRotationPitch -= 360.0F) { - ; - } + for (this.rotationPitch = (float) (Math.atan2(this.motionY, (double) f2) * 180.0D / Math.PI); this.rotationPitch - this.prevRotationPitch < -180.0F; this.prevRotationPitch -= 360.0F) { + ; + } - while (this.rotationPitch - this.prevRotationPitch >= 180.0F) { - this.prevRotationPitch += 360.0F; - } + while (this.rotationPitch - this.prevRotationPitch >= 180.0F) { + this.prevRotationPitch += 360.0F; + } - while (this.rotationYaw - this.prevRotationYaw < -180.0F) { - this.prevRotationYaw -= 360.0F; - } + while (this.rotationYaw - this.prevRotationYaw < -180.0F) { + this.prevRotationYaw -= 360.0F; + } - while (this.rotationYaw - this.prevRotationYaw >= 180.0F) { - this.prevRotationYaw += 360.0F; - } + while (this.rotationYaw - this.prevRotationYaw >= 180.0F) { + this.prevRotationYaw += 360.0F; + } - this.rotationPitch = this.prevRotationPitch + (this.rotationPitch - this.prevRotationPitch) * 0.2F; - this.rotationYaw = this.prevRotationYaw + (this.rotationYaw - this.prevRotationYaw) * 0.2F; - float f4 = 0.99F; - f1 = 0.05F; + this.rotationPitch = this.prevRotationPitch + (this.rotationPitch - this.prevRotationPitch) * 0.2F; + this.rotationYaw = this.prevRotationYaw + (this.rotationYaw - this.prevRotationYaw) * 0.2F; + float f4 = 0.99F; + f1 = 0.05F; - if (this.isInWater()) { - for (int j1 = 0; j1 < 4; ++j1) { - f3 = 0.25F; - this.worldObj.spawnParticle("bubble", this.posX - this.motionX * (double) f3, this.posY - this.motionY * (double) f3, this.posZ - this.motionZ * (double) f3, this.motionX, this.motionY, this.motionZ); - } + if (this.isInWater()) { + for (int j1 = 0; j1 < 4; ++j1) { + f3 = 0.25F; + this.worldObj.spawnParticle("bubble", this.posX - this.motionX * (double) f3, this.posY - this.motionY * (double) f3, this.posZ - this.motionZ * (double) f3, this.motionX, this.motionY, this.motionZ); + } - f4 = 0.8F; - } + f4 = 0.8F; + } - this.motionX *= (double) f4; - this.motionY *= (double) f4; - this.motionZ *= (double) f4; - this.motionY -= (double) f1; - this.setPosition(this.posX, this.posY, this.posZ); - } - } + this.motionX *= (double) f4; + this.motionY *= (double) f4; + this.motionZ *= (double) f4; + this.motionY -= (double) f1; + this.setPosition(this.posX, this.posY, this.posZ); + } + } - public void writeEntityToNBT(NBTTagCompound par1NBTTagCompound) { - par1NBTTagCompound.setShort("xTile", (short) this.xTile); - par1NBTTagCompound.setShort("yTile", (short) this.yTile); - par1NBTTagCompound.setShort("zTile", (short) this.zTile); - par1NBTTagCompound.setByte("inTile", (byte) Block.getIdFromBlock(this.inTile)); - par1NBTTagCompound.setByte("inData", (byte) this.inData); - par1NBTTagCompound.setByte("inGround", (byte) (this.inGround ? 1 : 0)); - } + public void writeEntityToNBT(NBTTagCompound par1NBTTagCompound) { + par1NBTTagCompound.setShort("xTile", (short) this.xTile); + par1NBTTagCompound.setShort("yTile", (short) this.yTile); + par1NBTTagCompound.setShort("zTile", (short) this.zTile); + par1NBTTagCompound.setByte("inTile", (byte) Block.getIdFromBlock(this.inTile)); + par1NBTTagCompound.setByte("inData", (byte) this.inData); + par1NBTTagCompound.setByte("inGround", (byte) (this.inGround ? 1 : 0)); + } - public void readEntityFromNBT(NBTTagCompound par1NBTTagCompound) { - this.xTile = par1NBTTagCompound.getShort("xTile"); - this.yTile = par1NBTTagCompound.getShort("yTile"); - this.zTile = par1NBTTagCompound.getShort("zTile"); - this.inTile = Block.getBlockById(par1NBTTagCompound.getByte("inTile") & 255); - this.inData = par1NBTTagCompound.getByte("inData") & 255; - this.inGround = par1NBTTagCompound.getByte("inGround") == 1; - } + public void readEntityFromNBT(NBTTagCompound par1NBTTagCompound) { + this.xTile = par1NBTTagCompound.getShort("xTile"); + this.yTile = par1NBTTagCompound.getShort("yTile"); + this.zTile = par1NBTTagCompound.getShort("zTile"); + this.inTile = Block.getBlockById(par1NBTTagCompound.getByte("inTile") & 255); + this.inData = par1NBTTagCompound.getByte("inData") & 255; + this.inGround = par1NBTTagCompound.getByte("inGround") == 1; + } - public void onCollide(Entity par1Entity) { - if (!this.worldObj.isRemote) - ; - { - this.worldObj.createExplosion(this, this.posX, this.posY, this.posZ, 3, true); - } + public void onCollide(Entity par1Entity) { + if (!this.worldObj.isRemote) + ; + { + this.worldObj.createExplosion(this, this.posX, this.posY, this.posZ, 3, true); + } - } + } - @SideOnly(Side.CLIENT) - public float getShadowSize() { - return 0.0F; - } + @SideOnly(Side.CLIENT) + public float getShadowSize() { + return 0.0F; + } } diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/ItemEMTBaubles.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/ItemEMTBaubles.java index 82f11b1..85a0ae1 100644 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/ItemEMTBaubles.java +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/ItemEMTBaubles.java @@ -1,158 +1,211 @@ package electricMagicTools.tombenpotter.electricmagictools.common.items; -import ic2.api.item.ElectricItem; -import ic2.api.item.IElectricItem; - -import java.util.List; - -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; import baubles.api.BaubleType; import baubles.api.IBauble; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import electricMagicTools.tombenpotter.electricmagictools.common.Config; import electricMagicTools.tombenpotter.electricmagictools.common.CreativeTab; +import electricMagicTools.tombenpotter.electricmagictools.common.ElectricMagicTools; +import electricMagicTools.tombenpotter.electricmagictools.common.lib.TextHelper; +import ic2.api.item.ElectricItem; +import ic2.api.item.IElectricItem; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.potion.Potion; +import net.minecraft.potion.PotionEffect; +import net.minecraft.util.ChatComponentText; +import net.minecraft.util.DamageSource; +import net.minecraft.util.IIcon; + +import java.util.List; +import java.util.Random; public class ItemEMTBaubles extends Item implements IBauble { - public IIcon[] icon = new IIcon[16]; + public IIcon[] icon = new IIcon[16]; + public static int wornTick; + public Random random = new Random(); - public ItemEMTBaubles() { - this.setCreativeTab(CreativeTab.tabTombenpotter); - this.setMaxDamage(0); - this.setMaxStackSize(1); - setHasSubtypes(true); - } + public ItemEMTBaubles() { + this.setCreativeTab(CreativeTab.tabTombenpotter); + this.setMaxDamage(0); + this.setMaxStackSize(1); + setHasSubtypes(true); - @Override - public String getUnlocalizedName(ItemStack itemstack) { - String name = ""; - switch (itemstack.getItemDamage()) { - case 0: { - name = "euMaker.armor"; - break; - } - case 1: { - name = "euMaker.inventory"; - break; - } - case 2: { - name = "oneRing"; - break; - } - default: - name = "nothing"; - break; - } - return getUnlocalizedName() + "." + name; - } + wornTick = 0; + } - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister ri) { - this.icon[0] = ri.registerIcon("electricmagictools:armoreumaker"); - this.icon[1] = ri.registerIcon("electricmagictools:inventoryeumaker"); - this.icon[2] = ri.registerIcon("electricmagictools:onering"); - } + @Override + public String getUnlocalizedName(ItemStack itemstack) { + String name = ""; + switch (itemstack.getItemDamage()) { + case 0: { + name = "euMaker.armor"; + break; + } + case 1: { + name = "euMaker.inventory"; + break; + } + case 2: { + name = "oneRing"; + break; + } + default: + name = "nothing"; + break; + } + return getUnlocalizedName() + "." + name; + } - @SideOnly(Side.CLIENT) - public IIcon getIconFromDamage(int meta) { - return this.icon[meta]; - } + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister ri) { + this.icon[0] = ri.registerIcon(ElectricMagicTools.texturePath + ":armoreumaker"); + this.icon[1] = ri.registerIcon(ElectricMagicTools.texturePath + ":inventoryeumaker"); + this.icon[2] = ri.registerIcon(ElectricMagicTools.texturePath + ":onering"); + } - @SuppressWarnings({ "rawtypes", "unchecked" }) - @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List list) { - list.add(new ItemStack(this, 1, 0)); - list.add(new ItemStack(this, 1, 1)); - list.add(new ItemStack(this, 1, 2)); - } + @SideOnly(Side.CLIENT) + public IIcon getIconFromDamage(int meta) { + return this.icon[meta]; + } - @SideOnly(Side.CLIENT) - public boolean hasEffect(ItemStack stack) { - if (stack.getItemDamage() == 2) { - return true; - } else { - return false; - } - } + @SuppressWarnings({"rawtypes", "unchecked"}) + @SideOnly(Side.CLIENT) + public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List list) { + list.add(new ItemStack(this, 1, 0)); + list.add(new ItemStack(this, 1, 1)); + list.add(new ItemStack(this, 1, 2)); + } - @Override - public BaubleType getBaubleType(ItemStack stack) { - if (stack.getItemDamage() <= 2) { - return BaubleType.RING; - } else { - return null; - } - } + @SideOnly(Side.CLIENT) + public boolean hasEffect(ItemStack stack) { + if (stack.getItemDamage() == 2) { + return true; + } else { + return false; + } + } - @Override - public void onWornTick(ItemStack stack, EntityLivingBase player) { - if (stack != null) { - if (stack.getItemDamage() == 0) { - if (player instanceof EntityPlayer) { - int energyLeft = Config.armorBaubleProduction; - for (int i = 0; i < ((EntityPlayer) player).inventory.armorInventory.length; i++) { - if (energyLeft > 0) { - if ((((EntityPlayer) player).inventory.armorInventory[i] != null) && (((EntityPlayer) player).inventory.armorInventory[i].getItem() instanceof IElectricItem)) { - int sentPacket = ElectricItem.manager.charge(((EntityPlayer) player).inventory.armorInventory[i], energyLeft, 4, false, false); - energyLeft -= sentPacket; - } - } - } - } - } - } - if (stack != null) { - if (stack.getItemDamage() == 1) { - if (player instanceof EntityPlayer) { - int energyLeft = Config.inventoryBaubleProdution; - for (int i = 0; i < ((EntityPlayer) player).inventory.mainInventory.length; i++) { - if (energyLeft > 0) { - if ((((EntityPlayer) player).inventory.mainInventory[i] != null) && (((EntityPlayer) player).inventory.mainInventory[i].getItem() instanceof IElectricItem)) { - int sentPacket = ElectricItem.manager.charge(((EntityPlayer) player).inventory.mainInventory[i], energyLeft, 4, false, false); - energyLeft -= sentPacket; - } - } - } - } - } - } + @Override + public BaubleType getBaubleType(ItemStack stack) { + if (stack.getItemDamage() <= 2) { + return BaubleType.RING; + } else { + return null; + } + } - if (stack != null && stack.getItemDamage() == 2) { - if (player instanceof EntityPlayer) { - ((EntityPlayer) player).capabilities.disableDamage = true; - } - } - } + @Override + public void onWornTick(ItemStack stack, EntityLivingBase player) { + if (!player.worldObj.isRemote) { + if (stack != null) { + if (stack.getItemDamage() == 0) { + if (player instanceof EntityPlayer) { + int energyLeft = Config.armorBaubleProduction; + for (int i = 0; i < ((EntityPlayer) player).inventory.armorInventory.length; i++) { + if (energyLeft > 0) { + if ((((EntityPlayer) player).inventory.armorInventory[i] != null) && (((EntityPlayer) player).inventory.armorInventory[i].getItem() instanceof IElectricItem)) { + int sentPacket = ElectricItem.manager.charge(((EntityPlayer) player).inventory.armorInventory[i], energyLeft, 4, false, false); + energyLeft -= sentPacket; + } + } + } + } + } + } + if (stack != null) { + if (stack.getItemDamage() == 1) { + if (player instanceof EntityPlayer) { + int energyLeft = Config.inventoryBaubleProdution; + for (int i = 0; i < ((EntityPlayer) player).inventory.mainInventory.length; i++) { + if (energyLeft > 0) { + if ((((EntityPlayer) player).inventory.mainInventory[i] != null) && (((EntityPlayer) player).inventory.mainInventory[i].getItem() instanceof IElectricItem)) { + int sentPacket = ElectricItem.manager.charge(((EntityPlayer) player).inventory.mainInventory[i], energyLeft, 4, false, false); + energyLeft -= sentPacket; + } + } + } + } + } + } - @Override - public void onEquipped(ItemStack stack, EntityLivingBase player) { - if (stack != null && stack.getItemDamage() == 2) { - player.setInvisible(true); - } - } + if (stack != null && stack.getItemDamage() == 2) { + if (player instanceof EntityPlayer) { + ((EntityPlayer) player).capabilities.disableDamage = true; - @Override - public void onUnequipped(ItemStack stack, EntityLivingBase player) { - if (stack != null && stack.getItemDamage() == 2) { - player.setInvisible(false); - if (player instanceof EntityPlayer) - ((EntityPlayer) player).capabilities.disableDamage = false; - } - } + wornTick++; - @Override - public boolean canEquip(ItemStack stack, EntityLivingBase player) { - return true; - } + NBTTagCompound tag = new NBTTagCompound(); + tag.setInteger("MindCorruption", wornTick); + ((EntityPlayer) player).writeToNBT(tag); + int corruption = tag.getInteger("MindCorruption"); + if (tag != null && corruption != wornTick) { + wornTick = corruption; + } - @Override - public boolean canUnequip(ItemStack stack, EntityLivingBase player) { - return true; - } + if (corruption == 0) + ((EntityPlayer) player).addChatMessage(new ChatComponentText(TextHelper.darkPurple + "You have worn the Ring. Your soul has now been forever " + TextHelper.darkPurple + "tainted. " + TextHelper.darkRed + TextHelper.italics + "Beware of wearing the ring. The tainting will only " + TextHelper.darkRed + TextHelper.italics + "increase, and strange things will start happening.")); + + if (corruption > 6000 && corruption < 24000 && random.nextInt(2000) == 0) + player.addPotionEffect(new PotionEffect(Potion.blindness.id, 500, 2, false)); + + if (corruption >= 6000 && corruption < 24000 && random.nextInt(2000) == 0) + player.addPotionEffect(new PotionEffect(Potion.confusion.id, 500, 2, false)); + + if (corruption >= 24000 && corruption < 72000 && random.nextInt(2000) == 0) { + for (int i = 0; i <= 5; i++) + ((EntityPlayer) player).capabilities.disableDamage = false; + + player.attackEntityFrom(DamageSource.magic, 5); + } + + if (corruption >= 72000 && corruption < 120000 && random.nextInt(4000) == 0) { + for (int i = 0; i <= 100; i++) + ((EntityPlayer) player).capabilities.disableDamage = false; + + player.motionY = 2; + } + + if (corruption >= 120000 && random.nextInt(10000) == 0) { + for (int i = 0; i <= 510; i++) + ((EntityPlayer) player).capabilities.disableDamage = false; + + player.addPotionEffect(new PotionEffect(Potion.wither.id, 5000, 4, false)); + } + } + } + } + } + + @Override + public void onEquipped(ItemStack stack, EntityLivingBase player) { + if (stack != null && stack.getItemDamage() == 2) { + player.setInvisible(true); + } + } + + @Override + public void onUnequipped(ItemStack stack, EntityLivingBase player) { + if (stack != null && stack.getItemDamage() == 2) { + player.setInvisible(false); + if (player instanceof EntityPlayer && !((EntityPlayer) player).capabilities.isCreativeMode) + ((EntityPlayer) player).capabilities.disableDamage = false; + } + } + + @Override + public boolean canEquip(ItemStack stack, EntityLivingBase player) { + return true; + } + + @Override + public boolean canUnequip(ItemStack stack, EntityLivingBase player) { + return true; + } } diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/ItemEMTItems.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/ItemEMTItems.java index 76a8bb5..0ac6a04 100644 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/ItemEMTItems.java +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/ItemEMTItems.java @@ -1,90 +1,215 @@ /******************************************************************************* * Copyright (c) 2014 Tombenpotter. * All rights reserved. - * + * * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * + * * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ package electricMagicTools.tombenpotter.electricmagictools.common.items; -import java.util.List; - -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import electricMagicTools.tombenpotter.electricmagictools.common.CreativeTab; +import electricMagicTools.tombenpotter.electricmagictools.common.ElectricMagicTools; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.effect.EntityLightningBolt; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.potion.PotionEffect; +import net.minecraft.util.IIcon; +import net.minecraft.util.MathHelper; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.MovingObjectPosition.MovingObjectType; +import net.minecraft.util.Vec3; +import net.minecraft.world.World; +import net.minecraftforge.oredict.OreDictionary; +import thaumcraft.common.config.Config; +import thaumcraft.common.lib.InventoryHelper; + +import java.util.List; public class ItemEMTItems extends Item { - public IIcon[] icon = new IIcon[16]; + public IIcon[] icon = new IIcon[500]; - public ItemEMTItems() { - this.setCreativeTab(CreativeTab.tabTombenpotter); - this.setMaxDamage(0); - this.setMaxStackSize(64); - setHasSubtypes(true); - } + public ItemEMTItems() { + this.setCreativeTab(CreativeTab.tabTombenpotter); + this.setMaxDamage(0); + this.setMaxStackSize(64); + setHasSubtypes(true); + OreDictionary.registerOre("plateThaumium", new ItemStack(this, 1, 5)); + OreDictionary.registerOre("slimeball", new ItemStack(this, 1, 8)); + } - @Override - public String getUnlocalizedName(ItemStack itemstack) { - String name = ""; - switch (itemstack.getItemDamage()) { - case 0: { - name = "oreClusterUranium"; - break; - } - case 1: { - name = "crushedOreAmber"; - break; - } - case 2: { - name = "purifiedOreAmber"; - break; - } - case 3: { - name = "crushedOreCinnabar"; - break; - } - case 4: { - name = "purifiedOreCinnabar"; - break; - } - default: - name = "nothing"; - break; - } - return getUnlocalizedName() + "." + name; - } + @Override + public String getUnlocalizedName(ItemStack itemstack) { + String name = ""; + switch (itemstack.getItemDamage()) { + case 0: { + name = "oreClusterUranium"; + break; + } + case 1: { + name = "crushedOreAmber"; + break; + } + case 2: { + name = "purifiedOreAmber"; + break; + } + case 3: { + name = "crushedOreCinnabar"; + break; + } + case 4: { + name = "purifiedOreCinnabar"; + break; + } + case 5: { + name = "thaumiumPlate"; + break; + } + case 6: { + name = "lightningSummoner"; + break; + } + case 7: { + name = "featherMesh"; + break; + } + case 8: { + name = "glue"; + break; + } + case 9: { + name = "ductTape"; + break; + } + case 10: { + name = "rubberBall"; + break; + } + case 11: { + name = "cardboard"; + break; + } + case 12: { + name = "featherGluedCardboardWing"; + break; + } + case 13: { + name = "denseIronSheet"; + break; + } + case 14: { + name = "taintedFeather"; + break; + } + case 15: { + name = "thaumiumWing"; + break; + } + default: + name = "nothing"; + break; + } + return getUnlocalizedName() + "." + name; + } - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister ri) { - this.icon[0] = ri.registerIcon("electricmagictools:clusteruranium"); - this.icon[1] = ri.registerIcon("electricmagictools:crushedamber"); - this.icon[2] = ri.registerIcon("electricmagictools:purifiedamber"); - this.icon[3] = ri.registerIcon("electricmagictools:crushedcinnabar"); - this.icon[4] = ri.registerIcon("electricmagictools:purifiedcinnabar"); - } + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister ri) { + this.icon[0] = ri.registerIcon(ElectricMagicTools.texturePath + ":clusteruranium"); + this.icon[1] = ri.registerIcon(ElectricMagicTools.texturePath + ":crushedamber"); + this.icon[2] = ri.registerIcon(ElectricMagicTools.texturePath + ":purifiedamber"); + this.icon[3] = ri.registerIcon(ElectricMagicTools.texturePath + ":crushedcinnabar"); + this.icon[4] = ri.registerIcon(ElectricMagicTools.texturePath + ":purifiedcinnabar"); + this.icon[5] = ri.registerIcon(ElectricMagicTools.texturePath + ":thaumiumplate"); + this.icon[6] = ri.registerIcon(ElectricMagicTools.texturePath + ":lightningsummoner"); + this.icon[7] = ri.registerIcon(ElectricMagicTools.texturePath + ":feathermesh"); + this.icon[8] = ri.registerIcon(ElectricMagicTools.texturePath + ":glue"); + this.icon[9] = ri.registerIcon(ElectricMagicTools.texturePath + ":ducttape"); + this.icon[10] = ri.registerIcon(ElectricMagicTools.texturePath + ":rubberball"); + this.icon[11] = ri.registerIcon(ElectricMagicTools.texturePath + ":cardboard"); + this.icon[12] = ri.registerIcon(ElectricMagicTools.texturePath + ":feathercarboardwing"); + this.icon[13] = ri.registerIcon(ElectricMagicTools.texturePath + ":denseironsheet"); + this.icon[14] = ri.registerIcon(ElectricMagicTools.texturePath + ":taintedfeather"); + this.icon[15] = ri.registerIcon(ElectricMagicTools.texturePath + ":thaumiumWing"); + } - @SideOnly(Side.CLIENT) - public IIcon getIconFromDamage(int meta) { - return this.icon[meta]; - } + @SideOnly(Side.CLIENT) + public IIcon getIconFromDamage(int meta) { + return this.icon[meta]; + } - @SuppressWarnings({ "rawtypes", "unchecked" }) - @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List list) { - // list.add(new ItemStack(this, 1, 0)); - list.add(new ItemStack(this, 1, 1)); - list.add(new ItemStack(this, 1, 2)); - list.add(new ItemStack(this, 1, 3)); - list.add(new ItemStack(this, 1, 4)); - } + @SuppressWarnings({"rawtypes", "unchecked"}) + @SideOnly(Side.CLIENT) + public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List list) { + for (int i = 1; i <= 15; i++) { + list.add(new ItemStack(this, 1, i)); + } + } + + @Override + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { + if (stack != null && stack.getItemDamage() == 6) { + player.swingItem(); + float f = 1.0F; + float f1 = player.prevRotationPitch + ((player.rotationPitch - player.prevRotationPitch) * f); + float f2 = player.prevRotationYaw + ((player.rotationYaw - player.prevRotationYaw) * f); + double d = player.prevPosX + ((player.posX - player.prevPosX) * f); + double d1 = (player.prevPosY + ((player.posY - player.prevPosY) * f) + 1.6200000000000001D) - player.yOffset; + double d2 = player.prevPosZ + ((player.posZ - player.prevPosZ) * f); + Vec3 vec3d = Vec3.createVectorHelper(d, d1, d2); + float f3 = MathHelper.cos((-f2 * 0.01745329F) - 3.141593F); + float f4 = MathHelper.sin((-f2 * 0.01745329F) - 3.141593F); + float f5 = -MathHelper.cos(-f1 * 0.01745329F); + float f6 = MathHelper.sin(-f1 * 0.01745329F); + float f7 = f4 * f5; + float f8 = f6; + float f9 = f3 * f5; + double d3 = 5000D; + Vec3 vec3d1 = vec3d.addVector(f7 * d3, f8 * d3, f9 * d3); + MovingObjectPosition movingobjectposition = player.worldObj.rayTraceBlocks(vec3d, vec3d1, true); + if (movingobjectposition == null) { + return stack; + } + if (movingobjectposition.typeOfHit == MovingObjectType.BLOCK) { + int i = movingobjectposition.blockX; + int j = movingobjectposition.blockY; + int k = movingobjectposition.blockZ; + world.spawnEntityInWorld(new EntityLightningBolt(world, i, j, k)); + } else if (movingobjectposition.typeOfHit == MovingObjectType.ENTITY) { + Entity entityhit = movingobjectposition.entityHit; + double x = entityhit.posX; + double y = entityhit.posY; + double z = entityhit.posZ; + world.spawnEntityInWorld(new EntityLightningBolt(world, x, y, z)); + } + if (player.capabilities.isCreativeMode) { + return stack; + } else { + player.inventory.consumeInventoryItem(this); + return stack; + } + } + return stack; + } + + public void onUpdate(ItemStack stack, World world, Entity entity, int par4, boolean par5) { + super.onUpdate(stack, world, entity, par4, par5); + if ((!entity.worldObj.isRemote) && ((stack.getItemDamage() == 14)) && ((entity instanceof EntityLivingBase)) && (!((EntityLivingBase) entity).isEntityUndead()) && (!((EntityLivingBase) entity).isPotionActive(Config.potionFluxTaintID)) && (world.rand.nextInt(4321) <= stack.stackSize)) { + ((EntityLivingBase) entity).addPotionEffect(new PotionEffect(Config.potionFluxTaintID, 120, 0, false)); + if ((entity instanceof EntityPlayer)) { + InventoryHelper.consumeInventoryItem((EntityPlayer) entity, stack.getItem(), stack.getItemDamage()); + } + } + } } diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/ItemElectricScribingTools.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/ItemElectricScribingTools.java index a83a43e..6815fa5 100644 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/ItemElectricScribingTools.java +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/ItemElectricScribingTools.java @@ -1,81 +1,80 @@ /******************************************************************************* * Copyright (c) 2014 Tombenpotter. * All rights reserved. - * + * * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * + * * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ package electricMagicTools.tombenpotter.electricmagictools.common.items; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import electricMagicTools.tombenpotter.electricmagictools.common.CreativeTab; import ic2.api.item.ElectricItem; import ic2.api.item.IElectricItem; - -import java.util.List; - import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import thaumcraft.api.IScribeTools; import thaumcraft.common.items.ItemInkwell; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import electricMagicTools.tombenpotter.electricmagictools.common.CreativeTab; + +import java.util.List; public class ItemElectricScribingTools extends ItemInkwell implements IElectricItem, IScribeTools { - public static int maxCharge = 400; + public static int maxCharge = 400; - public ItemElectricScribingTools() { - this.setCreativeTab(CreativeTab.tabTombenpotter); - this.setMaxDamage(400); - this.setMaxStackSize(1); - } + public ItemElectricScribingTools() { + this.setCreativeTab(CreativeTab.tabTombenpotter); + this.setMaxDamage(400); + this.setMaxStackSize(1); + } - @Override - public boolean canProvideEnergy(ItemStack itemStack) { - return false; - } + @Override + public boolean canProvideEnergy(ItemStack itemStack) { + return false; + } - @Override - public int getMaxCharge(ItemStack itemStack) { - return maxCharge; - } + @Override + public int getMaxCharge(ItemStack itemStack) { + return maxCharge; + } - @Override - public int getTier(ItemStack itemStack) { - return 1; - } + @Override + public int getTier(ItemStack itemStack) { + return 1; + } - @Override - public int getTransferLimit(ItemStack itemStack) { - return 5; - } + @Override + public int getTransferLimit(ItemStack itemStack) { + return 5; + } - @SuppressWarnings({ "rawtypes", "unchecked" }) - @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { - ItemStack itemStack = new ItemStack(this, 1); - if (getChargedItem(itemStack) == this) { - ItemStack charged = new ItemStack(this, 1); - ElectricItem.manager.charge(charged, 2147483647, 2147483647, true, false); - itemList.add(charged); - } - if (getEmptyItem(itemStack) == this) { - itemList.add(new ItemStack(this, 1, getMaxDamage())); - } - } + @SuppressWarnings({"rawtypes", "unchecked"}) + @SideOnly(Side.CLIENT) + public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { + ItemStack itemStack = new ItemStack(this, 1); + if (getChargedItem(itemStack) == this) { + ItemStack charged = new ItemStack(this, 1); + ElectricItem.manager.charge(charged, 2147483647, 2147483647, true, false); + itemList.add(charged); + } + if (getEmptyItem(itemStack) == this) { + itemList.add(new ItemStack(this, 1, getMaxDamage())); + } + } - @Override - public Item getChargedItem(ItemStack itemStack) { - return this; - } + @Override + public Item getChargedItem(ItemStack itemStack) { + return this; + } - @Override - public Item getEmptyItem(ItemStack itemStack) { - return this; - } + @Override + public Item getEmptyItem(ItemStack itemStack) { + return this; + } } diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/ItemLightningSummoner.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/ItemLightningSummoner.java deleted file mode 100644 index 3818ffe..0000000 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/ItemLightningSummoner.java +++ /dev/null @@ -1,85 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ -package electricMagicTools.tombenpotter.electricmagictools.common.items; - -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.Entity; -import net.minecraft.entity.effect.EntityLightningBolt; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.MathHelper; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.MovingObjectPosition.MovingObjectType; -import net.minecraft.util.Vec3; -import net.minecraft.world.World; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import electricMagicTools.tombenpotter.electricmagictools.common.CreativeTab; - -public class ItemLightningSummoner extends Item { - - public ItemLightningSummoner() { - this.setCreativeTab(CreativeTab.tabTombenpotter); - this.setMaxDamage(1); - this.setMaxStackSize(64); - } - - @SideOnly(Side.CLIENT) - @Override - public void registerIcons(IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon("electricmagictools:lightningsummoner"); - } - - @Override - public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer player) { - player.swingItem(); - float f = 1.0F; - float f1 = player.prevRotationPitch + ((player.rotationPitch - player.prevRotationPitch) * f); - float f2 = player.prevRotationYaw + ((player.rotationYaw - player.prevRotationYaw) * f); - double d = player.prevPosX + ((player.posX - player.prevPosX) * f); - double d1 = (player.prevPosY + ((player.posY - player.prevPosY) * f) + 1.6200000000000001D) - player.yOffset; - double d2 = player.prevPosZ + ((player.posZ - player.prevPosZ) * f); - Vec3 vec3d = Vec3.createVectorHelper(d, d1, d2); - float f3 = MathHelper.cos((-f2 * 0.01745329F) - 3.141593F); - float f4 = MathHelper.sin((-f2 * 0.01745329F) - 3.141593F); - float f5 = -MathHelper.cos(-f1 * 0.01745329F); - float f6 = MathHelper.sin(-f1 * 0.01745329F); - float f7 = f4 * f5; - float f8 = f6; - float f9 = f3 * f5; - double d3 = 5000D; - Vec3 vec3d1 = vec3d.addVector(f7 * d3, f8 * d3, f9 * d3); - MovingObjectPosition movingobjectposition = player.worldObj.rayTraceBlocks(vec3d, vec3d1, true); - if (movingobjectposition == null) { - return itemstack; - } - if (movingobjectposition.typeOfHit == MovingObjectType.BLOCK) { - int i = movingobjectposition.blockX; - int j = movingobjectposition.blockY; - int k = movingobjectposition.blockZ; - world.spawnEntityInWorld(new EntityLightningBolt(world, i, j, k)); - } else if (movingobjectposition.typeOfHit == MovingObjectType.ENTITY) { - Entity entityhit = movingobjectposition.entityHit; - double x = entityhit.posX; - double y = entityhit.posY; - double z = entityhit.posZ; - world.spawnEntityInWorld(new EntityLightningBolt(world, x, y, z)); - } - if (player.capabilities.isCreativeMode) { - return itemstack; - } else { - itemstack.damageItem(2, player); - return itemstack; - } - } -} diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/ItemThaumiumPlate.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/ItemThaumiumPlate.java deleted file mode 100644 index 42b71f8..0000000 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/ItemThaumiumPlate.java +++ /dev/null @@ -1,35 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ -package electricMagicTools.tombenpotter.electricmagictools.common.items; - -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.item.Item; -import net.minecraftforge.oredict.OreDictionary; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import electricMagicTools.tombenpotter.electricmagictools.common.CreativeTab; - -public class ItemThaumiumPlate extends Item { - - public ItemThaumiumPlate() { - this.setCreativeTab(CreativeTab.tabTombenpotter); - this.setMaxDamage(0); - this.setMaxStackSize(64); - OreDictionary.registerOre("plateThaumium", this); - } - - @SideOnly(Side.CLIENT) - @Override - public void registerIcons(IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon("electricmagictools:thaumiumplate"); - } -} diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/armor/ItemElectricBootsTraveller.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/armor/ItemElectricBootsTraveller.java deleted file mode 100644 index acfd69a..0000000 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/armor/ItemElectricBootsTraveller.java +++ /dev/null @@ -1,261 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - * - * Attention: this class originally belongs to the ThaumicTinkerer mod. - * All I did was modifying it to fulfill my needs. - * - * ThaumicTinkerer is Open Source and distributed under a - * Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License - * (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB) - * - * http://www.minecraftforum.net/topic/1813058- - ******************************************************************************/ -package electricMagicTools.tombenpotter.electricmagictools.common.items.armor; - -import ic2.api.item.ElectricItem; -import ic2.api.item.IElectricItem; -import ic2.api.item.IMetalArmor; - -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemArmor; -import net.minecraft.item.ItemStack; -import net.minecraft.util.DamageSource; -import net.minecraft.world.World; -import net.minecraftforge.common.ISpecialArmor; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.entity.living.LivingEvent.LivingJumpEvent; -import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; -import thaumcraft.api.IVisDiscountGear; -import thaumcraft.api.aspects.Aspect; -import thaumcraft.common.Thaumcraft; -import cpw.mods.fml.common.eventhandler.EventPriority; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import electricMagicTools.tombenpotter.electricmagictools.common.Config; -import electricMagicTools.tombenpotter.electricmagictools.common.CreativeTab; - -public class ItemElectricBootsTraveller extends ItemArmor implements IElectricItem, IVisDiscountGear, IMetalArmor, ISpecialArmor { - - public int maxCharge = 10000; - @SuppressWarnings({ "unchecked", "rawtypes" }) - public static List playersWith1Step = new ArrayList(); - - public ItemElectricBootsTraveller(int par3, int par4) { - super(ArmorMaterial.DIAMOND, par3, par4); - this.setMaxDamage(27); - this.setMaxStackSize(1); - this.setCreativeTab(CreativeTab.tabTombenpotter); - if (ticks()) - MinecraftForge.EVENT_BUS.register(this); - } - - @SuppressWarnings({ "rawtypes", "unchecked" }) - @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { - ItemStack itemStack = new ItemStack(this, 1); - if (getChargedItem(itemStack) == this) { - ItemStack charged = new ItemStack(this, 1); - ElectricItem.manager.charge(charged, 2147483647, 2147483647, true, false); - itemList.add(charged); - } - if (getEmptyItem(itemStack) == this) { - itemList.add(new ItemStack(this, 1, getMaxDamage())); - } - } - - @SideOnly(Side.CLIENT) - @Override - public void registerIcons(IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon("electricmagictools:electricboots"); - } - - @Override - public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) { - return "electricmagictools:textures/models/electricboots.png"; - } - - boolean ticks() { - return true; - } - - @SubscribeEvent - public void onEntityUpdate(LivingUpdateEvent event) { - if (event.entityLiving instanceof EntityPlayer) { - EntityPlayer player = (EntityPlayer) event.entityLiving; - ItemStack armor = player.getCurrentArmor(3 - armorType); - if (armor != null && armor.getItem() == this) - tickPlayer(player); - } - } - - void tickPlayer(EntityPlayer player) { - if (player.worldObj.isRemote) - player.stepHeight = player.isSneaking() ? 0.5F : 1F; - if ((player.onGround || player.capabilities.isFlying) && player.moveForward > 0F) - player.moveFlying(0F, 1F, player.capabilities.isFlying ? 0.075F : 0.15F); - player.jumpMovementFactor = player.isSprinting() ? 0.05F : 0.04F; - player.fallDistance = 0F; - } - - @SubscribeEvent - public void onPlayerJump(LivingJumpEvent event) { - if (event.entityLiving instanceof EntityPlayer) { - EntityPlayer player = (EntityPlayer) event.entityLiving; - boolean hasArmor = player.getCurrentArmor(0) != null && player.getCurrentArmor(0).getItem() == this; - - if (hasArmor) - player.motionY += 0.3; - } - } - - @SubscribeEvent(priority = EventPriority.HIGH) - public void onLivingUpdate(LivingUpdateEvent event) { - if (event.entityLiving instanceof EntityPlayer && event.entityLiving.worldObj.isRemote) { - EntityPlayer player = (EntityPlayer) event.entityLiving; - - boolean highStepListed = playersWith1Step.contains(player.getCommandSenderName()); - boolean hasHighStep = player.getCurrentArmor(0) != null && player.getCurrentArmor(0).getItem() == this; - - if (hasHighStep && !highStepListed) - playersWith1Step.add(player.getCommandSenderName()); - - if (!hasHighStep && highStepListed) { - playersWith1Step.remove(player.getCommandSenderName()); - player.stepHeight = 0.5F; - } - } - } - - @Override - public boolean isMetalArmor(ItemStack itemstack, EntityPlayer player) { - return true; - } - - @Override - public boolean canProvideEnergy(ItemStack itemStack) { - return false; - } - - @Override - public int getMaxCharge(ItemStack itemStack) { - return maxCharge; - } - - @Override - public int getTier(ItemStack itemStack) { - return 2; - } - - @Override - public int getTransferLimit(ItemStack itemStack) { - return 100; - } - - @Override - public boolean isRepairable() { - return false; - } - - @Override - public int getItemEnchantability() { - if (Config.enchanting == false) { - return 0; - } else { - return 4; - } - } - - @Override - public boolean isBookEnchantable(ItemStack itemstack1, ItemStack itemstack2) { - if (Config.enchanting == false) { - return false; - } else { - return true; - } - } - - public int getEnergyPerDamage() { - return 100; - } - - @Override - public ArmorProperties getProperties(EntityLivingBase player, ItemStack armor, DamageSource source, double damage, int slot) { - if (source.isUnblockable()) { - return new net.minecraftforge.common.ISpecialArmor.ArmorProperties(0, 0.0D, 3); - } else { - double absorptionRatio = getBaseAbsorptionRatio() * getDamageAbsorptionRatio(); - int energyPerDamage = getEnergyPerDamage(); - int damageLimit = energyPerDamage <= 0 ? 0 : (25 * ElectricItem.manager.getCharge(armor)) / energyPerDamage; - return new net.minecraftforge.common.ISpecialArmor.ArmorProperties(3, absorptionRatio, damageLimit); - } - } - - @Override - public int getArmorDisplay(EntityPlayer player, ItemStack armor, int slot) { - if (ElectricItem.manager.getCharge(armor) >= getEnergyPerDamage()) { - return (int) Math.round(20D * getBaseAbsorptionRatio() * getDamageAbsorptionRatio()); - } else { - return 0; - } - } - - @Override - public void damageArmor(EntityLivingBase entity, ItemStack stack, DamageSource source, int damage, int slot) { - ElectricItem.manager.discharge(stack, damage * getEnergyPerDamage(), 0x7fffffff, true, false); - } - - public double getDamageAbsorptionRatio() { - return 1.1000000000000001D; - } - - private double getBaseAbsorptionRatio() { - return 0.14999999999999999D; - } - - @SuppressWarnings({ "unchecked", "rawtypes" }) - @Override - public void addInformation(ItemStack stack, EntityPlayer par2EntityPlayer, List list, boolean par4) { - list.add("Vis discount: 2%"); - } - - @Override - public int getVisDiscount(ItemStack stack, EntityPlayer player, Aspect aspect) { - return 2; - } - - @Override - public void onArmorTick(World world, EntityPlayer player, ItemStack itemStack) { - if (Config.smoke == false && player.onGround == false) { - int miny = (int) (player.boundingBox.minY - 2.0D); - Thaumcraft.proxy.smokeSpiral(player.worldObj, player.posX, player.boundingBox.minY + player.height / 2.0F, player.posZ, 1.5F, player.worldObj.rand.nextInt(620), miny); - } - } - - @Override - public Item getChargedItem(ItemStack itemStack) { - return this; - } - - @Override - public Item getEmptyItem(ItemStack itemStack) { - return this; - } - -} diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/armor/ItemElectricGoggles.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/armor/ItemElectricGoggles.java deleted file mode 100644 index 9eebe28..0000000 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/armor/ItemElectricGoggles.java +++ /dev/null @@ -1,72 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ -package electricMagicTools.tombenpotter.electricmagictools.common.items.armor; - -import java.util.List; - -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; -import thaumcraft.api.aspects.Aspect; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -public class ItemElectricGoggles extends ItemQuantumThaumicHelmet { - - public int maxCharge = 10000; - - public ItemElectricGoggles(int par3, int par4) { - super(par3, par4); - } - - @SideOnly(Side.CLIENT) - @Override - public void registerIcons(IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon("electricmagictools:electricgoggles"); - } - - @Override - public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) { - return "electricmagictools:textures/models/electricgoggles.png"; - } - - @Override - public int getVisDiscount(ItemStack stack, EntityPlayer player, Aspect aspect) { - return 5; - } - - @Override - public int getMaxCharge(ItemStack itemStack) { - return maxCharge; - } - - public int getEnergyPerDamage() { - return 100; - } - - @Override - public void onArmorTick(World world, EntityPlayer player, ItemStack itemStack) { - } - - @Override - public int getTransferLimit(ItemStack itemStack) { - return 10; - } - - @SuppressWarnings({ "rawtypes", "unchecked" }) - @Override - public void addInformation(ItemStack stack, EntityPlayer par2EntityPlayer, List list, boolean par4) { - list.add("Vis discount: 5%"); - } -} diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/armor/ItemNanoBootsTraveller.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/armor/ItemNanoBootsTraveller.java deleted file mode 100644 index 737b248..0000000 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/armor/ItemNanoBootsTraveller.java +++ /dev/null @@ -1,102 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - * - * Attention: this class originally belongs to the ThaumicTinkerer mod. - * All I did was modifying it to fulfill my needs. - * - * ThaumicTinkerer is Open Source and distributed under a - * Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License - * (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB) - * - * http://www.minecraftforum.net/topic/1813058- - ******************************************************************************/ -package electricMagicTools.tombenpotter.electricmagictools.common.items.armor; - -import java.util.List; - -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraftforge.event.entity.living.LivingEvent.LivingJumpEvent; -import thaumcraft.api.aspects.Aspect; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import electricMagicTools.tombenpotter.electricmagictools.common.Config; - -public class ItemNanoBootsTraveller extends ItemElectricBootsTraveller { - - public int maxCharge = 500000; - - public ItemNanoBootsTraveller(int par3, int par4) { - super(par3, par4); - } - - @SideOnly(Side.CLIENT) - @Override - public void registerIcons(IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon("electricmagictools:nanobootstravel"); - } - - @Override - public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) { - return "electricmagictools:textures/models/nanobootstravel.png"; - } - - @Override - public int getVisDiscount(ItemStack stack, EntityPlayer player, Aspect aspect) { - return 4; - } - - @Override - void tickPlayer(EntityPlayer player) { - if (player.worldObj.isRemote) - player.stepHeight = player.isSneaking() ? 0.5F : 1F; - if ((player.onGround || player.capabilities.isFlying) && player.moveForward > 0F) - player.moveFlying(0F, 1F, (float) (player.capabilities.isFlying ? 0.075F : Config.nanoBootsSpeed)); - player.jumpMovementFactor = player.isSprinting() ? 0.05F : 0.04F; - player.fallDistance = 0F; - } - - @SubscribeEvent - @Override - public void onPlayerJump(LivingJumpEvent event) { - if (event.entityLiving instanceof EntityPlayer) { - EntityPlayer player = (EntityPlayer) event.entityLiving; - boolean hasArmor = player.getCurrentArmor(0) != null && player.getCurrentArmor(0).getItem() == this; - - if (hasArmor) { - player.motionY += Config.nanoBootsJump; - } - } - } - - @Override - public int getMaxCharge(ItemStack itemStack) { - return maxCharge; - } - - @Override - public int getTransferLimit(ItemStack itemStack) { - return 1000; - } - - public int getEnergyPerDamage() { - return 200; - } - - @SuppressWarnings({ "rawtypes", "unchecked" }) - @Override - public void addInformation(ItemStack stack, EntityPlayer par2EntityPlayer, List list, boolean par4) { - list.add("Vis discount: 4%"); - } -} diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/armor/ItemNanoThaumicHelmet.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/armor/ItemNanoThaumicHelmet.java deleted file mode 100644 index dd827a8..0000000 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/armor/ItemNanoThaumicHelmet.java +++ /dev/null @@ -1,97 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ -package electricMagicTools.tombenpotter.electricmagictools.common.items.armor; - -import ic2.api.item.ElectricItem; - -import java.util.List; - -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.potion.Potion; -import net.minecraft.potion.PotionEffect; -import net.minecraft.util.MathHelper; -import net.minecraft.world.World; -import thaumcraft.api.aspects.Aspect; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import electricMagicTools.tombenpotter.electricmagictools.common.Config; -import electricMagicTools.tombenpotter.electricmagictools.common.CreativeTab; - -public class ItemNanoThaumicHelmet extends ItemQuantumThaumicHelmet { - - public int maxCharge = 100000; - - public ItemNanoThaumicHelmet(int par3, int par4) { - super(par3, par4); - this.setCreativeTab(CreativeTab.tabTombenpotter); - this.setMaxDamage(27); - this.setMaxStackSize(1); - } - - @SideOnly(Side.CLIENT) - @Override - public void registerIcons(IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon("electricmagictools:nanothaumichelmet"); - } - - @Override - public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) { - return "electricmagictools:textures/models/thaumicnanohelmet.png"; - } - - @Override - public int getVisDiscount(ItemStack stack, EntityPlayer player, Aspect aspect) { - return 6; - } - - @Override - public int getMaxCharge(ItemStack itemStack) { - return maxCharge; - } - - public int getEnergyPerDamage() { - return 1000; - } - - @Override - public void onArmorTick(World world, EntityPlayer player, ItemStack itemStack) { - if (Config.nightVisionOff == false) { - if (ElectricItem.manager.canUse(itemStack, 1 / 1000)) { - - int x = MathHelper.floor_double(player.posX); - int z = MathHelper.floor_double(player.posZ); - int y = MathHelper.floor_double(player.posY); - - int lightlevel = player.worldObj.getBlockLightValue(x, y, z); - if (lightlevel >= 0) - player.addPotionEffect(new PotionEffect(Potion.nightVision.id, 300, -3)); - ElectricItem.manager.use(itemStack, 1 / 1000, player); - } else { - player.addPotionEffect(new PotionEffect(Potion.blindness.id, 300, 0, true)); - } - } - } - - @Override - public int getTransferLimit(ItemStack itemStack) { - return 100; - } - - @SuppressWarnings({ "unchecked", "rawtypes" }) - @Override - public void addInformation(ItemStack stack, EntityPlayer par2EntityPlayer, List list, boolean par4) { - list.add("Vis discount: 6%"); - } -} diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/armor/ItemQuantumBootsTraveller.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/armor/ItemQuantumBootsTraveller.java deleted file mode 100644 index f8b36ab..0000000 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/armor/ItemQuantumBootsTraveller.java +++ /dev/null @@ -1,102 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - * - * Attention: this class originally belongs to the ThaumicTinkerer mod. - * All I did was modifying it to fulfill my needs. - * - * ThaumicTinkerer is Open Source and distributed under a - * Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License - * (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB) - * - * http://www.minecraftforum.net/topic/1813058- - ******************************************************************************/ -package electricMagicTools.tombenpotter.electricmagictools.common.items.armor; - -import java.util.List; - -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraftforge.event.entity.living.LivingEvent.LivingJumpEvent; -import thaumcraft.api.aspects.Aspect; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import electricMagicTools.tombenpotter.electricmagictools.common.Config; - -public class ItemQuantumBootsTraveller extends ItemElectricBootsTraveller { - - public int maxCharge = 1000000; - - public ItemQuantumBootsTraveller(int par3, int par4) { - super(par3, par4); - } - - @SideOnly(Side.CLIENT) - @Override - public void registerIcons(IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon("electricmagictools:quantumbootstravel"); - } - - @Override - public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) { - return "electricmagictools:textures/models/quantumbootstravel.png"; - } - - @Override - public int getVisDiscount(ItemStack stack, EntityPlayer player, Aspect aspect) { - return 5; - } - - @Override - void tickPlayer(EntityPlayer player) { - if (player.worldObj.isRemote) - player.stepHeight = player.isSneaking() ? 0.5F : 1F; - if ((player.onGround || player.capabilities.isFlying) && player.moveForward > 0F) - player.moveFlying(0F, 1F, (float) (player.capabilities.isFlying ? 0.075F : Config.quantumBootsSpeed)); - player.jumpMovementFactor = player.isSprinting() ? 0.05F : 0.04F; - player.fallDistance = 0F; - } - - @SubscribeEvent - @Override - public void onPlayerJump(LivingJumpEvent event) { - if (event.entityLiving instanceof EntityPlayer) { - EntityPlayer player = (EntityPlayer) event.entityLiving; - boolean hasArmor = player.getCurrentArmor(0) != null && player.getCurrentArmor(0).getItem() == this; - - if (hasArmor) { - player.motionY += Config.quantumBootsJump; - } - } - } - - @Override - public int getMaxCharge(ItemStack itemStack) { - return maxCharge; - } - - @Override - public int getTransferLimit(ItemStack itemStack) { - return 1000; - } - - public int getEnergyPerDamage() { - return 200; - } - - @SuppressWarnings({ "rawtypes", "unchecked" }) - @Override - public void addInformation(ItemStack stack, EntityPlayer par2EntityPlayer, List list, boolean par4) { - list.add("Vis discount: 5%"); - } -} diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/armor/ItemQuantumThaumicHelmet.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/armor/ItemQuantumThaumicHelmet.java deleted file mode 100644 index 8e8b915..0000000 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/armor/ItemQuantumThaumicHelmet.java +++ /dev/null @@ -1,250 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ -package electricMagicTools.tombenpotter.electricmagictools.common.items.armor; - -import ic2.api.item.ElectricItem; -import ic2.api.item.IElectricItem; -import ic2.api.item.IMetalArmor; - -import java.util.HashMap; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; - -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Items; -import net.minecraft.item.Item; -import net.minecraft.item.ItemArmor; -import net.minecraft.item.ItemStack; -import net.minecraft.potion.Potion; -import net.minecraft.potion.PotionEffect; -import net.minecraft.util.DamageSource; -import net.minecraft.util.MathHelper; -import net.minecraft.world.World; -import net.minecraftforge.common.ISpecialArmor; -import thaumcraft.api.IGoggles; -import thaumcraft.api.IVisDiscountGear; -import thaumcraft.api.aspects.Aspect; -import thaumcraft.api.nodes.IRevealer; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import electricMagicTools.tombenpotter.electricmagictools.common.Config; -import electricMagicTools.tombenpotter.electricmagictools.common.CreativeTab; - -public class ItemQuantumThaumicHelmet extends ItemArmor implements IElectricItem, IVisDiscountGear, IGoggles, IRevealer, IMetalArmor, ISpecialArmor { - @SuppressWarnings({ "unchecked", "rawtypes" }) - private static final Map potionCost = new HashMap(); - - public ItemQuantumThaumicHelmet(int par3, int par4) { - super(ArmorMaterial.DIAMOND, par3, par4); - this.setCreativeTab(CreativeTab.tabTombenpotter); - this.setMaxDamage(27); - this.setMaxStackSize(1); - - potionCost.put(Integer.valueOf(Potion.poison.id), Integer.valueOf(10000)); - potionCost.put(Integer.valueOf(Potion.wither.id), Integer.valueOf(15000)); - potionCost.put(Integer.valueOf(Potion.confusion.id), Integer.valueOf(5000)); - } - - public int maxCharge = 10000000; - - @SideOnly(Side.CLIENT) - @Override - public void registerIcons(IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon("electricmagictools:quantumthaumichelmet"); - } - - @Override - public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) { - return "electricmagictools:textures/models/thaumicquantumhelmet.png"; - } - - @Override - public boolean canProvideEnergy(ItemStack itemStack) { - return false; - } - - @Override - public int getMaxCharge(ItemStack itemStack) { - return maxCharge; - } - - @Override - public int getTier(ItemStack itemStack) { - return 2; - } - - @SuppressWarnings({ "rawtypes", "unchecked" }) - @Override - public void onArmorTick(World world, EntityPlayer player, ItemStack itemStack) { - int refill = player.getAir(); - if (ElectricItem.manager.canUse(itemStack, 1000) && refill < 100) { - player.setAir(refill + 200); - ElectricItem.manager.use(itemStack, 1000, null); - } - - Iterator i$ = (new LinkedList(player.getActivePotionEffects())).iterator(); - do { - if (!i$.hasNext()) { - break; - } - { - PotionEffect effect = (PotionEffect) i$.next(); - int id = effect.getPotionID(); - Integer cost = (Integer) potionCost.get(Integer.valueOf(id)); - if (cost != null) { - cost = Integer.valueOf(cost.intValue() * (effect.getAmplifier() + 1)); - if (ElectricItem.manager.canUse(itemStack, cost.intValue())) { - ElectricItem.manager.use(itemStack, cost.intValue(), null); - ItemStack milk = (new ItemStack(Items.milk_bucket)); - player.curePotionEffects(milk); - } - } - } - } while (true); - - if (Config.nightVisionOff == false) { - if (ElectricItem.manager.canUse(itemStack, 1 / 1000)) { - int x = MathHelper.floor_double(player.posX); - int z = MathHelper.floor_double(player.posZ); - int y = MathHelper.floor_double(player.posY); - int lightlevel = player.worldObj.getBlockLightValue(x, y, z); - if (lightlevel >= 0) - player.addPotionEffect(new PotionEffect(Potion.nightVision.id, 300, -3)); - ElectricItem.manager.use(itemStack, 1 / 1000, player); - } else { - player.addPotionEffect(new PotionEffect(Potion.blindness.id, 300, 0, true)); - } - } - } - - @Override - public int getTransferLimit(ItemStack itemStack) { - return 10000; - } - - @SuppressWarnings({ "rawtypes", "unchecked" }) - @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { - ItemStack itemStack = new ItemStack(this, 1); - if (getChargedItem(itemStack) == this) { - ItemStack charged = new ItemStack(this, 1); - ElectricItem.manager.charge(charged, 2147483647, 2147483647, true, false); - itemList.add(charged); - } - if (getEmptyItem(itemStack) == this) { - itemList.add(new ItemStack(this, 1, getMaxDamage())); - } - } - - @Override - public boolean isRepairable() { - return false; - } - - @Override - public int getItemEnchantability() { - if (Config.enchanting == false) { - return 0; - } else { - return 4; - } - } - - @Override - public boolean isBookEnchantable(ItemStack itemstack1, ItemStack itemstack2) { - if (Config.enchanting == false) { - return false; - } else { - return true; - } - } - - @SuppressWarnings({ "rawtypes", "unchecked" }) - @Override - public void addInformation(ItemStack stack, EntityPlayer par2EntityPlayer, List list, boolean par4) { - list.add("Vis discount: 8%"); - } - - @Override - public int getVisDiscount(ItemStack stack, EntityPlayer player, Aspect aspect) { - return 8; - } - - @Override - public boolean showNodes(ItemStack itemstack, EntityLivingBase player) { - return true; - } - - @Override - public boolean showIngamePopups(ItemStack itemstack, EntityLivingBase player) { - return true; - } - - @Override - public boolean isMetalArmor(ItemStack itemstack, EntityPlayer player) { - return true; - } - - @Override - public ArmorProperties getProperties(EntityLivingBase player, ItemStack armor, DamageSource source, double damage, int slot) { - if (source.isUnblockable()) { - return new net.minecraftforge.common.ISpecialArmor.ArmorProperties(0, 0.0D, 0); - } else { - double absorptionRatio = getBaseAbsorptionRatio() * getDamageAbsorptionRatio(); - int energyPerDamage = getEnergyPerDamage(); - int damageLimit = energyPerDamage <= 0 ? 0 : (25 * ElectricItem.manager.getCharge(armor)) / energyPerDamage; - return new net.minecraftforge.common.ISpecialArmor.ArmorProperties(0, absorptionRatio, damageLimit); - } - } - - @Override - public int getArmorDisplay(EntityPlayer player, ItemStack armor, int slot) { - if (ElectricItem.manager.getCharge(armor) >= getEnergyPerDamage()) { - return (int) Math.round(20D * getBaseAbsorptionRatio() * getDamageAbsorptionRatio()); - } else { - return 0; - } - } - - @Override - public void damageArmor(EntityLivingBase entity, ItemStack stack, DamageSource source, int damage, int slot) { - ElectricItem.manager.discharge(stack, damage * getEnergyPerDamage(), 0x7fffffff, true, false); - } - - public double getDamageAbsorptionRatio() { - return 1.1000000000000001D; - } - - public int getEnergyPerDamage() { - return 10000; - } - - private double getBaseAbsorptionRatio() { - return 0.14999999999999999D; - } - - @Override - public Item getChargedItem(ItemStack itemStack) { - return this; - } - - @Override - public Item getEmptyItem(ItemStack itemStack) { - return this; - } -} diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/armor/ItemSolarHelmetRevealing.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/armor/ItemSolarHelmetRevealing.java deleted file mode 100644 index ea09d88..0000000 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/armor/ItemSolarHelmetRevealing.java +++ /dev/null @@ -1,319 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ -package electricMagicTools.tombenpotter.electricmagictools.common.items.armor; - -import ic2.api.item.ElectricItem; -import ic2.api.item.IElectricItem; - -import java.util.HashMap; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; - -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Items; -import net.minecraft.item.Item; -import net.minecraft.item.ItemArmor; -import net.minecraft.item.ItemStack; -import net.minecraft.potion.Potion; -import net.minecraft.potion.PotionEffect; -import net.minecraft.util.DamageSource; -import net.minecraft.util.MathHelper; -import net.minecraft.world.World; -import net.minecraftforge.common.ISpecialArmor; -import thaumcraft.api.IGoggles; -import thaumcraft.api.IVisDiscountGear; -import thaumcraft.api.aspects.Aspect; -import thaumcraft.api.nodes.IRevealer; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import electricMagicTools.tombenpotter.electricmagictools.common.Config; -import electricMagicTools.tombenpotter.electricmagictools.common.CreativeTab; - -public class ItemSolarHelmetRevealing extends ItemArmor implements ISpecialArmor, IRevealer, IVisDiscountGear, IGoggles, IElectricItem { - - public int maxCharge = 10000000; - private int ticker; - private int generating; - private int genDay; - private int genNight; - private boolean sunIsUp; - private boolean skyIsVisible; - private boolean noSunWorld; - private boolean dampPlace; - - @SuppressWarnings("rawtypes") - private static final Map potionCost = new HashMap(); - - @SuppressWarnings("unchecked") - public ItemSolarHelmetRevealing(int par3, int par4) { - super(ArmorMaterial.IRON, par3, par4); - this.setMaxDamage(27); - this.setMaxStackSize(1); - this.setCreativeTab(CreativeTab.tabTombenpotter); - this.maxCharge = 1000000; - this.genDay = 256; - this.genNight = 128; - - potionCost.put(Integer.valueOf(Potion.poison.id), Integer.valueOf(10000)); - potionCost.put(Integer.valueOf(Potion.wither.id), Integer.valueOf(15000)); - potionCost.put(Integer.valueOf(Potion.confusion.id), Integer.valueOf(5000)); - } - - @Override - public String getArmorTexture(ItemStack stack, Entity entity, int slot, String layerType) { - return "electricmagictools:textures/models/solarrevealinghelmet.png"; - } - - @SuppressWarnings("unchecked") - @Override - public void onArmorTick(World worldObj, EntityPlayer player, ItemStack itemStack) { - if (Config.nightVisionOff == false) { - if (ElectricItem.manager.canUse(itemStack, 1 / 1000)) { - - int x = MathHelper.floor_double(player.posX); - int z = MathHelper.floor_double(player.posZ); - int y = MathHelper.floor_double(player.posY); - - int lightlevel = player.worldObj.getBlockLightValue(x, y, z); - if (lightlevel >= 0) - player.addPotionEffect(new PotionEffect(Potion.nightVision.id, 300, -3)); - ElectricItem.manager.use(itemStack, 1 / 1000, player); - } else { - player.addPotionEffect(new PotionEffect(Potion.blindness.id, 300, 0, true)); - } - } - - int refill = player.getAir(); - if (ElectricItem.manager.canUse(itemStack, 1000) && refill < 100) { - player.setAir(refill + 200); - ElectricItem.manager.use(itemStack, 1000, null); - } - - @SuppressWarnings("rawtypes") - Iterator i$ = (new LinkedList(player.getActivePotionEffects())).iterator(); - do { - if (!i$.hasNext()) { - break; - } - { - PotionEffect effect = (PotionEffect) i$.next(); - int id = effect.getPotionID(); - Integer cost = (Integer) potionCost.get(Integer.valueOf(id)); - if (cost != null) { - cost = Integer.valueOf(cost.intValue() * (effect.getAmplifier() + 1)); - if (ElectricItem.manager.canUse(itemStack, cost.intValue())) { - ElectricItem.manager.use(itemStack, cost.intValue(), null); - ItemStack milk = (new ItemStack(Items.milk_bucket)); - player.curePotionEffects(milk); - } - } - } - } while (true); - - if (worldObj.isRemote) { - return; - } - checkForSun(player); - if (this.generating > 0) { - int energyLeft = this.generating; - for (int i = 0; i < player.inventory.armorInventory.length; i++) { - if (energyLeft > 0) { - if ((player.inventory.armorInventory[i] != null) && (player.inventory.armorInventory[i].getItem() instanceof IElectricItem)) { - int sentPacket = ElectricItem.manager.charge(player.inventory.armorInventory[i], energyLeft, 4, false, false); - energyLeft -= sentPacket; - } - } else { - return; - } - } - for (int j = 0; j < player.inventory.mainInventory.length; j++) { - if (energyLeft > 0) { - if ((player.inventory.mainInventory[j] != null) && (player.inventory.mainInventory[j].getItem() instanceof IElectricItem)) { - int sentPacket = ElectricItem.manager.charge(player.inventory.mainInventory[j], energyLeft, 4, false, false); - energyLeft -= sentPacket; - } - } else { - return; - } - } - } - } - - public int checkForSun(EntityPlayer player) { - if (this.ticker++ % tickRate() == 0) { - updateVisibility(player); - } - if ((this.sunIsUp) && (this.skyIsVisible)) { - this.generating = (0 + this.genDay); - return this.generating; - } - if (this.skyIsVisible) { - this.generating = (0 + this.genNight); - return this.generating; - } - this.generating = 0; - return this.generating; - } - - public void updateVisibility(EntityPlayer player) { - this.dampPlace = (player.worldObj.getWorldChunkManager().getBiomeGenAt((int) player.posX, (int) player.posZ).getIntRainfall() > 0); - this.noSunWorld = player.worldObj.provider.hasNoSky; - Boolean rainWeather = Boolean.valueOf((this.dampPlace) && ((player.worldObj.isRaining()) || (player.worldObj.isThundering()))); - if ((!player.worldObj.isDaytime()) || (rainWeather.booleanValue())) { - this.sunIsUp = false; - } else { - this.sunIsUp = true; - } - if ((!player.worldObj.canBlockSeeTheSky((int) player.posX, (int) player.posY + 1, (int) player.posZ)) || (this.noSunWorld)) { - this.skyIsVisible = false; - } else { - this.skyIsVisible = true; - } - } - - public static int tickRate() { - return 128; - } - - @SideOnly(Side.CLIENT) - @Override - public void registerIcons(IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon("electricmagictools:solarrevealinghelmet"); - } - - @Override - public boolean showIngamePopups(ItemStack itemstack, EntityLivingBase player) { - return true; - } - - @SuppressWarnings({ "rawtypes", "unchecked" }) - @Override - public void addInformation(ItemStack stack, EntityPlayer par2EntityPlayer, List list, boolean par4) { - list.add("Vis discount: 7%"); - } - - @Override - public int getVisDiscount(ItemStack stack, EntityPlayer player, Aspect aspect) { - return 7; - } - - @Override - public boolean showNodes(ItemStack itemstack, EntityLivingBase player) { - return true; - } - - @Override - public ArmorProperties getProperties(EntityLivingBase player, ItemStack armor, DamageSource source, double damage, int slot) { - if (source.isUnblockable()) { - return new net.minecraftforge.common.ISpecialArmor.ArmorProperties(0, 0.0D, 0); - } else { - double absorptionRatio = getBaseAbsorptionRatio() * getDamageAbsorptionRatio(); - int energyPerDamage = getEnergyPerDamage(); - int damageLimit = energyPerDamage <= 0 ? 0 : (25 * ElectricItem.manager.getCharge(armor)) / energyPerDamage; - return new net.minecraftforge.common.ISpecialArmor.ArmorProperties(0, absorptionRatio, damageLimit); - } - } - - @Override - public int getArmorDisplay(EntityPlayer player, ItemStack armor, int slot) { - if (ElectricItem.manager.getCharge(armor) >= getEnergyPerDamage()) { - return (int) Math.round(20D * getBaseAbsorptionRatio() * getDamageAbsorptionRatio()); - } else { - return 0; - } - } - - @Override - public void damageArmor(EntityLivingBase entity, ItemStack stack, DamageSource source, int damage, int slot) { - ElectricItem.manager.discharge(stack, damage * getEnergyPerDamage(), 0x7fffffff, true, false); - } - - public double getDamageAbsorptionRatio() { - return 1.1000000000000001D; - } - - public int getEnergyPerDamage() { - return 10000; - } - - private double getBaseAbsorptionRatio() { - return 0.14999999999999999D; - } - - @SuppressWarnings({ "rawtypes", "unchecked" }) - @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { - ItemStack itemStack = new ItemStack(this, 1); - if (getChargedItem(itemStack) == this) { - ItemStack charged = new ItemStack(this, 1); - ElectricItem.manager.charge(charged, 2147483647, 2147483647, true, false); - itemList.add(charged); - } - if (getEmptyItem(itemStack) == this) { - itemList.add(new ItemStack(this, 1, getMaxDamage())); - } - } - - @Override - public boolean canProvideEnergy(ItemStack itemStack) { - return true; - } - - @Override - public int getMaxCharge(ItemStack itemStack) { - return maxCharge; - } - - @Override - public int getTier(ItemStack itemStack) { - return 1; - } - - @Override - public int getTransferLimit(ItemStack itemStack) { - return 1000; - } - - @Override - public int getItemEnchantability() { - if (Config.enchanting == false) { - return 0; - } else { - return 4; - } - } - - @Override - public boolean isBookEnchantable(ItemStack itemstack1, ItemStack itemstack2) { - if (Config.enchanting == false) { - return false; - } else { - return true; - } - } - - @Override - public Item getChargedItem(ItemStack itemStack) { - return this; - } - - @Override - public Item getEmptyItem(ItemStack itemStack) { - return this; - } -} diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/armor/boots/ItemElectricBootsTraveller.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/armor/boots/ItemElectricBootsTraveller.java new file mode 100644 index 0000000..cc5bd35 --- /dev/null +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/armor/boots/ItemElectricBootsTraveller.java @@ -0,0 +1,261 @@ +/******************************************************************************* + * Copyright (c) 2014 Tombenpotter. + * All rights reserved. + * + * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 + * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html + * + * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. + * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. + * http://www.minecraftforum.net/topic/1585216- + * + * Attention: this class originally belongs to the ThaumicTinkerer mod. + * All I did was modifying it to fulfill my needs. + * + * ThaumicTinkerer is Open Source and distributed under a + * Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License + * (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB) + * + * http://www.minecraftforum.net/topic/1813058- + ******************************************************************************/ +package electricMagicTools.tombenpotter.electricmagictools.common.items.armor.boots; + +import cpw.mods.fml.common.eventhandler.EventPriority; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import electricMagicTools.tombenpotter.electricmagictools.common.Config; +import electricMagicTools.tombenpotter.electricmagictools.common.CreativeTab; +import electricMagicTools.tombenpotter.electricmagictools.common.ElectricMagicTools; +import ic2.api.item.ElectricItem; +import ic2.api.item.IElectricItem; +import ic2.api.item.IMetalArmor; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemArmor; +import net.minecraft.item.ItemStack; +import net.minecraft.util.DamageSource; +import net.minecraft.world.World; +import net.minecraftforge.common.ISpecialArmor; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.entity.living.LivingEvent.LivingJumpEvent; +import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; +import thaumcraft.api.IVisDiscountGear; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.common.Thaumcraft; + +import java.util.ArrayList; +import java.util.List; + +public class ItemElectricBootsTraveller extends ItemArmor implements IElectricItem, IVisDiscountGear, IMetalArmor, ISpecialArmor { + + public int maxCharge = 10000; + @SuppressWarnings({"unchecked", "rawtypes"}) + public static List playersWith1Step = new ArrayList(); + + public ItemElectricBootsTraveller(int par3, int par4) { + super(ArmorMaterial.DIAMOND, par3, par4); + this.setMaxDamage(27); + this.setMaxStackSize(1); + this.setCreativeTab(CreativeTab.tabTombenpotter); + if (ticks()) + MinecraftForge.EVENT_BUS.register(this); + } + + @SuppressWarnings({"rawtypes", "unchecked"}) + @SideOnly(Side.CLIENT) + public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { + ItemStack itemStack = new ItemStack(this, 1); + if (getChargedItem(itemStack) == this) { + ItemStack charged = new ItemStack(this, 1); + ElectricItem.manager.charge(charged, 2147483647, 2147483647, true, false); + itemList.add(charged); + } + if (getEmptyItem(itemStack) == this) { + itemList.add(new ItemStack(this, 1, getMaxDamage())); + } + } + + @SideOnly(Side.CLIENT) + @Override + public void registerIcons(IIconRegister iconRegister) { + this.itemIcon = iconRegister.registerIcon(ElectricMagicTools.texturePath + ":electricboots"); + } + + @Override + public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) { + return ElectricMagicTools.texturePath + ":textures/models/electricboots.png"; + } + + boolean ticks() { + return true; + } + + @SubscribeEvent + public void onEntityUpdate(LivingUpdateEvent event) { + if (event.entityLiving instanceof EntityPlayer) { + EntityPlayer player = (EntityPlayer) event.entityLiving; + ItemStack armor = player.getCurrentArmor(3 - armorType); + if (armor != null && armor.getItem() == this) + tickPlayer(player); + } + } + + void tickPlayer(EntityPlayer player) { + if (player.worldObj.isRemote) + player.stepHeight = player.isSneaking() ? 0.5F : 1F; + if ((player.onGround || player.capabilities.isFlying) && player.moveForward > 0F) + player.moveFlying(0F, 1F, player.capabilities.isFlying ? 0.075F : 0.15F); + player.jumpMovementFactor = player.isSprinting() ? 0.05F : 0.04F; + player.fallDistance = 0F; + } + + @SubscribeEvent + public void onPlayerJump(LivingJumpEvent event) { + if (event.entityLiving instanceof EntityPlayer) { + EntityPlayer player = (EntityPlayer) event.entityLiving; + boolean hasArmor = player.getCurrentArmor(0) != null && player.getCurrentArmor(0).getItem() == this; + + if (hasArmor) + player.motionY += 0.3; + } + } + + @SubscribeEvent(priority = EventPriority.HIGH) + public void onLivingUpdate(LivingUpdateEvent event) { + if (event.entityLiving instanceof EntityPlayer && event.entityLiving.worldObj.isRemote) { + EntityPlayer player = (EntityPlayer) event.entityLiving; + + boolean highStepListed = playersWith1Step.contains(player.getCommandSenderName()); + boolean hasHighStep = player.getCurrentArmor(0) != null && player.getCurrentArmor(0).getItem() == this; + + if (hasHighStep && !highStepListed) + playersWith1Step.add(player.getCommandSenderName()); + + if (!hasHighStep && highStepListed) { + playersWith1Step.remove(player.getCommandSenderName()); + player.stepHeight = 0.5F; + } + } + } + + @Override + public boolean isMetalArmor(ItemStack itemstack, EntityPlayer player) { + return true; + } + + @Override + public boolean canProvideEnergy(ItemStack itemStack) { + return false; + } + + @Override + public int getMaxCharge(ItemStack itemStack) { + return maxCharge; + } + + @Override + public int getTier(ItemStack itemStack) { + return 2; + } + + @Override + public int getTransferLimit(ItemStack itemStack) { + return 100; + } + + @Override + public boolean isRepairable() { + return false; + } + + @Override + public int getItemEnchantability() { + if (Config.enchanting == false) { + return 0; + } else { + return 4; + } + } + + @Override + public boolean isBookEnchantable(ItemStack itemstack1, ItemStack itemstack2) { + if (Config.enchanting == false) { + return false; + } else { + return true; + } + } + + public int getEnergyPerDamage() { + return 100; + } + + @Override + public ArmorProperties getProperties(EntityLivingBase player, ItemStack armor, DamageSource source, double damage, int slot) { + if (source.isUnblockable()) { + return new net.minecraftforge.common.ISpecialArmor.ArmorProperties(0, 0.0D, 3); + } else { + double absorptionRatio = getBaseAbsorptionRatio() * getDamageAbsorptionRatio(); + int energyPerDamage = getEnergyPerDamage(); + int damageLimit = energyPerDamage <= 0 ? 0 : (25 * ElectricItem.manager.getCharge(armor)) / energyPerDamage; + return new net.minecraftforge.common.ISpecialArmor.ArmorProperties(3, absorptionRatio, damageLimit); + } + } + + @Override + public int getArmorDisplay(EntityPlayer player, ItemStack armor, int slot) { + if (ElectricItem.manager.getCharge(armor) >= getEnergyPerDamage()) { + return (int) Math.round(20D * getBaseAbsorptionRatio() * getDamageAbsorptionRatio()); + } else { + return 0; + } + } + + @Override + public void damageArmor(EntityLivingBase entity, ItemStack stack, DamageSource source, int damage, int slot) { + ElectricItem.manager.discharge(stack, damage * getEnergyPerDamage(), 0x7fffffff, true, false); + } + + public double getDamageAbsorptionRatio() { + return 1.1000000000000001D; + } + + private double getBaseAbsorptionRatio() { + return 0.14999999999999999D; + } + + @SuppressWarnings({"unchecked", "rawtypes"}) + @Override + public void addInformation(ItemStack stack, EntityPlayer par2EntityPlayer, List list, boolean par4) { + list.add("Vis discount: 2%"); + } + + @Override + public int getVisDiscount(ItemStack stack, EntityPlayer player, Aspect aspect) { + return 2; + } + + @Override + public void onArmorTick(World world, EntityPlayer player, ItemStack itemStack) { + if (Config.smoke == false && player.onGround == false) { + int miny = (int) (player.boundingBox.minY - 2.0D); + Thaumcraft.proxy.smokeSpiral(player.worldObj, player.posX, player.boundingBox.minY + player.height / 2.0F, player.posZ, 1.5F, player.worldObj.rand.nextInt(620), miny); + } + } + + @Override + public Item getChargedItem(ItemStack itemStack) { + return this; + } + + @Override + public Item getEmptyItem(ItemStack itemStack) { + return this; + } + +} diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/armor/boots/ItemNanoBootsTraveller.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/armor/boots/ItemNanoBootsTraveller.java new file mode 100644 index 0000000..b3eb1b6 --- /dev/null +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/armor/boots/ItemNanoBootsTraveller.java @@ -0,0 +1,103 @@ +/******************************************************************************* + * Copyright (c) 2014 Tombenpotter. + * All rights reserved. + * + * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 + * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html + * + * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. + * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. + * http://www.minecraftforum.net/topic/1585216- + * + * Attention: this class originally belongs to the ThaumicTinkerer mod. + * All I did was modifying it to fulfill my needs. + * + * ThaumicTinkerer is Open Source and distributed under a + * Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License + * (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB) + * + * http://www.minecraftforum.net/topic/1813058- + ******************************************************************************/ +package electricMagicTools.tombenpotter.electricmagictools.common.items.armor.boots; + +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import electricMagicTools.tombenpotter.electricmagictools.common.Config; +import electricMagicTools.tombenpotter.electricmagictools.common.ElectricMagicTools; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraftforge.event.entity.living.LivingEvent.LivingJumpEvent; +import thaumcraft.api.aspects.Aspect; + +import java.util.List; + +public class ItemNanoBootsTraveller extends ItemElectricBootsTraveller { + + public int maxCharge = 500000; + + public ItemNanoBootsTraveller(int par3, int par4) { + super(par3, par4); + } + + @SideOnly(Side.CLIENT) + @Override + public void registerIcons(IIconRegister iconRegister) { + this.itemIcon = iconRegister.registerIcon(ElectricMagicTools.texturePath + ":nanobootstravel"); + } + + @Override + public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) { + return ElectricMagicTools.texturePath + ":textures/models/nanobootstravel.png"; + } + + @Override + public int getVisDiscount(ItemStack stack, EntityPlayer player, Aspect aspect) { + return 4; + } + + @Override + void tickPlayer(EntityPlayer player) { + if (player.worldObj.isRemote) + player.stepHeight = player.isSneaking() ? 0.5F : 1F; + if ((player.onGround || player.capabilities.isFlying) && player.moveForward > 0F) + player.moveFlying(0F, 1F, (float) (player.capabilities.isFlying ? 0.075F : Config.nanoBootsSpeed)); + player.jumpMovementFactor = player.isSprinting() ? 0.05F : 0.04F; + player.fallDistance = 0F; + } + + @SubscribeEvent + @Override + public void onPlayerJump(LivingJumpEvent event) { + if (event.entityLiving instanceof EntityPlayer) { + EntityPlayer player = (EntityPlayer) event.entityLiving; + boolean hasArmor = player.getCurrentArmor(0) != null && player.getCurrentArmor(0).getItem() == this; + + if (hasArmor) { + player.motionY += Config.nanoBootsJump; + } + } + } + + @Override + public int getMaxCharge(ItemStack itemStack) { + return maxCharge; + } + + @Override + public int getTransferLimit(ItemStack itemStack) { + return 1000; + } + + public int getEnergyPerDamage() { + return 200; + } + + @SuppressWarnings({"rawtypes", "unchecked"}) + @Override + public void addInformation(ItemStack stack, EntityPlayer par2EntityPlayer, List list, boolean par4) { + list.add("Vis discount: 4%"); + } +} diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/armor/boots/ItemQuantumBootsTraveller.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/armor/boots/ItemQuantumBootsTraveller.java new file mode 100644 index 0000000..f63b0ba --- /dev/null +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/armor/boots/ItemQuantumBootsTraveller.java @@ -0,0 +1,103 @@ +/******************************************************************************* + * Copyright (c) 2014 Tombenpotter. + * All rights reserved. + * + * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 + * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html + * + * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. + * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. + * http://www.minecraftforum.net/topic/1585216- + * + * Attention: this class originally belongs to the ThaumicTinkerer mod. + * All I did was modifying it to fulfill my needs. + * + * ThaumicTinkerer is Open Source and distributed under a + * Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License + * (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB) + * + * http://www.minecraftforum.net/topic/1813058- + ******************************************************************************/ +package electricMagicTools.tombenpotter.electricmagictools.common.items.armor.boots; + +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import electricMagicTools.tombenpotter.electricmagictools.common.Config; +import electricMagicTools.tombenpotter.electricmagictools.common.ElectricMagicTools; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraftforge.event.entity.living.LivingEvent.LivingJumpEvent; +import thaumcraft.api.aspects.Aspect; + +import java.util.List; + +public class ItemQuantumBootsTraveller extends ItemElectricBootsTraveller { + + public int maxCharge = 1000000; + + public ItemQuantumBootsTraveller(int par3, int par4) { + super(par3, par4); + } + + @SideOnly(Side.CLIENT) + @Override + public void registerIcons(IIconRegister iconRegister) { + this.itemIcon = iconRegister.registerIcon(ElectricMagicTools.texturePath + ":quantumbootstravel"); + } + + @Override + public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) { + return ElectricMagicTools.texturePath + ":textures/models/quantumbootstravel.png"; + } + + @Override + public int getVisDiscount(ItemStack stack, EntityPlayer player, Aspect aspect) { + return 5; + } + + @Override + void tickPlayer(EntityPlayer player) { + if (player.worldObj.isRemote) + player.stepHeight = player.isSneaking() ? 0.5F : 1F; + if ((player.onGround || player.capabilities.isFlying) && player.moveForward > 0F) + player.moveFlying(0F, 1F, (float) (player.capabilities.isFlying ? 0.075F : Config.quantumBootsSpeed)); + player.jumpMovementFactor = player.isSprinting() ? 0.05F : 0.04F; + player.fallDistance = 0F; + } + + @SubscribeEvent + @Override + public void onPlayerJump(LivingJumpEvent event) { + if (event.entityLiving instanceof EntityPlayer) { + EntityPlayer player = (EntityPlayer) event.entityLiving; + boolean hasArmor = player.getCurrentArmor(0) != null && player.getCurrentArmor(0).getItem() == this; + + if (hasArmor) { + player.motionY += Config.quantumBootsJump; + } + } + } + + @Override + public int getMaxCharge(ItemStack itemStack) { + return maxCharge; + } + + @Override + public int getTransferLimit(ItemStack itemStack) { + return 1000; + } + + public int getEnergyPerDamage() { + return 200; + } + + @SuppressWarnings({"rawtypes", "unchecked"}) + @Override + public void addInformation(ItemStack stack, EntityPlayer par2EntityPlayer, List list, boolean par4) { + list.add("Vis discount: 5%"); + } +} diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/armor/goggles/ItemElectricGoggles.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/armor/goggles/ItemElectricGoggles.java new file mode 100644 index 0000000..6819205 --- /dev/null +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/armor/goggles/ItemElectricGoggles.java @@ -0,0 +1,73 @@ +/******************************************************************************* + * Copyright (c) 2014 Tombenpotter. + * All rights reserved. + * + * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 + * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html + * + * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. + * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. + * http://www.minecraftforum.net/topic/1585216- + ******************************************************************************/ +package electricMagicTools.tombenpotter.electricmagictools.common.items.armor.goggles; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import electricMagicTools.tombenpotter.electricmagictools.common.ElectricMagicTools; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import thaumcraft.api.aspects.Aspect; + +import java.util.List; + +public class ItemElectricGoggles extends ItemQuantumThaumicHelmet { + + public int maxCharge = 10000; + + public ItemElectricGoggles(int par3, int par4) { + super(par3, par4); + } + + @SideOnly(Side.CLIENT) + @Override + public void registerIcons(IIconRegister iconRegister) { + this.itemIcon = iconRegister.registerIcon(ElectricMagicTools.texturePath + ":electricgoggles"); + } + + @Override + public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) { + return ElectricMagicTools.texturePath + ":textures/models/electricgoggles.png"; + } + + @Override + public int getVisDiscount(ItemStack stack, EntityPlayer player, Aspect aspect) { + return 5; + } + + @Override + public int getMaxCharge(ItemStack itemStack) { + return maxCharge; + } + + public int getEnergyPerDamage() { + return 100; + } + + @Override + public void onArmorTick(World world, EntityPlayer player, ItemStack itemStack) { + } + + @Override + public int getTransferLimit(ItemStack itemStack) { + return 10; + } + + @SuppressWarnings({"rawtypes", "unchecked"}) + @Override + public void addInformation(ItemStack stack, EntityPlayer par2EntityPlayer, List list, boolean par4) { + list.add("Vis discount: 5%"); + } +} diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/armor/goggles/ItemNanoThaumicHelmet.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/armor/goggles/ItemNanoThaumicHelmet.java new file mode 100644 index 0000000..74713cb --- /dev/null +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/armor/goggles/ItemNanoThaumicHelmet.java @@ -0,0 +1,97 @@ +/******************************************************************************* + * Copyright (c) 2014 Tombenpotter. + * All rights reserved. + * + * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 + * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html + * + * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. + * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. + * http://www.minecraftforum.net/topic/1585216- + ******************************************************************************/ +package electricMagicTools.tombenpotter.electricmagictools.common.items.armor.goggles; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import electricMagicTools.tombenpotter.electricmagictools.common.Config; +import electricMagicTools.tombenpotter.electricmagictools.common.CreativeTab; +import electricMagicTools.tombenpotter.electricmagictools.common.ElectricMagicTools; +import ic2.api.item.ElectricItem; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.potion.Potion; +import net.minecraft.potion.PotionEffect; +import net.minecraft.util.MathHelper; +import net.minecraft.world.World; +import thaumcraft.api.aspects.Aspect; + +import java.util.List; + +public class ItemNanoThaumicHelmet extends ItemQuantumThaumicHelmet { + + public int maxCharge = 100000; + + public ItemNanoThaumicHelmet(int par3, int par4) { + super(par3, par4); + this.setCreativeTab(CreativeTab.tabTombenpotter); + this.setMaxDamage(27); + this.setMaxStackSize(1); + } + + @SideOnly(Side.CLIENT) + @Override + public void registerIcons(IIconRegister iconRegister) { + this.itemIcon = iconRegister.registerIcon(ElectricMagicTools.texturePath + ":nanothaumichelmet"); + } + + @Override + public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) { + return ElectricMagicTools.texturePath + ":textures/models/thaumicnanohelmet.png"; + } + + @Override + public int getVisDiscount(ItemStack stack, EntityPlayer player, Aspect aspect) { + return 6; + } + + @Override + public int getMaxCharge(ItemStack itemStack) { + return maxCharge; + } + + public int getEnergyPerDamage() { + return 1000; + } + + @Override + public void onArmorTick(World world, EntityPlayer player, ItemStack itemStack) { + if (Config.nightVisionOff == false) { + if (ElectricItem.manager.canUse(itemStack, 1 / 1000)) { + + int x = MathHelper.floor_double(player.posX); + int z = MathHelper.floor_double(player.posZ); + int y = MathHelper.floor_double(player.posY); + + int lightlevel = player.worldObj.getBlockLightValue(x, y, z); + if (lightlevel >= 0) + player.addPotionEffect(new PotionEffect(Potion.nightVision.id, 300, -3)); + ElectricItem.manager.use(itemStack, 1 / 1000, player); + } else { + player.addPotionEffect(new PotionEffect(Potion.blindness.id, 300, 0, true)); + } + } + } + + @Override + public int getTransferLimit(ItemStack itemStack) { + return 100; + } + + @SuppressWarnings({"unchecked", "rawtypes"}) + @Override + public void addInformation(ItemStack stack, EntityPlayer par2EntityPlayer, List list, boolean par4) { + list.add("Vis discount: 6%"); + } +} diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/armor/goggles/ItemQuantumThaumicHelmet.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/armor/goggles/ItemQuantumThaumicHelmet.java new file mode 100644 index 0000000..11b2712 --- /dev/null +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/armor/goggles/ItemQuantumThaumicHelmet.java @@ -0,0 +1,246 @@ +/******************************************************************************* + * Copyright (c) 2014 Tombenpotter. + * All rights reserved. + * + * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 + * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html + * + * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. + * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. + * http://www.minecraftforum.net/topic/1585216- + ******************************************************************************/ +package electricMagicTools.tombenpotter.electricmagictools.common.items.armor.goggles; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import electricMagicTools.tombenpotter.electricmagictools.common.Config; +import electricMagicTools.tombenpotter.electricmagictools.common.CreativeTab; +import electricMagicTools.tombenpotter.electricmagictools.common.ElectricMagicTools; +import ic2.api.item.ElectricItem; +import ic2.api.item.IElectricItem; +import ic2.api.item.IMetalArmor; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemArmor; +import net.minecraft.item.ItemStack; +import net.minecraft.potion.Potion; +import net.minecraft.potion.PotionEffect; +import net.minecraft.util.DamageSource; +import net.minecraft.util.MathHelper; +import net.minecraft.world.World; +import net.minecraftforge.common.ISpecialArmor; +import thaumcraft.api.IGoggles; +import thaumcraft.api.IVisDiscountGear; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.nodes.IRevealer; + +import java.util.*; + +public class ItemQuantumThaumicHelmet extends ItemArmor implements IElectricItem, IVisDiscountGear, IGoggles, IRevealer, IMetalArmor, ISpecialArmor { + @SuppressWarnings({"unchecked", "rawtypes"}) + private static final Map potionCost = new HashMap(); + + public ItemQuantumThaumicHelmet(int par3, int par4) { + super(ArmorMaterial.DIAMOND, par3, par4); + this.setCreativeTab(CreativeTab.tabTombenpotter); + this.setMaxDamage(27); + this.setMaxStackSize(1); + + potionCost.put(Integer.valueOf(Potion.poison.id), Integer.valueOf(10000)); + potionCost.put(Integer.valueOf(Potion.wither.id), Integer.valueOf(15000)); + potionCost.put(Integer.valueOf(Potion.confusion.id), Integer.valueOf(5000)); + } + + public int maxCharge = 10000000; + + @SideOnly(Side.CLIENT) + @Override + public void registerIcons(IIconRegister iconRegister) { + this.itemIcon = iconRegister.registerIcon(ElectricMagicTools.texturePath + ":quantumthaumichelmet"); + } + + @Override + public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) { + return ElectricMagicTools.texturePath + ":textures/models/thaumicquantumhelmet.png"; + } + + @Override + public boolean canProvideEnergy(ItemStack itemStack) { + return false; + } + + @Override + public int getMaxCharge(ItemStack itemStack) { + return maxCharge; + } + + @Override + public int getTier(ItemStack itemStack) { + return 2; + } + + @SuppressWarnings({"rawtypes", "unchecked"}) + @Override + public void onArmorTick(World world, EntityPlayer player, ItemStack itemStack) { + int refill = player.getAir(); + if (ElectricItem.manager.canUse(itemStack, 1000) && refill < 100) { + player.setAir(refill + 200); + ElectricItem.manager.use(itemStack, 1000, null); + } + + Iterator i$ = (new LinkedList(player.getActivePotionEffects())).iterator(); + do { + if (!i$.hasNext()) { + break; + } + { + PotionEffect effect = (PotionEffect) i$.next(); + int id = effect.getPotionID(); + Integer cost = (Integer) potionCost.get(Integer.valueOf(id)); + if (cost != null) { + cost = Integer.valueOf(cost.intValue() * (effect.getAmplifier() + 1)); + if (ElectricItem.manager.canUse(itemStack, cost.intValue())) { + ElectricItem.manager.use(itemStack, cost.intValue(), null); + ItemStack milk = (new ItemStack(Items.milk_bucket)); + player.curePotionEffects(milk); + } + } + } + } while (true); + + if (Config.nightVisionOff == false) { + if (ElectricItem.manager.canUse(itemStack, 1 / 1000)) { + int x = MathHelper.floor_double(player.posX); + int z = MathHelper.floor_double(player.posZ); + int y = MathHelper.floor_double(player.posY); + int lightlevel = player.worldObj.getBlockLightValue(x, y, z); + if (lightlevel >= 0) + player.addPotionEffect(new PotionEffect(Potion.nightVision.id, 300, -3)); + ElectricItem.manager.use(itemStack, 1 / 1000, player); + } else { + player.addPotionEffect(new PotionEffect(Potion.blindness.id, 300, 0, true)); + } + } + } + + @Override + public int getTransferLimit(ItemStack itemStack) { + return 10000; + } + + @SuppressWarnings({"rawtypes", "unchecked"}) + @SideOnly(Side.CLIENT) + public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { + ItemStack itemStack = new ItemStack(this, 1); + if (getChargedItem(itemStack) == this) { + ItemStack charged = new ItemStack(this, 1); + ElectricItem.manager.charge(charged, 2147483647, 2147483647, true, false); + itemList.add(charged); + } + if (getEmptyItem(itemStack) == this) { + itemList.add(new ItemStack(this, 1, getMaxDamage())); + } + } + + @Override + public boolean isRepairable() { + return false; + } + + @Override + public int getItemEnchantability() { + if (Config.enchanting == false) { + return 0; + } else { + return 4; + } + } + + @Override + public boolean isBookEnchantable(ItemStack itemstack1, ItemStack itemstack2) { + if (Config.enchanting == false) { + return false; + } else { + return true; + } + } + + @SuppressWarnings({"rawtypes", "unchecked"}) + @Override + public void addInformation(ItemStack stack, EntityPlayer par2EntityPlayer, List list, boolean par4) { + list.add("Vis discount: 8%"); + } + + @Override + public int getVisDiscount(ItemStack stack, EntityPlayer player, Aspect aspect) { + return 8; + } + + @Override + public boolean showNodes(ItemStack itemstack, EntityLivingBase player) { + return true; + } + + @Override + public boolean showIngamePopups(ItemStack itemstack, EntityLivingBase player) { + return true; + } + + @Override + public boolean isMetalArmor(ItemStack itemstack, EntityPlayer player) { + return true; + } + + @Override + public ArmorProperties getProperties(EntityLivingBase player, ItemStack armor, DamageSource source, double damage, int slot) { + if (source.isUnblockable()) { + return new net.minecraftforge.common.ISpecialArmor.ArmorProperties(0, 0.0D, 0); + } else { + double absorptionRatio = getBaseAbsorptionRatio() * getDamageAbsorptionRatio(); + int energyPerDamage = getEnergyPerDamage(); + int damageLimit = energyPerDamage <= 0 ? 0 : (25 * ElectricItem.manager.getCharge(armor)) / energyPerDamage; + return new net.minecraftforge.common.ISpecialArmor.ArmorProperties(0, absorptionRatio, damageLimit); + } + } + + @Override + public int getArmorDisplay(EntityPlayer player, ItemStack armor, int slot) { + if (ElectricItem.manager.getCharge(armor) >= getEnergyPerDamage()) { + return (int) Math.round(20D * getBaseAbsorptionRatio() * getDamageAbsorptionRatio()); + } else { + return 0; + } + } + + @Override + public void damageArmor(EntityLivingBase entity, ItemStack stack, DamageSource source, int damage, int slot) { + ElectricItem.manager.discharge(stack, damage * getEnergyPerDamage(), 0x7fffffff, true, false); + } + + public double getDamageAbsorptionRatio() { + return 1.1000000000000001D; + } + + public int getEnergyPerDamage() { + return 10000; + } + + private double getBaseAbsorptionRatio() { + return 0.14999999999999999D; + } + + @Override + public Item getChargedItem(ItemStack itemStack) { + return this; + } + + @Override + public Item getEmptyItem(ItemStack itemStack) { + return this; + } +} diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/armor/goggles/ItemSolarHelmetRevealing.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/armor/goggles/ItemSolarHelmetRevealing.java new file mode 100644 index 0000000..c23c126 --- /dev/null +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/armor/goggles/ItemSolarHelmetRevealing.java @@ -0,0 +1,315 @@ +/******************************************************************************* + * Copyright (c) 2014 Tombenpotter. + * All rights reserved. + * + * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 + * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html + * + * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. + * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. + * http://www.minecraftforum.net/topic/1585216- + ******************************************************************************/ +package electricMagicTools.tombenpotter.electricmagictools.common.items.armor.goggles; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import electricMagicTools.tombenpotter.electricmagictools.common.Config; +import electricMagicTools.tombenpotter.electricmagictools.common.CreativeTab; +import electricMagicTools.tombenpotter.electricmagictools.common.ElectricMagicTools; +import ic2.api.item.ElectricItem; +import ic2.api.item.IElectricItem; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemArmor; +import net.minecraft.item.ItemStack; +import net.minecraft.potion.Potion; +import net.minecraft.potion.PotionEffect; +import net.minecraft.util.DamageSource; +import net.minecraft.util.MathHelper; +import net.minecraft.world.World; +import net.minecraftforge.common.ISpecialArmor; +import thaumcraft.api.IGoggles; +import thaumcraft.api.IVisDiscountGear; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.nodes.IRevealer; + +import java.util.*; + +public class ItemSolarHelmetRevealing extends ItemArmor implements ISpecialArmor, IRevealer, IVisDiscountGear, IGoggles, IElectricItem { + + public int maxCharge = 10000000; + private int ticker; + private int generating; + private int genDay; + private int genNight; + private boolean sunIsUp; + private boolean skyIsVisible; + private boolean noSunWorld; + private boolean dampPlace; + + @SuppressWarnings("rawtypes") + private static final Map potionCost = new HashMap(); + + @SuppressWarnings("unchecked") + public ItemSolarHelmetRevealing(int par3, int par4) { + super(ArmorMaterial.IRON, par3, par4); + this.setMaxDamage(27); + this.setMaxStackSize(1); + this.setCreativeTab(CreativeTab.tabTombenpotter); + this.maxCharge = 1000000; + this.genDay = 256; + this.genNight = 128; + + potionCost.put(Integer.valueOf(Potion.poison.id), Integer.valueOf(10000)); + potionCost.put(Integer.valueOf(Potion.wither.id), Integer.valueOf(15000)); + potionCost.put(Integer.valueOf(Potion.confusion.id), Integer.valueOf(5000)); + } + + @Override + public String getArmorTexture(ItemStack stack, Entity entity, int slot, String layerType) { + return ElectricMagicTools.texturePath + ":textures/models/solarrevealinghelmet.png"; + } + + @SuppressWarnings("unchecked") + @Override + public void onArmorTick(World worldObj, EntityPlayer player, ItemStack itemStack) { + if (Config.nightVisionOff == false) { + if (ElectricItem.manager.canUse(itemStack, 1 / 1000)) { + + int x = MathHelper.floor_double(player.posX); + int z = MathHelper.floor_double(player.posZ); + int y = MathHelper.floor_double(player.posY); + + int lightlevel = player.worldObj.getBlockLightValue(x, y, z); + if (lightlevel >= 0) + player.addPotionEffect(new PotionEffect(Potion.nightVision.id, 300, -3)); + ElectricItem.manager.use(itemStack, 1 / 1000, player); + } else { + player.addPotionEffect(new PotionEffect(Potion.blindness.id, 300, 0, true)); + } + } + + int refill = player.getAir(); + if (ElectricItem.manager.canUse(itemStack, 1000) && refill < 100) { + player.setAir(refill + 200); + ElectricItem.manager.use(itemStack, 1000, null); + } + + @SuppressWarnings("rawtypes") + Iterator i$ = (new LinkedList(player.getActivePotionEffects())).iterator(); + do { + if (!i$.hasNext()) { + break; + } + { + PotionEffect effect = (PotionEffect) i$.next(); + int id = effect.getPotionID(); + Integer cost = (Integer) potionCost.get(Integer.valueOf(id)); + if (cost != null) { + cost = Integer.valueOf(cost.intValue() * (effect.getAmplifier() + 1)); + if (ElectricItem.manager.canUse(itemStack, cost.intValue())) { + ElectricItem.manager.use(itemStack, cost.intValue(), null); + ItemStack milk = (new ItemStack(Items.milk_bucket)); + player.curePotionEffects(milk); + } + } + } + } while (true); + + if (worldObj.isRemote) { + return; + } + checkForSun(player); + if (this.generating > 0) { + int energyLeft = this.generating; + for (int i = 0; i < player.inventory.armorInventory.length; i++) { + if (energyLeft > 0) { + if ((player.inventory.armorInventory[i] != null) && (player.inventory.armorInventory[i].getItem() instanceof IElectricItem)) { + int sentPacket = ElectricItem.manager.charge(player.inventory.armorInventory[i], energyLeft, 4, false, false); + energyLeft -= sentPacket; + } + } else { + return; + } + } + for (int j = 0; j < player.inventory.mainInventory.length; j++) { + if (energyLeft > 0) { + if ((player.inventory.mainInventory[j] != null) && (player.inventory.mainInventory[j].getItem() instanceof IElectricItem)) { + int sentPacket = ElectricItem.manager.charge(player.inventory.mainInventory[j], energyLeft, 4, false, false); + energyLeft -= sentPacket; + } + } else { + return; + } + } + } + } + + public int checkForSun(EntityPlayer player) { + if (this.ticker++ % tickRate() == 0) { + updateVisibility(player); + } + if ((this.sunIsUp) && (this.skyIsVisible)) { + this.generating = (0 + this.genDay); + return this.generating; + } + if (this.skyIsVisible) { + this.generating = (0 + this.genNight); + return this.generating; + } + this.generating = 0; + return this.generating; + } + + public void updateVisibility(EntityPlayer player) { + this.dampPlace = (player.worldObj.getWorldChunkManager().getBiomeGenAt((int) player.posX, (int) player.posZ).getIntRainfall() > 0); + this.noSunWorld = player.worldObj.provider.hasNoSky; + Boolean rainWeather = Boolean.valueOf((this.dampPlace) && ((player.worldObj.isRaining()) || (player.worldObj.isThundering()))); + if ((!player.worldObj.isDaytime()) || (rainWeather.booleanValue())) { + this.sunIsUp = false; + } else { + this.sunIsUp = true; + } + if ((!player.worldObj.canBlockSeeTheSky((int) player.posX, (int) player.posY + 1, (int) player.posZ)) || (this.noSunWorld)) { + this.skyIsVisible = false; + } else { + this.skyIsVisible = true; + } + } + + public static int tickRate() { + return 128; + } + + @SideOnly(Side.CLIENT) + @Override + public void registerIcons(IIconRegister iconRegister) { + this.itemIcon = iconRegister.registerIcon(ElectricMagicTools.texturePath + ":solarrevealinghelmet"); + } + + @Override + public boolean showIngamePopups(ItemStack itemstack, EntityLivingBase player) { + return true; + } + + @SuppressWarnings({"rawtypes", "unchecked"}) + @Override + public void addInformation(ItemStack stack, EntityPlayer par2EntityPlayer, List list, boolean par4) { + list.add("Vis discount: 7%"); + } + + @Override + public int getVisDiscount(ItemStack stack, EntityPlayer player, Aspect aspect) { + return 7; + } + + @Override + public boolean showNodes(ItemStack itemstack, EntityLivingBase player) { + return true; + } + + @Override + public ArmorProperties getProperties(EntityLivingBase player, ItemStack armor, DamageSource source, double damage, int slot) { + if (source.isUnblockable()) { + return new net.minecraftforge.common.ISpecialArmor.ArmorProperties(0, 0.0D, 0); + } else { + double absorptionRatio = getBaseAbsorptionRatio() * getDamageAbsorptionRatio(); + int energyPerDamage = getEnergyPerDamage(); + int damageLimit = energyPerDamage <= 0 ? 0 : (25 * ElectricItem.manager.getCharge(armor)) / energyPerDamage; + return new net.minecraftforge.common.ISpecialArmor.ArmorProperties(0, absorptionRatio, damageLimit); + } + } + + @Override + public int getArmorDisplay(EntityPlayer player, ItemStack armor, int slot) { + if (ElectricItem.manager.getCharge(armor) >= getEnergyPerDamage()) { + return (int) Math.round(20D * getBaseAbsorptionRatio() * getDamageAbsorptionRatio()); + } else { + return 0; + } + } + + @Override + public void damageArmor(EntityLivingBase entity, ItemStack stack, DamageSource source, int damage, int slot) { + ElectricItem.manager.discharge(stack, damage * getEnergyPerDamage(), 0x7fffffff, true, false); + } + + public double getDamageAbsorptionRatio() { + return 1.1000000000000001D; + } + + public int getEnergyPerDamage() { + return 10000; + } + + private double getBaseAbsorptionRatio() { + return 0.14999999999999999D; + } + + @SuppressWarnings({"rawtypes", "unchecked"}) + @SideOnly(Side.CLIENT) + public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { + ItemStack itemStack = new ItemStack(this, 1); + if (getChargedItem(itemStack) == this) { + ItemStack charged = new ItemStack(this, 1); + ElectricItem.manager.charge(charged, 2147483647, 2147483647, true, false); + itemList.add(charged); + } + if (getEmptyItem(itemStack) == this) { + itemList.add(new ItemStack(this, 1, getMaxDamage())); + } + } + + @Override + public boolean canProvideEnergy(ItemStack itemStack) { + return true; + } + + @Override + public int getMaxCharge(ItemStack itemStack) { + return maxCharge; + } + + @Override + public int getTier(ItemStack itemStack) { + return 1; + } + + @Override + public int getTransferLimit(ItemStack itemStack) { + return 1000; + } + + @Override + public int getItemEnchantability() { + if (Config.enchanting == false) { + return 0; + } else { + return 4; + } + } + + @Override + public boolean isBookEnchantable(ItemStack itemstack1, ItemStack itemstack2) { + if (Config.enchanting == false) { + return false; + } else { + return true; + } + } + + @Override + public Item getChargedItem(ItemStack itemStack) { + return this; + } + + @Override + public Item getEmptyItem(ItemStack itemStack) { + return this; + } +} diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/armor/wings/ItemFeatherWing.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/armor/wings/ItemFeatherWing.java new file mode 100644 index 0000000..45b8691 --- /dev/null +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/armor/wings/ItemFeatherWing.java @@ -0,0 +1,79 @@ +package electricMagicTools.tombenpotter.electricmagictools.common.items.armor.wings; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import electricMagicTools.tombenpotter.electricmagictools.client.model.ModelWings; +import electricMagicTools.tombenpotter.electricmagictools.common.CreativeTab; +import electricMagicTools.tombenpotter.electricmagictools.common.ElectricMagicTools; +import net.minecraft.client.Minecraft; +import net.minecraft.client.model.ModelBiped; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemArmor; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import net.minecraftforge.common.util.EnumHelper; + +public class ItemFeatherWing extends ItemArmor { + + public ItemFeatherWing() { + super(EnumHelper.addArmorMaterial("EMTWINGFEATHER", 1, new int[]{2, 2, 2, 2}, 6), 7, 1); + this.setMaxStackSize(1); + this.setMaxDamage(120); + this.setCreativeTab(CreativeTab.tabTombenpotter); + this.isDamageable(); + } + + @SideOnly(Side.CLIENT) + @Override + public void registerIcons(IIconRegister iconRegister) { + this.itemIcon = iconRegister.registerIcon(ElectricMagicTools.texturePath + ":featherwings"); + } + + @Override + @SideOnly(Side.CLIENT) + public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) { + return ElectricMagicTools.texturePath + ":textures/models/featherwing.png"; + } + + @Override + @SideOnly(Side.CLIENT) + public ModelBiped getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack, int armorSlot) { + return new ModelWings(); + } + + @Override + public void onArmorTick(World world, EntityPlayer player, ItemStack stack) { + if (world.isRemote) { + boolean isJumping = Minecraft.getMinecraft().gameSettings.keyBindJump.isPressed(); + boolean isHoldingJump = Minecraft.getMinecraft().gameSettings.keyBindJump.getIsKeyPressed(); + boolean isSneaking = Minecraft.getMinecraft().gameSettings.keyBindSneak.getIsKeyPressed(); + + if (isJumping) { + player.motionY = 0.25; + player.fallDistance = 0; + } + + if (isHoldingJump && !player.onGround && player.motionY < 0 && !player.capabilities.isCreativeMode) { + player.motionY *= 0.9; + player.fallDistance = 0; + } + + if (player.isInWater() && !player.capabilities.isCreativeMode) + player.motionY = -0.6; + + if ((player.worldObj.isRaining() || player.worldObj.isThundering()) && !player.capabilities.isCreativeMode) + player.motionY = -0.3; + + if (isSneaking && !player.onGround) { + player.motionY = -0.6; + player.fallDistance = 0F; + } + + if (player.fallDistance > 0.0F) + player.fallDistance -= 0.25F; + } + } +} diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/armor/wings/ItemNanoWing.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/armor/wings/ItemNanoWing.java new file mode 100644 index 0000000..19437b6 --- /dev/null +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/armor/wings/ItemNanoWing.java @@ -0,0 +1,211 @@ +package electricMagicTools.tombenpotter.electricmagictools.common.items.armor.wings; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import electricMagicTools.tombenpotter.electricmagictools.client.model.ModelWings; +import electricMagicTools.tombenpotter.electricmagictools.common.Config; +import electricMagicTools.tombenpotter.electricmagictools.common.CreativeTab; +import electricMagicTools.tombenpotter.electricmagictools.common.ElectricMagicTools; +import ic2.api.item.ElectricItem; +import ic2.api.item.IElectricItem; +import ic2.api.item.IMetalArmor; +import net.minecraft.client.Minecraft; +import net.minecraft.client.model.ModelBiped; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemArmor; +import net.minecraft.item.ItemStack; +import net.minecraft.util.DamageSource; +import net.minecraft.world.World; +import net.minecraftforge.common.ISpecialArmor; +import thaumcraft.api.IVisDiscountGear; +import thaumcraft.api.aspects.Aspect; + +import java.util.List; + +public class ItemNanoWing extends ItemArmor implements IVisDiscountGear, IElectricItem, ISpecialArmor, IMetalArmor { + + public int maxCharge = 100000; + + public ItemNanoWing() { + super(ArmorMaterial.DIAMOND, 7, 1); + this.setMaxStackSize(1); + this.setMaxDamage(27); + this.setCreativeTab(CreativeTab.tabTombenpotter); + } + + @Override + public int getVisDiscount(ItemStack stack, EntityPlayer player, Aspect aspect) { + return 5; + } + + @SideOnly(Side.CLIENT) + @Override + public void registerIcons(IIconRegister iconRegister) { + this.itemIcon = iconRegister.registerIcon(ElectricMagicTools.texturePath + ":nanowings"); + } + + @Override + @SideOnly(Side.CLIENT) + public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) { + return ElectricMagicTools.texturePath + ":textures/models/nanowing.png"; + } + + @Override + @SideOnly(Side.CLIENT) + public ModelBiped getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack, int armorSlot) { + return new ModelWings(); + } + + @SuppressWarnings({"unchecked", "rawtypes"}) + @Override + public void addInformation(ItemStack stack, EntityPlayer par2EntityPlayer, List list, boolean par4) { + list.add("Vis discount: 5"); + } + + @Override + public void onArmorTick(World world, EntityPlayer player, ItemStack stack) { + if (world.isRemote) { + boolean isJumping = Minecraft.getMinecraft().gameSettings.keyBindJump.isPressed(); + boolean isHoldingJump = Minecraft.getMinecraft().gameSettings.keyBindJump.getIsKeyPressed(); + boolean isSneaking = Minecraft.getMinecraft().gameSettings.keyBindSneak.getIsKeyPressed(); + + if (isJumping) { + player.motionY = 0.7; + player.fallDistance = 0; + } + + if (isHoldingJump && !player.onGround && player.motionY < 0 && !player.capabilities.isCreativeMode) { + player.motionY *= 0.3; + player.fallDistance = 0; + } + + if (player.isInWater() && !player.capabilities.isCreativeMode) + player.motionY = -0.4; + + if ((player.worldObj.isRaining() || player.worldObj.isThundering()) && !player.capabilities.isCreativeMode) + player.motionY = -0.2; + + if (isSneaking && !player.onGround) { + player.motionY = -0.6; + player.fallDistance = 0; + } + } + if (player.fallDistance > 0.0F) + player.fallDistance -= 0.75F; + } + + @Override + public boolean isMetalArmor(ItemStack itemstack, EntityPlayer player) { + return true; + } + + @Override + public boolean canProvideEnergy(ItemStack itemStack) { + return false; + } + + @Override + public Item getChargedItem(ItemStack itemStack) { + return this; + } + + @Override + public Item getEmptyItem(ItemStack itemStack) { + return this; + } + + @Override + public int getMaxCharge(ItemStack itemStack) { + return maxCharge; + } + + @Override + public int getTier(ItemStack itemStack) { + return 3; + } + + @Override + public int getTransferLimit(ItemStack itemStack) { + return 1000; + } + + @SuppressWarnings({"rawtypes", "unchecked"}) + @SideOnly(Side.CLIENT) + public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { + ItemStack itemStack = new ItemStack(this, 1); + if (getChargedItem(itemStack) == this) { + ItemStack charged = new ItemStack(this, 1); + ElectricItem.manager.charge(charged, 2147483647, 2147483647, true, false); + itemList.add(charged); + } + if (getEmptyItem(itemStack) == this) { + itemList.add(new ItemStack(this, 1, getMaxDamage())); + } + } + + @Override + public boolean isRepairable() { + return false; + } + + @Override + public int getItemEnchantability() { + if (Config.enchanting == false) { + return 0; + } else { + return 4; + } + } + + @Override + public boolean isBookEnchantable(ItemStack itemstack1, ItemStack itemstack2) { + if (Config.enchanting == false) { + return false; + } else { + return true; + } + } + + public int getEnergyPerDamage() { + return 100; + } + + @Override + public ArmorProperties getProperties(EntityLivingBase player, ItemStack armor, DamageSource source, double damage, int slot) { + if (source.isUnblockable()) { + return new net.minecraftforge.common.ISpecialArmor.ArmorProperties(0, 0.0D, 3); + } else { + double absorptionRatio = getBaseAbsorptionRatio() * getDamageAbsorptionRatio(); + int energyPerDamage = getEnergyPerDamage(); + int damageLimit = energyPerDamage <= 0 ? 0 : (25 * ElectricItem.manager.getCharge(armor)) / energyPerDamage; + return new net.minecraftforge.common.ISpecialArmor.ArmorProperties(3, absorptionRatio, damageLimit); + } + } + + @Override + public int getArmorDisplay(EntityPlayer player, ItemStack armor, int slot) { + if (ElectricItem.manager.getCharge(armor) >= getEnergyPerDamage()) { + return (int) Math.round(20D * getBaseAbsorptionRatio() * getDamageAbsorptionRatio()); + } else { + return 0; + } + } + + @Override + public void damageArmor(EntityLivingBase entity, ItemStack stack, DamageSource source, int damage, int slot) { + ElectricItem.manager.discharge(stack, damage * getEnergyPerDamage(), 0x7fffffff, true, false); + } + + public double getDamageAbsorptionRatio() { + return 1.1000000000000001D; + } + + private double getBaseAbsorptionRatio() { + return 0.14999999999999999D; + } +} diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/armor/wings/ItemQuantumWing.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/armor/wings/ItemQuantumWing.java new file mode 100644 index 0000000..634f7fc --- /dev/null +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/armor/wings/ItemQuantumWing.java @@ -0,0 +1,210 @@ +package electricMagicTools.tombenpotter.electricmagictools.common.items.armor.wings; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import electricMagicTools.tombenpotter.electricmagictools.client.model.ModelWings; +import electricMagicTools.tombenpotter.electricmagictools.common.Config; +import electricMagicTools.tombenpotter.electricmagictools.common.CreativeTab; +import electricMagicTools.tombenpotter.electricmagictools.common.ElectricMagicTools; +import ic2.api.item.ElectricItem; +import ic2.api.item.IElectricItem; +import ic2.api.item.IMetalArmor; +import net.minecraft.client.Minecraft; +import net.minecraft.client.model.ModelBiped; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemArmor; +import net.minecraft.item.ItemStack; +import net.minecraft.util.DamageSource; +import net.minecraft.world.World; +import net.minecraftforge.common.ISpecialArmor; +import thaumcraft.api.IVisDiscountGear; +import thaumcraft.api.aspects.Aspect; + +import java.util.List; + +public class ItemQuantumWing extends ItemArmor implements IVisDiscountGear, IElectricItem, ISpecialArmor, IMetalArmor { + + public int maxCharge = 1000000; + + public ItemQuantumWing() { + super(ArmorMaterial.DIAMOND, 7, 1); + this.setMaxStackSize(1); + this.setMaxDamage(27); + this.setCreativeTab(CreativeTab.tabTombenpotter); + } + + @Override + public int getVisDiscount(ItemStack stack, EntityPlayer player, Aspect aspect) { + return 6; + } + + @SideOnly(Side.CLIENT) + @Override + public void registerIcons(IIconRegister iconRegister) { + this.itemIcon = iconRegister.registerIcon(ElectricMagicTools.texturePath + ":quantumwings"); + } + + @Override + @SideOnly(Side.CLIENT) + public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) { + return ElectricMagicTools.texturePath + ":textures/models/quantumwing.png"; + } + + @Override + @SideOnly(Side.CLIENT) + public ModelBiped getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack, int armorSlot) { + return new ModelWings(); + } + + @SuppressWarnings({"unchecked", "rawtypes"}) + @Override + public void addInformation(ItemStack stack, EntityPlayer par2EntityPlayer, List list, boolean par4) { + list.add("Vis discount: 6"); + } + + @Override + public void onArmorTick(World world, EntityPlayer player, ItemStack stack) { + if (world.isRemote) { + boolean isJumping = Minecraft.getMinecraft().gameSettings.keyBindJump.isPressed(); + boolean isHoldingJump = Minecraft.getMinecraft().gameSettings.keyBindJump.getIsKeyPressed(); + boolean isSneaking = Minecraft.getMinecraft().gameSettings.keyBindSneak.getIsKeyPressed(); + + if (isJumping) + player.motionY = 0.85; + + if (isHoldingJump && !player.onGround && player.motionY < 0 && !player.capabilities.isCreativeMode) + player.motionY *= 0.3; + + if (player.isInWater() && !player.capabilities.isCreativeMode) + player.motionY = -0.1; + + if ((player.worldObj.isRaining() || player.worldObj.isThundering()) && !player.capabilities.isCreativeMode) + player.motionY = -0.05; + + if (isSneaking && isHoldingJump) + player.motionY = 0; + + if (isSneaking && !player.onGround && !isHoldingJump) + player.motionY = -0.6; + + + if (player.fallDistance > 0.0F) + player.fallDistance = 0F; + } + } + + @Override + public boolean isMetalArmor(ItemStack itemstack, EntityPlayer player) { + return true; + } + + @Override + public boolean canProvideEnergy(ItemStack itemStack) { + return false; + } + + @Override + public Item getChargedItem(ItemStack itemStack) { + return this; + } + + @Override + public Item getEmptyItem(ItemStack itemStack) { + return this; + } + + @Override + public int getMaxCharge(ItemStack itemStack) { + return maxCharge; + } + + @Override + public int getTier(ItemStack itemStack) { + return 3; + } + + @Override + public int getTransferLimit(ItemStack itemStack) { + return 10000; + } + + @SuppressWarnings({"rawtypes", "unchecked"}) + @SideOnly(Side.CLIENT) + public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { + ItemStack itemStack = new ItemStack(this, 1); + if (getChargedItem(itemStack) == this) { + ItemStack charged = new ItemStack(this, 1); + ElectricItem.manager.charge(charged, 2147483647, 2147483647, true, false); + itemList.add(charged); + } + if (getEmptyItem(itemStack) == this) { + itemList.add(new ItemStack(this, 1, getMaxDamage())); + } + } + + @Override + public boolean isRepairable() { + return false; + } + + @Override + public int getItemEnchantability() { + if (Config.enchanting == false) { + return 0; + } else { + return 4; + } + } + + @Override + public boolean isBookEnchantable(ItemStack itemstack1, ItemStack itemstack2) { + if (Config.enchanting == false) { + return false; + } else { + return true; + } + } + + public int getEnergyPerDamage() { + return 100; + } + + @Override + public ArmorProperties getProperties(EntityLivingBase player, ItemStack armor, DamageSource source, double damage, int slot) { + if (source.isUnblockable()) { + return new net.minecraftforge.common.ISpecialArmor.ArmorProperties(0, 0.0D, 3); + } else { + double absorptionRatio = getBaseAbsorptionRatio() * getDamageAbsorptionRatio(); + int energyPerDamage = getEnergyPerDamage(); + int damageLimit = energyPerDamage <= 0 ? 0 : (25 * ElectricItem.manager.getCharge(armor)) / energyPerDamage; + return new net.minecraftforge.common.ISpecialArmor.ArmorProperties(3, absorptionRatio, damageLimit); + } + } + + @Override + public int getArmorDisplay(EntityPlayer player, ItemStack armor, int slot) { + if (ElectricItem.manager.getCharge(armor) >= getEnergyPerDamage()) { + return (int) Math.round(20D * getBaseAbsorptionRatio() * getDamageAbsorptionRatio()); + } else { + return 0; + } + } + + @Override + public void damageArmor(EntityLivingBase entity, ItemStack stack, DamageSource source, int damage, int slot) { + ElectricItem.manager.discharge(stack, damage * getEnergyPerDamage(), 0x7fffffff, true, false); + } + + public double getDamageAbsorptionRatio() { + return 1.1000000000000001D; + } + + private double getBaseAbsorptionRatio() { + return 0.34999999999999999D; + } +} diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/armor/wings/ItemThaumiumReinforcedWing.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/armor/wings/ItemThaumiumReinforcedWing.java new file mode 100644 index 0000000..7a724b5 --- /dev/null +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/armor/wings/ItemThaumiumReinforcedWing.java @@ -0,0 +1,94 @@ +package electricMagicTools.tombenpotter.electricmagictools.common.items.armor.wings; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import electricMagicTools.tombenpotter.electricmagictools.client.model.ModelWings; +import electricMagicTools.tombenpotter.electricmagictools.common.CreativeTab; +import electricMagicTools.tombenpotter.electricmagictools.common.ElectricMagicTools; +import net.minecraft.client.Minecraft; +import net.minecraft.client.model.ModelBiped; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemArmor; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import thaumcraft.api.IRepairable; +import thaumcraft.api.IVisDiscountGear; +import thaumcraft.api.aspects.Aspect; + +import java.util.List; + +public class ItemThaumiumReinforcedWing extends ItemArmor implements IVisDiscountGear, IRepairable { + + public ItemThaumiumReinforcedWing() { + super(ArmorMaterial.IRON, 7, 1); + this.setMaxStackSize(1); + this.setMaxDamage(250); + this.setCreativeTab(CreativeTab.tabTombenpotter); + this.isDamageable(); + } + + @Override + public int getVisDiscount(ItemStack stack, EntityPlayer player, Aspect aspect) { + return 4; + } + + @SideOnly(Side.CLIENT) + @Override + public void registerIcons(IIconRegister iconRegister) { + this.itemIcon = iconRegister.registerIcon(ElectricMagicTools.texturePath + ":thaumiumwings"); + } + + @Override + @SideOnly(Side.CLIENT) + public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) { + return ElectricMagicTools.texturePath + ":textures/models/thaumiumwing.png"; + } + + @Override + @SideOnly(Side.CLIENT) + public ModelBiped getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack, int armorSlot) { + return new ModelWings(); + } + + @SuppressWarnings({"unchecked", "rawtypes"}) + @Override + public void addInformation(ItemStack stack, EntityPlayer par2EntityPlayer, List list, boolean par4) { + list.add("Vis discount: 4"); + } + + @Override + public void onArmorTick(World world, EntityPlayer player, ItemStack stack) { + if (world.isRemote) { + boolean isJumping = Minecraft.getMinecraft().gameSettings.keyBindJump.isPressed(); + boolean isHoldingJump = Minecraft.getMinecraft().gameSettings.keyBindJump.getIsKeyPressed(); + boolean isSneaking = Minecraft.getMinecraft().gameSettings.keyBindSneak.getIsKeyPressed(); + + if (isJumping) { + player.motionY = 0.5; + player.fallDistance = 0; + } + + if (isHoldingJump && !player.onGround && player.motionY < 0 && !player.capabilities.isCreativeMode) { + player.motionY *= 0.5; + player.fallDistance = 0; + } + + if (player.isInWater() && !player.capabilities.isCreativeMode) + player.motionY = -0.6; + + if ((player.worldObj.isRaining() || player.worldObj.isThundering()) && !player.capabilities.isCreativeMode) + player.motionY = -0.3; + + if (isSneaking && !player.onGround) { + player.motionY = -0.6; + player.fallDistance = 0; + } + + if (player.fallDistance > 0.0F) + player.fallDistance -= 0.5F; + } + } +} diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/blocks/ItemBlockEMTMachines.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/blocks/ItemBlockEMTMachines.java index 9bc5f56..3cb7f9e 100644 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/blocks/ItemBlockEMTMachines.java +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/blocks/ItemBlockEMTMachines.java @@ -1,10 +1,10 @@ /******************************************************************************* * Copyright (c) 2014 Tombenpotter. * All rights reserved. - * + * * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * + * * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. * http://www.minecraftforum.net/topic/1585216- @@ -17,35 +17,35 @@ import net.minecraft.item.ItemStack; public class ItemBlockEMTMachines extends ItemBlock { - public ItemBlockEMTMachines(Block id) { - super(id); - setHasSubtypes(true); - } + public ItemBlockEMTMachines(Block id) { + super(id); + setHasSubtypes(true); + } - @Override - public String getUnlocalizedName(ItemStack itemstack) { - String name = ""; - switch (itemstack.getItemDamage()) { - case 0: { - name = "wandrecharge"; - break; - } - case 1: { - name = "etheralprocessor"; - break; - } - case 2: { - name = "raindispeller"; - break; - } - default: - name = "nothing"; - } - return getUnlocalizedName() + "." + name; - } + @Override + public String getUnlocalizedName(ItemStack itemstack) { + String name = ""; + switch (itemstack.getItemDamage()) { + case 0: { + name = "wandrecharge"; + break; + } + case 1: { + name = "etheralprocessor"; + break; + } + case 2: { + name = "raindispeller"; + break; + } + default: + name = "nothing"; + } + return getUnlocalizedName() + "." + name; + } - @Override - public int getMetadata(int par1) { - return par1; - } + @Override + public int getMetadata(int par1) { + return par1; + } } diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/blocks/ItemBlockEMTSolars.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/blocks/ItemBlockEMTSolars.java index 9736dd5..b426f86 100644 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/blocks/ItemBlockEMTSolars.java +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/blocks/ItemBlockEMTSolars.java @@ -1,190 +1,193 @@ /******************************************************************************* * Copyright (c) 2014 Tombenpotter. * All rights reserved. - * + * * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * + * * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ package electricMagicTools.tombenpotter.electricmagictools.common.items.blocks; -import java.util.List; - +import electricMagicTools.tombenpotter.electricmagictools.common.Config; import net.minecraft.block.Block; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import electricMagicTools.tombenpotter.electricmagictools.common.Config; + +import java.util.List; public class ItemBlockEMTSolars extends ItemBlock { - public ItemBlockEMTSolars(Block id) { - super(id); - setHasSubtypes(true); - } + public ItemBlockEMTSolars(Block id) { + super(id); + setHasSubtypes(true); + } - @Override - public String getUnlocalizedName(ItemStack itemstack) { - String name = ""; - switch (itemstack.getItemDamage()) { - case 0: { - name = "compressed"; - break; - } - case 1: { - name = "doublecompressed"; - break; - } - case 2: { - name = "triplecompressed"; - break; - } - case 3: { - name = "water"; - break; - } - case 4: { - name = "doublewater"; - break; - } - case 5: { - name = "triplewater"; - break; - } - case 6: { - name = "dark"; - break; - } - case 7: { - name = "doubledark"; - break; - } - case 8: { - name = "tripledark"; - break; - } - case 9: { - name = "order"; - break; - } - case 10: { - name = "doubleorder"; - break; - } - case 11: { - name = "tripleorder"; - break; - } - case 12: { - name = "fire"; - break; - } - case 13: { - name = "doublefire"; - break; - } - case 14: { - name = "triplefire"; - break; - } - case 15: { - name = "air"; - break; - } - default: - name = "nothing"; - break; - } - return getUnlocalizedName() + "." + name; - } + @Override + public String getUnlocalizedName(ItemStack itemstack) { + String name = ""; + switch (itemstack.getItemDamage()) { + case 0: { + name = "compressed"; + break; + } + case 1: { + name = "doublecompressed"; + break; + } + case 2: { + name = "triplecompressed"; + break; + } + case 3: { + name = "water"; + break; + } + case 4: { + name = "doublewater"; + break; + } + case 5: { + name = "triplewater"; + break; + } + case 6: { + name = "dark"; + break; + } + case 7: { + name = "doubledark"; + break; + } + case 8: { + name = "tripledark"; + break; + } + case 9: { + name = "order"; + break; + } + case 10: { + name = "doubleorder"; + break; + } + case 11: { + name = "tripleorder"; + break; + } + case 12: { + name = "fire"; + break; + } + case 13: { + name = "doublefire"; + break; + } + case 14: { + name = "triplefire"; + break; + } + case 15: { + name = "air"; + break; + } + default: + name = "nothing"; + break; + } + return getUnlocalizedName() + "." + name; + } - @Override - public int getMetadata(int par1) { - return par1; - } + @Override + public int getMetadata(int par1) { + return par1; + } - @Override - @SuppressWarnings({ "unchecked", "rawtypes" }) - public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean par4) { - switch (itemstack.getItemDamage()) { - case 0: { - list.add(Config.compressedSolarOutput + " EU/T"); - break; - } - case 1: { - list.add(Config.doubleCompressedSolarOutput + " EU/T"); - break; - } - case 2: { - list.add(Config.tripleCompressedSolarOutput + " EU/T"); - break; - } - case 3: { - list.add("Special Effect: " + Config.compressedSolarOutput + " EU/T when raining"); - break; - } - case 4: { - list.add("Special Effect: " + Config.doubleCompressedSolarOutput + " EU/T when raining"); - break; - } - case 5: { - list.add("Special Effect: " + Config.tripleCompressedSolarOutput + " EU/T when raining"); - break; - } - case 6: { - list.add("Special Effect: " + Config.compressedSolarOutput + " EU/T at night"); - break; - } - case 7: { - list.add("Special Effect: " + Config.doubleCompressedSolarOutput + " EU/T at night"); - break; - } - case 8: { - list.add("Special Effect: " + Config.tripleCompressedSolarOutput + " EU/T at night"); - break; - } - case 9: { - list.add("Normal Conditions: " + Config.compressedSolarOutput + " EU/T"); - list.add("Special Effect: Output multiplied by 3"); - break; - } - case 10: { - list.add("Normal Conditions: " + Config.doubleCompressedSolarOutput + " EU/T"); - list.add("Special Effect: Output multiplied by 3"); - break; - } + @Override + @SuppressWarnings({"unchecked", "rawtypes"}) + public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean par4) { + if (GuiScreen.isShiftKeyDown()) { + switch (itemstack.getItemDamage()) { + case 0: { + list.add(Config.compressedSolarOutput + " EU/T"); + break; + } + case 1: { + list.add(Config.doubleCompressedSolarOutput + " EU/T"); + break; + } + case 2: { + list.add(Config.tripleCompressedSolarOutput + " EU/T"); + break; + } + case 3: { + list.add("Special Effect: " + Config.compressedSolarOutput + " EU/T when raining"); + break; + } + case 4: { + list.add("Special Effect: " + Config.doubleCompressedSolarOutput + " EU/T when raining"); + break; + } + case 5: { + list.add("Special Effect: " + Config.tripleCompressedSolarOutput + " EU/T when raining"); + break; + } + case 6: { + list.add("Special Effect: " + Config.compressedSolarOutput + " EU/T at night"); + break; + } + case 7: { + list.add("Special Effect: " + Config.doubleCompressedSolarOutput + " EU/T at night"); + break; + } + case 8: { + list.add("Special Effect: " + Config.tripleCompressedSolarOutput + " EU/T at night"); + break; + } + case 9: { + list.add("Normal Conditions: " + Config.compressedSolarOutput + " EU/T"); + list.add("Special Effect: Output multiplied by 3"); + break; + } + case 10: { + list.add("Normal Conditions: " + Config.doubleCompressedSolarOutput + " EU/T"); + list.add("Special Effect: Output multiplied by 3"); + break; + } - case 11: { - list.add("Normal Conditions: " + Config.tripleCompressedSolarOutput + " EU/T"); - list.add("Special Effect: Output multiplied by 3"); - break; - } - case 12: { - list.add("Normal Conditions: " + Config.compressedSolarOutput + " EU/T"); - list.add("Special Effect: Output multiplied by 2 when located in the nether"); - break; - } - case 13: { - list.add("Normal Conditions: " + Config.doubleCompressedSolarOutput + " EU/T"); - list.add("Special Effect: Output multiplied by 2 when located in the nether"); - break; - } - case 14: { - list.add("Normal Conditions: " + Config.tripleCompressedSolarOutput + " EU/T"); - list.add("Special Effect: Output multiplied by 2 when lava is on top"); - list.add("Special Effect: Output multiplied by 2 when located in the nether"); - } - case 15: { - list.add("Normal Conditions: " + Config.compressedSolarOutput + " EU/T"); - list.add("Special Effect: Output multiplied by 2.5 when the block is over Y = 160"); - break; - } - default: - list.add("Didn't I forget a tooltip?"); - break; - } - } + case 11: { + list.add("Normal Conditions: " + Config.tripleCompressedSolarOutput + " EU/T"); + list.add("Special Effect: Output multiplied by 3"); + break; + } + case 12: { + list.add("Normal Conditions: " + Config.compressedSolarOutput + " EU/T"); + list.add("Special Effect: Output multiplied by 2 when located in the nether"); + break; + } + case 13: { + list.add("Normal Conditions: " + Config.doubleCompressedSolarOutput + " EU/T"); + list.add("Special Effect: Output multiplied by 2 when located in the nether"); + break; + } + case 14: { + list.add("Normal Conditions: " + Config.tripleCompressedSolarOutput + " EU/T"); + list.add("Special Effect: Output multiplied by 2 when lava is on top"); + list.add("Special Effect: Output multiplied by 2 when located in the nether"); + } + case 15: { + list.add("Normal Conditions: " + Config.compressedSolarOutput + " EU/T"); + list.add("Special Effect: Output multiplied by 2.5 when the block is over Y = 160"); + break; + } + default: + list.add("Didn't I forget a tooltip?"); + break; + } + } + } } diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/blocks/ItemBlockEMTSolars2.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/blocks/ItemBlockEMTSolars2.java index a9c976d..6d7247a 100644 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/blocks/ItemBlockEMTSolars2.java +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/blocks/ItemBlockEMTSolars2.java @@ -1,99 +1,102 @@ /******************************************************************************* * Copyright (c) 2014 Tombenpotter. * All rights reserved. - * + * * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * + * * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ package electricMagicTools.tombenpotter.electricmagictools.common.items.blocks; -import java.util.List; - +import electricMagicTools.tombenpotter.electricmagictools.common.Config; import net.minecraft.block.Block; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import electricMagicTools.tombenpotter.electricmagictools.common.Config; + +import java.util.List; public class ItemBlockEMTSolars2 extends ItemBlock { - public ItemBlockEMTSolars2(Block id) { - super(id); - setHasSubtypes(true); - } + public ItemBlockEMTSolars2(Block id) { + super(id); + setHasSubtypes(true); + } - @Override - public String getUnlocalizedName(ItemStack itemstack) { - String name = ""; - switch (itemstack.getItemDamage()) { - case 0: { - name = "doubleair"; - break; - } - case 1: { - name = "tripleair"; - break; - } - case 2: { - name = "earth"; - break; - } - case 3: { - name = "doubleearth"; - break; - } - case 4: { - name = "tripleearth"; - break; - } - default: - name = "nothing"; - break; - } - return getUnlocalizedName() + "." + name; - } + @Override + public String getUnlocalizedName(ItemStack itemstack) { + String name = ""; + switch (itemstack.getItemDamage()) { + case 0: { + name = "doubleair"; + break; + } + case 1: { + name = "tripleair"; + break; + } + case 2: { + name = "earth"; + break; + } + case 3: { + name = "doubleearth"; + break; + } + case 4: { + name = "tripleearth"; + break; + } + default: + name = "nothing"; + break; + } + return getUnlocalizedName() + "." + name; + } - @Override - public int getMetadata(int par1) { - return par1; - } + @Override + public int getMetadata(int par1) { + return par1; + } - @Override - @SuppressWarnings({ "unchecked", "rawtypes" }) - public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean par4) { - switch (itemstack.getItemDamage()) { - case 0: { - list.add("Normal Conditions: " + Config.doubleCompressedSolarOutput + " EU/T"); - list.add("Special Effect: Output multiplied by 2.5 when the block is over Y = 160"); - break; - } - case 1: { - list.add("Normal Conditions: " + Config.tripleCompressedSolarOutput + " EU/T"); - list.add("Special Effect: Output multiplied by 2.5 when the block is over Y = 160"); - break; - } - case 2: { - list.add("Normal Conditions: " + Config.compressedSolarOutput + " EU/T"); - list.add("Special Effect: Output multiplied by 2.5 when the block is under Y = 10"); - break; - } - case 3: { - list.add("Normal Conditions: " + Config.doubleCompressedSolarOutput + " EU/T"); - list.add("Special Effect: Output multiplied by 2.5 when the block is under Y = 10"); - break; - } - case 4: { - list.add("Normal Conditions: " + Config.tripleCompressedSolarOutput + " EU/T"); - list.add("Special Effect: Output multiplied by 2.5 when the block is under Y = 10"); - break; - } - default: - list.add("Didn't I forget a tooltip?"); - break; - } - } + @Override + @SuppressWarnings({"unchecked", "rawtypes"}) + public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean par4) { + if (GuiScreen.isShiftKeyDown()) { + switch (itemstack.getItemDamage()) { + case 0: { + list.add("Normal Conditions: " + Config.doubleCompressedSolarOutput + " EU/T"); + list.add("Special Effect: Output multiplied by 2.5 when the block is over Y = 160"); + break; + } + case 1: { + list.add("Normal Conditions: " + Config.tripleCompressedSolarOutput + " EU/T"); + list.add("Special Effect: Output multiplied by 2.5 when the block is over Y = 160"); + break; + } + case 2: { + list.add("Normal Conditions: " + Config.compressedSolarOutput + " EU/T"); + list.add("Special Effect: Output multiplied by 2.5 when the block is under Y = 10"); + break; + } + case 3: { + list.add("Normal Conditions: " + Config.doubleCompressedSolarOutput + " EU/T"); + list.add("Special Effect: Output multiplied by 2.5 when the block is under Y = 10"); + break; + } + case 4: { + list.add("Normal Conditions: " + Config.tripleCompressedSolarOutput + " EU/T"); + list.add("Special Effect: Output multiplied by 2.5 when the block is under Y = 10"); + break; + } + default: + list.add("Didn't I forget a tooltip?"); + break; + } + } + } } diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/blocks/ItemBlockEssentiaGenerators.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/blocks/ItemBlockEssentiaGenerators.java index 785983f..bc8bed6 100644 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/blocks/ItemBlockEssentiaGenerators.java +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/blocks/ItemBlockEssentiaGenerators.java @@ -1,10 +1,10 @@ /******************************************************************************* * Copyright (c) 2014 Tombenpotter. * All rights reserved. - * + * * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * + * * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. * http://www.minecraftforum.net/topic/1585216- @@ -17,39 +17,39 @@ import net.minecraft.item.ItemStack; public class ItemBlockEssentiaGenerators extends ItemBlock { - public ItemBlockEssentiaGenerators(Block id) { - super(id); - setHasSubtypes(true); - } + public ItemBlockEssentiaGenerators(Block id) { + super(id); + setHasSubtypes(true); + } - @Override - public String getUnlocalizedName(ItemStack itemstack) { - String name = ""; - switch (itemstack.getItemDamage()) { - case 0: { - name = "potentia"; - break; - } - case 1: { - name = "ignis"; - break; - } - case 2: { - name = "auram"; - break; - } - case 3: { - name = "arbor"; - break; - } - default: - name = "nothing"; - } - return getUnlocalizedName() + "." + name; - } + @Override + public String getUnlocalizedName(ItemStack itemstack) { + String name = ""; + switch (itemstack.getItemDamage()) { + case 0: { + name = "potentia"; + break; + } + case 1: { + name = "ignis"; + break; + } + case 2: { + name = "auram"; + break; + } + case 3: { + name = "arbor"; + break; + } + default: + name = "nothing"; + } + return getUnlocalizedName() + "." + name; + } - @Override - public int getMetadata(int meta) { - return meta; - } + @Override + public int getMetadata(int meta) { + return meta; + } } diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/foci/ItemBaseFocus.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/foci/ItemBaseFocus.java index 502f91a..b14447a 100644 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/foci/ItemBaseFocus.java +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/foci/ItemBaseFocus.java @@ -1,18 +1,17 @@ /******************************************************************************* * Copyright (c) 2014 Tombenpotter. * All rights reserved. - * + * * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * + * * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ package electricMagicTools.tombenpotter.electricmagictools.common.items.foci; -import java.util.List; - +import electricMagicTools.tombenpotter.electricmagictools.common.CreativeTab; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; import net.minecraft.item.Item; @@ -24,118 +23,119 @@ import net.minecraft.world.World; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.api.wands.IWandFocus; -import electricMagicTools.tombenpotter.electricmagictools.common.CreativeTab; + +import java.util.List; public abstract class ItemBaseFocus extends Item implements IWandFocus { - private IIcon ornament, depth; + private IIcon ornament, depth; - public ItemBaseFocus() { - super(); - this.setMaxDamage(1); - this.setNoRepair(); - this.setMaxStackSize(1); - this.setCreativeTab(CreativeTab.tabTombenpotter); - } + public ItemBaseFocus() { + super(); + this.setMaxDamage(1); + this.setNoRepair(); + this.setMaxStackSize(1); + this.setCreativeTab(CreativeTab.tabTombenpotter); + } - boolean hasOrnament() { - return false; - } + boolean hasOrnament() { + return false; + } - boolean hasDepth() { - return false; - } + boolean hasDepth() { + return false; + } - @Override - public int getFocusColor() { - return 0; - } + @Override + public int getFocusColor() { + return 0; + } - @Override - public boolean isItemTool(ItemStack par1ItemStack) { - return true; - } + @Override + public boolean isItemTool(ItemStack par1ItemStack) { + return true; + } - @Override - public EnumRarity getRarity(ItemStack itemstack) { - return EnumRarity.rare; - } + @Override + public EnumRarity getRarity(ItemStack itemstack) { + return EnumRarity.rare; + } - @Override - public IIcon getFocusDepthLayerIcon() { - return depth; - } + @Override + public IIcon getFocusDepthLayerIcon() { + return depth; + } - @Override - public IIcon getOrnament() { - return ornament; - } + @Override + public IIcon getOrnament() { + return ornament; + } - @Override - public WandFocusAnimation getAnimation() { - return WandFocusAnimation.WAVE; - } + @Override + public WandFocusAnimation getAnimation() { + return WandFocusAnimation.WAVE; + } - @Override - public AspectList getVisCost() { - return null; - } + @Override + public AspectList getVisCost() { + return null; + } - public boolean isUseItem() { - return isVisCostPerTick(); - } + public boolean isUseItem() { + return isVisCostPerTick(); + } - @Override - public boolean isVisCostPerTick() { - return false; - } + @Override + public boolean isVisCostPerTick() { + return false; + } - @Override - public ItemStack onFocusRightClick(ItemStack paramItemStack, World paramWorld, EntityPlayer paramEntityPlayer, MovingObjectPosition paramMovingObjectPosition) { - if (isUseItem()) - paramEntityPlayer.setItemInUse(paramItemStack, Integer.MAX_VALUE); - return paramItemStack; - } + @Override + public ItemStack onFocusRightClick(ItemStack paramItemStack, World paramWorld, EntityPlayer paramEntityPlayer, MovingObjectPosition paramMovingObjectPosition) { + if (isUseItem()) + paramEntityPlayer.setItemInUse(paramItemStack, Integer.MAX_VALUE); + return paramItemStack; + } - @Override - public void onUsingFocusTick(ItemStack itemstack, EntityPlayer player, int count) { + @Override + public void onUsingFocusTick(ItemStack itemstack, EntityPlayer player, int count) { - } + } - @Override - public void onPlayerStoppedUsingFocus(ItemStack itemstack, World world, EntityPlayer player, int count) { - } + @Override + public void onPlayerStoppedUsingFocus(ItemStack itemstack, World world, EntityPlayer player, int count) { + } - @Override - public String getSortingHelper(ItemStack itemstack) { - return "00"; - } + @Override + public String getSortingHelper(ItemStack itemstack) { + return "00"; + } - @Override - public boolean onFocusBlockStartBreak(ItemStack itemstack, int x, int y, int z, EntityPlayer player) { - return false; - } + @Override + public boolean onFocusBlockStartBreak(ItemStack itemstack, int x, int y, int z, EntityPlayer player) { + return false; + } - @Override - public boolean acceptsEnchant(int id) { - return false; - } + @Override + public boolean acceptsEnchant(int id) { + return false; + } - @Override - public int getItemEnchantability() { - return 5; - } + @Override + public int getItemEnchantability() { + return 5; + } - @SuppressWarnings({ "rawtypes", "unchecked" }) - @Override - public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { - AspectList cost = getVisCost(); - if (cost != null && cost.size() > 0) { - list.add(StatCollector.translateToLocal(isVisCostPerTick() ? "item.Focus.cost2" : "item.Focus.cost1")); - for (Aspect aspect : cost.getAspectsSorted()) { - float amount = cost.getAmount(aspect) / 100.0F; - list.add(" " + '\u00a7' + aspect.getChatcolor() + aspect.getName() + '\u00a7' + "r x " + amount); - } - } - } + @SuppressWarnings({"rawtypes", "unchecked"}) + @Override + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { + AspectList cost = getVisCost(); + if (cost != null && cost.size() > 0) { + list.add(StatCollector.translateToLocal(isVisCostPerTick() ? "item.Focus.cost2" : "item.Focus.cost1")); + for (Aspect aspect : cost.getAspectsSorted()) { + float amount = cost.getAmount(aspect) / 100.0F; + list.add(" " + '\u00a7' + aspect.getChatcolor() + aspect.getName() + '\u00a7' + "r x " + amount); + } + } + } } diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/foci/ItemChargeFocus.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/foci/ItemChargeFocus.java index e6ad52d..be4be26 100644 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/foci/ItemChargeFocus.java +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/foci/ItemChargeFocus.java @@ -1,16 +1,20 @@ /******************************************************************************* * Copyright (c) 2014 Tombenpotter. * All rights reserved. - * + * * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * + * * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ package electricMagicTools.tombenpotter.electricmagictools.common.items.foci; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import electricMagicTools.tombenpotter.electricmagictools.common.Config; +import electricMagicTools.tombenpotter.electricmagictools.common.ElectricMagicTools; import ic2.api.item.ElectricItem; import ic2.api.item.IElectricItem; import net.minecraft.client.renderer.texture.IIconRegister; @@ -21,68 +25,65 @@ import net.minecraft.world.World; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.common.items.wands.ItemWandCasting; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import electricMagicTools.tombenpotter.electricmagictools.common.Config; public class ItemChargeFocus extends ItemBaseFocus { - private static final AspectList visCost = new AspectList().add(Aspect.FIRE, 10).add(Aspect.WATER, 10).add(Aspect.AIR, 10).add(Aspect.EARTH, 10).add(Aspect.ORDER, 10).add(Aspect.ENTROPY, 10); + private static final AspectList visCost = new AspectList().add(Aspect.FIRE, 10).add(Aspect.WATER, 10).add(Aspect.AIR, 10).add(Aspect.EARTH, 10).add(Aspect.ORDER, 10).add(Aspect.ENTROPY, 10); - public ItemChargeFocus() { - super(); - } + public ItemChargeFocus() { + super(); + } - @SideOnly(Side.CLIENT) - @Override - public void registerIcons(IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon("electricmagictools:chargefocus"); - } + @SideOnly(Side.CLIENT) + @Override + public void registerIcons(IIconRegister iconRegister) { + this.itemIcon = iconRegister.registerIcon(ElectricMagicTools.texturePath + ":chargefocus"); + } - @Override - public int getFocusColor() { - return 0xFFFF00; - } + @Override + public int getFocusColor() { + return 0xFFFF00; + } - @Override - public AspectList getVisCost() { - return visCost; - } + @Override + public AspectList getVisCost() { + return visCost; + } - @Override - public String getSortingHelper(ItemStack itemstack) { - return "CHARGING"; - } + @Override + public String getSortingHelper(ItemStack itemstack) { + return "WANDCHARGING"; + } - @Override - public ItemStack onFocusRightClick(ItemStack itemstack, World world, EntityPlayer player, MovingObjectPosition movingobjectposition) { - ItemWandCasting wand = (ItemWandCasting) itemstack.getItem(); - if (wand.consumeAllVis(itemstack, player, getVisCost(), true, true)) { - if (!world.isRemote) { + @Override + public ItemStack onFocusRightClick(ItemStack itemstack, World world, EntityPlayer player, MovingObjectPosition movingobjectposition) { + ItemWandCasting wand = (ItemWandCasting) itemstack.getItem(); + if (wand.consumeAllVis(itemstack, player, getVisCost(), true, true)) { + if (!world.isRemote) { - int energyLeft = Config.chargeFocusProduction; - for (int i = 0; i < player.inventory.armorInventory.length; i++) { - if (energyLeft > 0) { - if ((player.inventory.armorInventory[i] != null) && (player.inventory.armorInventory[i].getItem() instanceof IElectricItem)) { - int sentPacket = ElectricItem.manager.charge(player.inventory.armorInventory[i], energyLeft, 4, false, false); - energyLeft -= sentPacket; - } - } else { - return itemstack; - } - } - for (int j = 0; j < player.inventory.mainInventory.length; j++) { - if (energyLeft > 0) { - if ((player.inventory.mainInventory[j] != null) && (player.inventory.mainInventory[j].getItem() instanceof IElectricItem)) { - int sentPacket = ElectricItem.manager.charge(player.inventory.mainInventory[j], energyLeft, 4, false, false); - energyLeft -= sentPacket; - } - } else { - return itemstack; - } - } - } - } - return itemstack; - } + int energyLeft = Config.chargeFocusProduction; + for (int i = 0; i < player.inventory.armorInventory.length; i++) { + if (energyLeft > 0) { + if ((player.inventory.armorInventory[i] != null) && (player.inventory.armorInventory[i].getItem() instanceof IElectricItem)) { + int sentPacket = ElectricItem.manager.charge(player.inventory.armorInventory[i], energyLeft, 4, false, false); + energyLeft -= sentPacket; + } + } else { + return itemstack; + } + } + for (int j = 0; j < player.inventory.mainInventory.length; j++) { + if (energyLeft > 0) { + if ((player.inventory.mainInventory[j] != null) && (player.inventory.mainInventory[j].getItem() instanceof IElectricItem)) { + int sentPacket = ElectricItem.manager.charge(player.inventory.mainInventory[j], energyLeft, 4, false, false); + energyLeft -= sentPacket; + } + } else { + return itemstack; + } + } + } + } + return itemstack; + } } diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/foci/ItemChristmasFocus.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/foci/ItemChristmasFocus.java index 4632163..c8097c0 100644 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/foci/ItemChristmasFocus.java +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/foci/ItemChristmasFocus.java @@ -1,16 +1,19 @@ /******************************************************************************* * Copyright (c) 2014 Tombenpotter. * All rights reserved. - * + * * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * + * * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ package electricMagicTools.tombenpotter.electricmagictools.common.items.foci; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import electricMagicTools.tombenpotter.electricmagictools.common.ElectricMagicTools; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.monster.EntitySnowman; import net.minecraft.entity.player.EntityPlayer; @@ -20,50 +23,48 @@ import net.minecraft.world.World; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.common.items.wands.ItemWandCasting; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ItemChristmasFocus extends ItemBaseFocus { - private static final AspectList visCost = new AspectList().add(Aspect.ORDER, 500).add(Aspect.AIR, 500); + private static final AspectList visCost = new AspectList().add(Aspect.ORDER, 500).add(Aspect.AIR, 500); - public ItemChristmasFocus() { - super(); - } + public ItemChristmasFocus() { + super(); + } - @Override - public int getFocusColor() { - return 99999999; - } + @Override + public int getFocusColor() { + return 99999999; + } - @SideOnly(Side.CLIENT) - @Override - public void registerIcons(IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon("electricmagictools:christmasfocus"); - } + @SideOnly(Side.CLIENT) + @Override + public void registerIcons(IIconRegister iconRegister) { + this.itemIcon = iconRegister.registerIcon(ElectricMagicTools.texturePath + ":christmasfocus"); + } - @Override - public AspectList getVisCost() { - return visCost; - } + @Override + public AspectList getVisCost() { + return visCost; + } - @Override - public String getSortingHelper(ItemStack itemstack) { - return "CHRISTMAS"; - } + @Override + public String getSortingHelper(ItemStack itemstack) { + return "CHRISTMAS"; + } - @Override - public ItemStack onFocusRightClick(ItemStack itemstack, World world, EntityPlayer player, MovingObjectPosition movingobjectposition) { - ItemWandCasting wand = (ItemWandCasting) itemstack.getItem(); - if (wand.consumeAllVis(itemstack, player, getVisCost(), true, true)) { - if (!world.isRemote) { - EntitySnowman snowman; - snowman = new EntitySnowman(world); - snowman.setPosition(player.posX + 2, player.posY + 1, player.posZ + 2); - world.spawnEntityInWorld(snowman); - } - } - return itemstack; - } + @Override + public ItemStack onFocusRightClick(ItemStack itemstack, World world, EntityPlayer player, MovingObjectPosition movingobjectposition) { + ItemWandCasting wand = (ItemWandCasting) itemstack.getItem(); + if (wand.consumeAllVis(itemstack, player, getVisCost(), true, true)) { + if (!world.isRemote) { + EntitySnowman snowman; + snowman = new EntitySnowman(world); + snowman.setPosition(player.posX + 2, player.posY + 1, player.posZ + 2); + world.spawnEntityInWorld(snowman); + } + } + return itemstack; + } } diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/foci/ItemExplosionFocus.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/foci/ItemExplosionFocus.java index 7da00d4..5e3386a 100644 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/foci/ItemExplosionFocus.java +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/foci/ItemExplosionFocus.java @@ -1,16 +1,20 @@ /******************************************************************************* * Copyright (c) 2014 Tombenpotter. * All rights reserved. - * + * * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * + * * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ package electricMagicTools.tombenpotter.electricmagictools.common.items.foci; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import electricMagicTools.tombenpotter.electricmagictools.common.ElectricMagicTools; +import electricMagicTools.tombenpotter.electricmagictools.common.entities.EntityLaser; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -19,49 +23,46 @@ import net.minecraft.world.World; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.common.items.wands.ItemWandCasting; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import electricMagicTools.tombenpotter.electricmagictools.common.entities.EntityLaser; public class ItemExplosionFocus extends ItemBaseFocus { - private static final AspectList visCost = new AspectList().add(Aspect.FIRE, 200).add(Aspect.ENTROPY, 200); + private static final AspectList visCost = new AspectList().add(Aspect.FIRE, 200).add(Aspect.ENTROPY, 200); - public ItemExplosionFocus() { - super(); - } + public ItemExplosionFocus() { + super(); + } - @SideOnly(Side.CLIENT) - @Override - public void registerIcons(IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon("electricmagictools:explosionfocus"); - } + @SideOnly(Side.CLIENT) + @Override + public void registerIcons(IIconRegister iconRegister) { + this.itemIcon = iconRegister.registerIcon(ElectricMagicTools.texturePath + ":explosionfocus"); + } - @Override - public int getFocusColor() { - return 9990; - } + @Override + public int getFocusColor() { + return 9990; + } - @Override - public AspectList getVisCost() { - return visCost; - } + @Override + public AspectList getVisCost() { + return visCost; + } - @Override - public String getSortingHelper(ItemStack itemstack) { - return "EXPLOSION"; - } + @Override + public String getSortingHelper(ItemStack itemstack) { + return "EXPLOSION"; + } - @Override - public ItemStack onFocusRightClick(ItemStack itemstack, World world, EntityPlayer player, MovingObjectPosition movingobjectposition) { - ItemWandCasting wand = (ItemWandCasting) itemstack.getItem(); - if (wand.consumeAllVis(itemstack, player, getVisCost(), true, true)) { - if (!world.isRemote) { - EntityLaser laser; - laser = new EntityLaser(world, player, 2); - world.spawnEntityInWorld(laser); - } - } - return itemstack; - } + @Override + public ItemStack onFocusRightClick(ItemStack itemstack, World world, EntityPlayer player, MovingObjectPosition movingobjectposition) { + ItemWandCasting wand = (ItemWandCasting) itemstack.getItem(); + if (wand.consumeAllVis(itemstack, player, getVisCost(), true, true)) { + if (!world.isRemote) { + EntityLaser laser; + laser = new EntityLaser(world, player, 2); + world.spawnEntityInWorld(laser); + } + } + return itemstack; + } } diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/foci/ItemShieldFocus.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/foci/ItemShieldFocus.java index 79a2daf..d1e039b 100644 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/foci/ItemShieldFocus.java +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/foci/ItemShieldFocus.java @@ -1,16 +1,20 @@ /******************************************************************************* * Copyright (c) 2014 Tombenpotter. * All rights reserved. - * + * * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * + * * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ package electricMagicTools.tombenpotter.electricmagictools.common.items.foci; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import electricMagicTools.tombenpotter.electricmagictools.common.BlockRegistry; +import electricMagicTools.tombenpotter.electricmagictools.common.ElectricMagicTools; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; @@ -20,98 +24,95 @@ import net.minecraft.world.World; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.common.items.wands.ItemWandCasting; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import electricMagicTools.tombenpotter.electricmagictools.common.BlockRegistry; public class ItemShieldFocus extends ItemBaseFocus { - private static final AspectList visCost = new AspectList().add(Aspect.ORDER, 10).add(Aspect.WATER, 10).add(Aspect.AIR, 10); + private static final AspectList visCost = new AspectList().add(Aspect.ORDER, 10).add(Aspect.WATER, 10).add(Aspect.AIR, 10); - public ItemShieldFocus() { - super(); - } + public ItemShieldFocus() { + super(); + } - @SideOnly(Side.CLIENT) - @Override - public void registerIcons(IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon("electricmagictools:shieldfocus"); - } + @SideOnly(Side.CLIENT) + @Override + public void registerIcons(IIconRegister iconRegister) { + this.itemIcon = iconRegister.registerIcon(ElectricMagicTools.texturePath + ":shieldfocus"); + } - @Override - public int getFocusColor() { - return 555555555; - } + @Override + public int getFocusColor() { + return 555555555; + } - @Override - public boolean isUseItem() { - return true; - } + @Override + public boolean isUseItem() { + return true; + } - @Override - public AspectList getVisCost() { - return visCost; - } + @Override + public AspectList getVisCost() { + return visCost; + } - @Override - public String getSortingHelper(ItemStack itemstack) { - return "SHIELD"; - } + @Override + public String getSortingHelper(ItemStack itemstack) { + return "SHIELD"; + } - @Override - public void onUsingFocusTick(ItemStack itemstack, EntityPlayer player, int time) { - player.motionX = 0.0D; - player.motionY = 0.0D; - player.motionZ = 0.0D; + @Override + public void onUsingFocusTick(ItemStack itemstack, EntityPlayer player, int time) { + player.motionX = 0.0D; + player.motionY = 0.0D; + player.motionZ = 0.0D; - ItemWandCasting wand = (ItemWandCasting) itemstack.getItem(); - if (wand.consumeAllVis(itemstack, player, getVisCost(), true, true)) { - int x = MathHelper.floor_double(player.posX); - int y = MathHelper.floor_double(player.posY); - int z = MathHelper.floor_double(player.posZ); + ItemWandCasting wand = (ItemWandCasting) itemstack.getItem(); + if (wand.consumeAllVis(itemstack, player, getVisCost(), true, true)) { + int x = MathHelper.floor_double(player.posX); + int y = MathHelper.floor_double(player.posY); + int z = MathHelper.floor_double(player.posZ); - // Player Level - if (player.worldObj.isAirBlock(x + 1, y, z) && player.worldObj.isAirBlock(x - 1, y, z) && player.worldObj.isAirBlock(x, y, z + 1) && player.worldObj.isAirBlock(x, y, z - 1)) { - player.worldObj.setBlock(x + 1, y, z, BlockRegistry.shield); - player.worldObj.setBlock(x - 1, y, z, BlockRegistry.shield); - player.worldObj.setBlock(x, y, z + 1, BlockRegistry.shield); - player.worldObj.setBlock(x, y, z - 1, BlockRegistry.shield); - } + // Player Level + if (player.worldObj.isAirBlock(x + 1, y, z) && player.worldObj.isAirBlock(x - 1, y, z) && player.worldObj.isAirBlock(x, y, z + 1) && player.worldObj.isAirBlock(x, y, z - 1)) { + player.worldObj.setBlock(x + 1, y, z, BlockRegistry.shield); + player.worldObj.setBlock(x - 1, y, z, BlockRegistry.shield); + player.worldObj.setBlock(x, y, z + 1, BlockRegistry.shield); + player.worldObj.setBlock(x, y, z - 1, BlockRegistry.shield); + } - // Above the player - if (player.worldObj.isAirBlock(x + 1, y + 1, z) && player.worldObj.isAirBlock(x - 1, y + 1, z) && player.worldObj.isAirBlock(x, y + 1, z + 1) && player.worldObj.isAirBlock(x, y + 1, z - 1)) { - player.worldObj.setBlock(x + 1, y + 1, z, BlockRegistry.shield); - player.worldObj.setBlock(x - 1, y + 1, z, BlockRegistry.shield); - player.worldObj.setBlock(x, y + 1, z + 1, BlockRegistry.shield); - player.worldObj.setBlock(x, y + 1, z - 1, BlockRegistry.shield); - } - } + // Above the player + if (player.worldObj.isAirBlock(x + 1, y + 1, z) && player.worldObj.isAirBlock(x - 1, y + 1, z) && player.worldObj.isAirBlock(x, y + 1, z + 1) && player.worldObj.isAirBlock(x, y + 1, z - 1)) { + player.worldObj.setBlock(x + 1, y + 1, z, BlockRegistry.shield); + player.worldObj.setBlock(x - 1, y + 1, z, BlockRegistry.shield); + player.worldObj.setBlock(x, y + 1, z + 1, BlockRegistry.shield); + player.worldObj.setBlock(x, y + 1, z - 1, BlockRegistry.shield); + } + } - } + } - @Override - public void onPlayerStoppedUsingFocus(ItemStack itemstack, World world, EntityPlayer player, int count) { - int x = MathHelper.floor_double(player.posX); - int y = MathHelper.floor_double(player.posY); - int z = MathHelper.floor_double(player.posZ); + @Override + public void onPlayerStoppedUsingFocus(ItemStack itemstack, World world, EntityPlayer player, int count) { + int x = MathHelper.floor_double(player.posX); + int y = MathHelper.floor_double(player.posY); + int z = MathHelper.floor_double(player.posZ); - // Player Level - if ((player.worldObj.getBlock(x + 1, y, z) == BlockRegistry.shield) && (player.worldObj.getBlock(x - 1, y, z) == BlockRegistry.shield) && (player.worldObj.getBlock(x, y, z + 1) == BlockRegistry.shield) && (player.worldObj.getBlock(x, y, z - 1) == BlockRegistry.shield)) { - player.worldObj.setBlockToAir(x + 1, y, z); - player.worldObj.setBlockToAir(x - 1, y, z); - player.worldObj.setBlockToAir(x, y, z + 1); - player.worldObj.setBlockToAir(x, y, z - 1); - } + // Player Level + if ((player.worldObj.getBlock(x + 1, y, z) == BlockRegistry.shield) && (player.worldObj.getBlock(x - 1, y, z) == BlockRegistry.shield) && (player.worldObj.getBlock(x, y, z + 1) == BlockRegistry.shield) && (player.worldObj.getBlock(x, y, z - 1) == BlockRegistry.shield)) { + player.worldObj.setBlockToAir(x + 1, y, z); + player.worldObj.setBlockToAir(x - 1, y, z); + player.worldObj.setBlockToAir(x, y, z + 1); + player.worldObj.setBlockToAir(x, y, z - 1); + } - // Above the player - if ((player.worldObj.getBlock(x + 1, y + 1, z) == BlockRegistry.shield) && (player.worldObj.getBlock(x - 1, y + 1, z) == BlockRegistry.shield) && (player.worldObj.getBlock(x, y + 1, z + 1) == BlockRegistry.shield) && (player.worldObj.getBlock(x, y + 1, z - 1) == BlockRegistry.shield)) { - player.worldObj.setBlockToAir(x + 1, y + 1, z); - player.worldObj.setBlockToAir(x - 1, y + 1, z); - player.worldObj.setBlockToAir(x, y + 1, z + 1); - player.worldObj.setBlockToAir(x, y + 1, z - 1); - } + // Above the player + if ((player.worldObj.getBlock(x + 1, y + 1, z) == BlockRegistry.shield) && (player.worldObj.getBlock(x - 1, y + 1, z) == BlockRegistry.shield) && (player.worldObj.getBlock(x, y + 1, z + 1) == BlockRegistry.shield) && (player.worldObj.getBlock(x, y + 1, z - 1) == BlockRegistry.shield)) { + player.worldObj.setBlockToAir(x + 1, y + 1, z); + player.worldObj.setBlockToAir(x - 1, y + 1, z); + player.worldObj.setBlockToAir(x, y + 1, z + 1); + player.worldObj.setBlockToAir(x, y + 1, z - 1); + } - ItemStack milk = (new ItemStack(Items.milk_bucket)); - player.curePotionEffects(milk); - } + ItemStack milk = (new ItemStack(Items.milk_bucket)); + player.curePotionEffects(milk); + } } diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/foci/ItemWandChargingFocus.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/foci/ItemWandChargingFocus.java index 8a1bfac..e6b4ecd 100644 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/foci/ItemWandChargingFocus.java +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/foci/ItemWandChargingFocus.java @@ -1,5 +1,9 @@ package electricMagicTools.tombenpotter.electricmagictools.common.items.foci; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import electricMagicTools.tombenpotter.electricmagictools.common.Config; +import electricMagicTools.tombenpotter.electricmagictools.common.ElectricMagicTools; import ic2.api.item.ElectricItem; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; @@ -7,61 +11,58 @@ import net.minecraft.item.ItemStack; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.common.items.wands.ItemWandCasting; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import electricMagicTools.tombenpotter.electricmagictools.common.Config; public class ItemWandChargingFocus extends ItemBaseFocus { - AspectList visCost = new AspectList(); + AspectList visCost = new AspectList(); - public ItemWandChargingFocus() { - super(); - } + public ItemWandChargingFocus() { + super(); + } - @SideOnly(Side.CLIENT) - @Override - public void registerIcons(IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon("electricmagictools:wandchargefocus"); - } + @SideOnly(Side.CLIENT) + @Override + public void registerIcons(IIconRegister iconRegister) { + this.itemIcon = iconRegister.registerIcon(ElectricMagicTools.texturePath + ":wandchargefocus"); + } - @Override - public int getFocusColor() { - return 0xFFFF450; - } + @Override + public int getFocusColor() { + return 0xFFFF450; + } - @Override - public String getSortingHelper(ItemStack itemstack) { - return "CHARGING"; - } + @Override + public String getSortingHelper(ItemStack itemstack) { + return "ELECTRICCHARGING"; + } - @Override - public boolean isVisCostPerTick() { - return true; - } + @Override + public boolean isVisCostPerTick() { + return true; + } - @Override - public AspectList getVisCost() { - return visCost; - } + @Override + public AspectList getVisCost() { + return visCost; + } - @Override - public void onUsingFocusTick(ItemStack itemstack, EntityPlayer player, int integer) { + @Override + public void onUsingFocusTick(ItemStack itemstack, EntityPlayer player, int integer) { - if (!player.worldObj.isRemote) { - ItemWandCasting wandItem = (ItemWandCasting) itemstack.getItem(); + if (!player.worldObj.isRemote) { + ItemWandCasting wandItem = (ItemWandCasting) itemstack.getItem(); - ItemStack armor = player.inventory.armorInventory[1]; - if (armor != null) { - if ((ElectricItem.manager.use(armor, Config.wandChargeFocusCost / 4, player) && (ElectricItem.manager.use(armor, Config.wandChargeFocusCost / 4, player)) && (ElectricItem.manager.use(armor, Config.wandChargeFocusCost / 4, player)) && (ElectricItem.manager.use(armor, Config.wandChargeFocusCost / 4, player)))) { - wandItem.addVis(itemstack, Aspect.ORDER, 1, true); - wandItem.addVis(itemstack, Aspect.FIRE, 1, true); - wandItem.addVis(itemstack, Aspect.ENTROPY, 1, true); - wandItem.addVis(itemstack, Aspect.WATER, 1, true); - wandItem.addVis(itemstack, Aspect.EARTH, 1, true); - wandItem.addVis(itemstack, Aspect.AIR, 1, true); - } - } - } - } + ItemStack armor = player.inventory.armorInventory[1]; + if (armor != null) { + if ((ElectricItem.manager.use(armor, Config.wandChargeFocusCost / 4, player) && (ElectricItem.manager.use(armor, Config.wandChargeFocusCost / 4, player)) && (ElectricItem.manager.use(armor, Config.wandChargeFocusCost / 4, player)) && (ElectricItem.manager.use(armor, Config.wandChargeFocusCost / 4, player)))) { + wandItem.addVis(itemstack, Aspect.ORDER, 1, true); + wandItem.addVis(itemstack, Aspect.FIRE, 1, true); + wandItem.addVis(itemstack, Aspect.ENTROPY, 1, true); + wandItem.addVis(itemstack, Aspect.WATER, 1, true); + wandItem.addVis(itemstack, Aspect.EARTH, 1, true); + wandItem.addVis(itemstack, Aspect.AIR, 1, true); + } + } + } + } } diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/tools/ItemDiamondChainsaw.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/tools/ItemDiamondChainsaw.java index 8970332..8e146bd 100644 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/tools/ItemDiamondChainsaw.java +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/tools/ItemDiamondChainsaw.java @@ -1,20 +1,21 @@ /******************************************************************************* * Copyright (c) 2014 Tombenpotter. * All rights reserved. - * + * * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * + * * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ package electricMagicTools.tombenpotter.electricmagictools.common.items.tools; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import electricMagicTools.tombenpotter.electricmagictools.common.CreativeTab; +import electricMagicTools.tombenpotter.electricmagictools.common.ElectricMagicTools; import ic2.api.item.ElectricItem; - -import java.util.List; - import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -25,83 +26,82 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import electricMagicTools.tombenpotter.electricmagictools.common.CreativeTab; + +import java.util.List; public class ItemDiamondChainsaw extends ItemThaumiumChainsaw { - public int maxCharge = 40000; - private final int cost = 200; - private final int hitCost = 300; + public int maxCharge = 40000; + private final int cost = 200; + private final int hitCost = 300; - public ItemDiamondChainsaw() { - super(); - this.efficiencyOnProperMaterial = 16F; - this.setCreativeTab(CreativeTab.tabTombenpotter); - this.setMaxDamage(27); - this.setMaxStackSize(1); - } + public ItemDiamondChainsaw() { + super(); + this.efficiencyOnProperMaterial = 16F; + this.setCreativeTab(CreativeTab.tabTombenpotter); + this.setMaxDamage(27); + this.setMaxStackSize(1); + } - @SideOnly(Side.CLIENT) - @Override - public void registerIcons(IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon("electricmagictools:diamondchainsaw"); - } + @SideOnly(Side.CLIENT) + @Override + public void registerIcons(IIconRegister iconRegister) { + this.itemIcon = iconRegister.registerIcon(ElectricMagicTools.texturePath + ":diamondchainsaw"); + } - @Override - public int getMaxCharge(ItemStack itemStack) { - return maxCharge; - } + @Override + public int getMaxCharge(ItemStack itemStack) { + return maxCharge; + } - @Override - public int getTransferLimit(ItemStack itemStack) { - return 300; - } + @Override + public int getTransferLimit(ItemStack itemStack) { + return 300; + } - @Override - public boolean onBlockDestroyed(ItemStack stack, World world, Block block, int par4, int par5, int par6, EntityLivingBase entityLiving) { - ElectricItem.manager.use(stack, cost, entityLiving); - return true; - } + @Override + public boolean onBlockDestroyed(ItemStack stack, World world, Block block, int par4, int par5, int par6, EntityLivingBase entityLiving) { + ElectricItem.manager.use(stack, cost, entityLiving); + return true; + } - @Override - public boolean canHarvestBlock(Block block, ItemStack stack) { - return Items.diamond_axe.canHarvestBlock(block, stack) || Items.diamond_sword.canHarvestBlock(block, stack); - } + @Override + public boolean canHarvestBlock(Block block, ItemStack stack) { + return Items.diamond_axe.canHarvestBlock(block, stack) || Items.diamond_sword.canHarvestBlock(block, stack); + } - @Override - public float getDigSpeed(ItemStack stack, Block block, int meta) { - if (!ElectricItem.manager.canUse(stack, cost)) { - return 1.0F; - } + @Override + public float getDigSpeed(ItemStack stack, Block block, int meta) { + if (!ElectricItem.manager.canUse(stack, cost)) { + return 1.0F; + } - if (Items.wooden_axe.getDigSpeed(stack, block, meta) > 1.0F || Items.wooden_sword.getDigSpeed(stack, block, meta) > 1.0F) { - return efficiencyOnProperMaterial; - } else { - return super.getDigSpeed(stack, block, meta); - } - } + if (Items.wooden_axe.getDigSpeed(stack, block, meta) > 1.0F || Items.wooden_sword.getDigSpeed(stack, block, meta) > 1.0F) { + return efficiencyOnProperMaterial; + } else { + return super.getDigSpeed(stack, block, meta); + } + } - @Override - public boolean hitEntity(ItemStack itemstack, EntityLivingBase entityliving, EntityLivingBase attacker) { - if (ElectricItem.manager.use(itemstack, hitCost, attacker)) { - entityliving.attackEntityFrom(DamageSource.causePlayerDamage((EntityPlayer) attacker), 12F); - } - return false; - } + @Override + public boolean hitEntity(ItemStack itemstack, EntityLivingBase entityliving, EntityLivingBase attacker) { + if (ElectricItem.manager.use(itemstack, hitCost, attacker)) { + entityliving.attackEntityFrom(DamageSource.causePlayerDamage((EntityPlayer) attacker), 12F); + } + return false; + } - @SuppressWarnings({ "rawtypes", "unchecked" }) - @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { - ItemStack itemStack = new ItemStack(this, 1); - if (getChargedItem(itemStack) == this) { - ItemStack charged = new ItemStack(this, 1); - ElectricItem.manager.charge(charged, 2147483647, 2147483647, true, false); - itemList.add(charged); - } - if (getEmptyItem(itemStack) == this) { - itemList.add(new ItemStack(this, 1, getMaxDamage())); - } - } + @SuppressWarnings({"rawtypes", "unchecked"}) + @SideOnly(Side.CLIENT) + public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { + ItemStack itemStack = new ItemStack(this, 1); + if (getChargedItem(itemStack) == this) { + ItemStack charged = new ItemStack(this, 1); + ElectricItem.manager.charge(charged, 2147483647, 2147483647, true, false); + itemList.add(charged); + } + if (getEmptyItem(itemStack) == this) { + itemList.add(new ItemStack(this, 1, getMaxDamage())); + } + } } diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/tools/ItemElectricHoeGrowth.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/tools/ItemElectricHoeGrowth.java index 81db7bd..65e8e03 100644 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/tools/ItemElectricHoeGrowth.java +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/tools/ItemElectricHoeGrowth.java @@ -1,94 +1,92 @@ /******************************************************************************* * Copyright (c) 2014 Tombenpotter. * All rights reserved. - * + * * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * + * * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ package electricMagicTools.tombenpotter.electricmagictools.common.items.tools; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import electricMagicTools.tombenpotter.electricmagictools.common.CreativeTab; import ic2.api.item.ElectricItem; import ic2.api.item.IElectricItem; - -import java.util.List; - -import javax.swing.Icon; - import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import thaumcraft.common.items.equipment.ItemElementalHoe; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import electricMagicTools.tombenpotter.electricmagictools.common.CreativeTab; + +import javax.swing.*; +import java.util.List; public class ItemElectricHoeGrowth extends ItemElementalHoe implements IElectricItem { - public Icon icon; - public int maxCharge = 1000000; - public int growthCost = 1000; - public int tillCost = 100; + public Icon icon; + public int maxCharge = 1000000; + public int growthCost = 1000; + public int tillCost = 100; - public ItemElectricHoeGrowth() { - super(ToolMaterial.EMERALD); - this.setCreativeTab(CreativeTab.tabTombenpotter); - this.setMaxStackSize(1); - } + public ItemElectricHoeGrowth() { + super(ToolMaterial.EMERALD); + this.setCreativeTab(CreativeTab.tabTombenpotter); + this.setMaxStackSize(1); + } - /** - * @SideOnly(Side.CLIENT) - * @Override public void registerIcons(IconRegister iconRegister) { this.icon = iconRegister .registerIcon("electricmagictools:electrichoegrowth"); } - **/ - @SuppressWarnings({ "rawtypes", "unchecked" }) - @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { - ItemStack itemStack = new ItemStack(this, 1); - if (getChargedItem(itemStack) == this) { - ItemStack charged = new ItemStack(this, 1); - ElectricItem.manager.charge(charged, 2147483647, 2147483647, true, false); - itemList.add(charged); - } - if (getEmptyItem(itemStack) == this) { - itemList.add(new ItemStack(this, 1, getMaxDamage())); - } - } + /** + * @SideOnly(Side.CLIENT) + * @Override public void registerIcons(IconRegister iconRegister) { this.icon = iconRegister .registerIcon("electricmagictools:electrichoegrowth"); } + */ + @SuppressWarnings({"rawtypes", "unchecked"}) + @SideOnly(Side.CLIENT) + public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { + ItemStack itemStack = new ItemStack(this, 1); + if (getChargedItem(itemStack) == this) { + ItemStack charged = new ItemStack(this, 1); + ElectricItem.manager.charge(charged, 2147483647, 2147483647, true, false); + itemList.add(charged); + } + if (getEmptyItem(itemStack) == this) { + itemList.add(new ItemStack(this, 1, getMaxDamage())); + } + } - @Override - public boolean canProvideEnergy(ItemStack itemStack) { - return false; - } + @Override + public boolean canProvideEnergy(ItemStack itemStack) { + return false; + } - @Override - public int getMaxCharge(ItemStack itemStack) { - return maxCharge; - } + @Override + public int getMaxCharge(ItemStack itemStack) { + return maxCharge; + } - @Override - public int getTier(ItemStack itemStack) { - return 3; - } + @Override + public int getTier(ItemStack itemStack) { + return 3; + } - @Override - public int getTransferLimit(ItemStack itemStack) { - return 1000; - } + @Override + public int getTransferLimit(ItemStack itemStack) { + return 1000; + } - @Override - public boolean isRepairable() { - return false; - } + @Override + public boolean isRepairable() { + return false; + } - @Override - public Item getChargedItem(ItemStack itemStack) { - return this; - } + @Override + public Item getChargedItem(ItemStack itemStack) { + return this; + } - @Override - public Item getEmptyItem(ItemStack itemStack) { - return this; - } + @Override + public Item getEmptyItem(ItemStack itemStack) { + return this; + } } diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/tools/ItemOmnitoolDiamond.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/tools/ItemOmnitoolDiamond.java index de92ad0..d83422f 100644 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/tools/ItemOmnitoolDiamond.java +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/tools/ItemOmnitoolDiamond.java @@ -1,20 +1,22 @@ /******************************************************************************* * Copyright (c) 2014 Tombenpotter. * All rights reserved. - * + * * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * + * * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ package electricMagicTools.tombenpotter.electricmagictools.common.items.tools; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import electricMagicTools.tombenpotter.electricmagictools.common.Config; +import electricMagicTools.tombenpotter.electricmagictools.common.CreativeTab; +import electricMagicTools.tombenpotter.electricmagictools.common.ElectricMagicTools; import ic2.api.item.ElectricItem; - -import java.util.List; - import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -25,93 +27,91 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import electricMagicTools.tombenpotter.electricmagictools.common.Config; -import electricMagicTools.tombenpotter.electricmagictools.common.CreativeTab; + +import java.util.List; public class ItemOmnitoolDiamond extends ItemOmnitoolIron { - public int maxCharge = 70000; - private int cost; - private final int hitCost = 250; + public int maxCharge = 70000; + private int cost; + private final int hitCost = 250; - public ItemOmnitoolDiamond() { - super(); - this.efficiencyOnProperMaterial = 16F; - this.setCreativeTab(CreativeTab.tabTombenpotter); - this.setMaxStackSize(1); - if (Config.toolsInBore == false) { - this.setMaxDamage(27); - } else { - this.setMaxDamage(350); - } - } + public ItemOmnitoolDiamond() { + super(); + this.efficiencyOnProperMaterial = 16F; + this.setCreativeTab(CreativeTab.tabTombenpotter); + this.setMaxStackSize(1); + if (Config.toolsInBore == false) { + this.setMaxDamage(27); + } else { + this.setMaxDamage(350); + } + } - @SideOnly(Side.CLIENT) - @Override - public void registerIcons(IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon("electricmagictools:diamondomnitool"); - } + @SideOnly(Side.CLIENT) + @Override + public void registerIcons(IIconRegister iconRegister) { + this.itemIcon = iconRegister.registerIcon(ElectricMagicTools.texturePath + ":diamondomnitool"); + } - @Override - public int getMaxCharge(ItemStack itemStack) { - return maxCharge; - } + @Override + public int getMaxCharge(ItemStack itemStack) { + return maxCharge; + } - @Override - public int getTransferLimit(ItemStack itemStack) { - return 400; - } + @Override + public int getTransferLimit(ItemStack itemStack) { + return 400; + } - @Override - public boolean onBlockDestroyed(ItemStack stack, World world, Block block, int par4, int par5, int par6, EntityLivingBase entityLiving) { - if (Config.toolsInBore == false) { - cost = 200; - } else { - cost = 1; - } - ElectricItem.manager.use(stack, cost, entityLiving); - return true; - } + @Override + public boolean onBlockDestroyed(ItemStack stack, World world, Block block, int par4, int par5, int par6, EntityLivingBase entityLiving) { + if (Config.toolsInBore == false) { + cost = 200; + } else { + cost = 1; + } + ElectricItem.manager.use(stack, cost, entityLiving); + return true; + } - @Override - public boolean canHarvestBlock(Block block, ItemStack stack) { - return Items.diamond_axe.canHarvestBlock(block, stack) || Items.diamond_sword.canHarvestBlock(block, stack) || Items.diamond_pickaxe.canHarvestBlock(block, stack) || Items.diamond_shovel.canHarvestBlock(block, stack) || Items.shears.canHarvestBlock(block, stack); - } + @Override + public boolean canHarvestBlock(Block block, ItemStack stack) { + return Items.diamond_axe.canHarvestBlock(block, stack) || Items.diamond_sword.canHarvestBlock(block, stack) || Items.diamond_pickaxe.canHarvestBlock(block, stack) || Items.diamond_shovel.canHarvestBlock(block, stack) || Items.shears.canHarvestBlock(block, stack); + } - @Override - public float getDigSpeed(ItemStack stack, Block block, int meta) { - if (!ElectricItem.manager.canUse(stack, cost)) { - return 1.0F; - } + @Override + public float getDigSpeed(ItemStack stack, Block block, int meta) { + if (!ElectricItem.manager.canUse(stack, cost)) { + return 1.0F; + } - if (Items.wooden_axe.getDigSpeed(stack, block, meta) > 1.0F || Items.wooden_sword.getDigSpeed(stack, block, meta) > 1.0F || Items.wooden_pickaxe.getDigSpeed(stack, block, meta) > 1.0F || Items.wooden_shovel.getDigSpeed(stack, block, meta) > 1.0F || Items.shears.getDigSpeed(stack, block, meta) > 1.0F) { - return efficiencyOnProperMaterial; - } else { - return super.getDigSpeed(stack, block, meta); - } - } + if (Items.wooden_axe.getDigSpeed(stack, block, meta) > 1.0F || Items.wooden_sword.getDigSpeed(stack, block, meta) > 1.0F || Items.wooden_pickaxe.getDigSpeed(stack, block, meta) > 1.0F || Items.wooden_shovel.getDigSpeed(stack, block, meta) > 1.0F || Items.shears.getDigSpeed(stack, block, meta) > 1.0F) { + return efficiencyOnProperMaterial; + } else { + return super.getDigSpeed(stack, block, meta); + } + } - @Override - public boolean hitEntity(ItemStack itemstack, EntityLivingBase entityliving, EntityLivingBase attacker) { - if (ElectricItem.manager.use(itemstack, hitCost, attacker)) { - entityliving.attackEntityFrom(DamageSource.causePlayerDamage((EntityPlayer) attacker), 10F); - } - return false; - } + @Override + public boolean hitEntity(ItemStack itemstack, EntityLivingBase entityliving, EntityLivingBase attacker) { + if (ElectricItem.manager.use(itemstack, hitCost, attacker)) { + entityliving.attackEntityFrom(DamageSource.causePlayerDamage((EntityPlayer) attacker), 10F); + } + return false; + } - @SuppressWarnings({ "rawtypes", "unchecked" }) - @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { - ItemStack itemStack = new ItemStack(this, 1); - if (getChargedItem(itemStack) == this) { - ItemStack charged = new ItemStack(this, 1); - ElectricItem.manager.charge(charged, 2147483647, 2147483647, true, false); - itemList.add(charged); - } - if (getEmptyItem(itemStack) == this) { - itemList.add(new ItemStack(this, 1, getMaxDamage())); - } - } + @SuppressWarnings({"rawtypes", "unchecked"}) + @SideOnly(Side.CLIENT) + public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { + ItemStack itemStack = new ItemStack(this, 1); + if (getChargedItem(itemStack) == this) { + ItemStack charged = new ItemStack(this, 1); + ElectricItem.manager.charge(charged, 2147483647, 2147483647, true, false); + itemList.add(charged); + } + if (getEmptyItem(itemStack) == this) { + itemList.add(new ItemStack(this, 1, getMaxDamage())); + } + } } diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/tools/ItemOmnitoolIron.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/tools/ItemOmnitoolIron.java index 5373d10..6a257c1 100644 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/tools/ItemOmnitoolIron.java +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/tools/ItemOmnitoolIron.java @@ -1,21 +1,23 @@ /******************************************************************************* * Copyright (c) 2014 Tombenpotter. * All rights reserved. - * + * * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * + * * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ package electricMagicTools.tombenpotter.electricmagictools.common.items.tools; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import electricMagicTools.tombenpotter.electricmagictools.common.Config; +import electricMagicTools.tombenpotter.electricmagictools.common.CreativeTab; +import electricMagicTools.tombenpotter.electricmagictools.common.ElectricMagicTools; import ic2.api.item.ElectricItem; import ic2.api.item.IElectricItem; - -import java.util.List; - import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -29,167 +31,165 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; import net.minecraft.world.World; import net.minecraftforge.event.ForgeEventFactory; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import electricMagicTools.tombenpotter.electricmagictools.common.Config; -import electricMagicTools.tombenpotter.electricmagictools.common.CreativeTab; + +import java.util.List; public class ItemOmnitoolIron extends ItemPickaxe implements IElectricItem { - public int maxCharge = 20000; - private int cost; - private final int hitCost = 125; + public int maxCharge = 20000; + private int cost; + private final int hitCost = 125; - public ItemOmnitoolIron() { - super(ToolMaterial.EMERALD); - this.efficiencyOnProperMaterial = 13F; - this.setCreativeTab(CreativeTab.tabTombenpotter); - this.setMaxStackSize(1); - if (Config.toolsInBore == false) { - this.setMaxDamage(27); - } else { - this.setMaxDamage(200); - } - } + public ItemOmnitoolIron() { + super(ToolMaterial.EMERALD); + this.efficiencyOnProperMaterial = 13F; + this.setCreativeTab(CreativeTab.tabTombenpotter); + this.setMaxStackSize(1); + if (Config.toolsInBore == false) { + this.setMaxDamage(27); + } else { + this.setMaxDamage(200); + } + } - @SideOnly(Side.CLIENT) - @Override - public void registerIcons(IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon("electricmagictools:ironomnitool"); - } + @SideOnly(Side.CLIENT) + @Override + public void registerIcons(IIconRegister iconRegister) { + this.itemIcon = iconRegister.registerIcon(ElectricMagicTools.texturePath + ":ironomnitool"); + } - @Override - public boolean canProvideEnergy(ItemStack itemStack) { - return false; - } + @Override + public boolean canProvideEnergy(ItemStack itemStack) { + return false; + } - @Override - public int getMaxCharge(ItemStack itemStack) { - return maxCharge; - } + @Override + public int getMaxCharge(ItemStack itemStack) { + return maxCharge; + } - @Override - public int getTier(ItemStack itemStack) { - return 2; - } + @Override + public int getTier(ItemStack itemStack) { + return 2; + } - @Override - public int getTransferLimit(ItemStack itemStack) { - return 200; - } + @Override + public int getTransferLimit(ItemStack itemStack) { + return 200; + } - @SuppressWarnings({ "rawtypes", "unchecked" }) - @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { - ItemStack itemStack = new ItemStack(this, 1); - if (getChargedItem(itemStack) == this) { - ItemStack charged = new ItemStack(this, 1); - ElectricItem.manager.charge(charged, 2147483647, 2147483647, true, false); - itemList.add(charged); - } - if (getEmptyItem(itemStack) == this) { - itemList.add(new ItemStack(this, 1, getMaxDamage())); - } - } + @SuppressWarnings({"rawtypes", "unchecked"}) + @SideOnly(Side.CLIENT) + public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { + ItemStack itemStack = new ItemStack(this, 1); + if (getChargedItem(itemStack) == this) { + ItemStack charged = new ItemStack(this, 1); + ElectricItem.manager.charge(charged, 2147483647, 2147483647, true, false); + itemList.add(charged); + } + if (getEmptyItem(itemStack) == this) { + itemList.add(new ItemStack(this, 1, getMaxDamage())); + } + } - @Override - public boolean onBlockDestroyed(ItemStack stack, World world, Block block, int par4, int par5, int par6, EntityLivingBase entityLiving) + @Override + public boolean onBlockDestroyed(ItemStack stack, World world, Block block, int par4, int par5, int par6, EntityLivingBase entityLiving) - { - if (Config.toolsInBore == false) { - cost = 100; - } else { - cost = 1; - } - ElectricItem.manager.use(stack, cost, entityLiving); - return true; - } + { + if (Config.toolsInBore == false) { + cost = 100; + } else { + cost = 1; + } + ElectricItem.manager.use(stack, cost, entityLiving); + return true; + } - @Override - public boolean canHarvestBlock(Block block, ItemStack stack) { - return Items.iron_axe.canHarvestBlock(block, stack) || Items.iron_sword.canHarvestBlock(block, stack) || Items.iron_pickaxe.canHarvestBlock(block, stack) || Items.iron_shovel.canHarvestBlock(block, stack) || Items.shears.canHarvestBlock(block, stack); - } + @Override + public boolean canHarvestBlock(Block block, ItemStack stack) { + return Items.iron_axe.canHarvestBlock(block, stack) || Items.iron_sword.canHarvestBlock(block, stack) || Items.iron_pickaxe.canHarvestBlock(block, stack) || Items.iron_shovel.canHarvestBlock(block, stack) || Items.shears.canHarvestBlock(block, stack); + } - @Override - public float getDigSpeed(ItemStack stack, Block block, int meta) { - if (!ElectricItem.manager.canUse(stack, cost)) { - return 1.0F; - } + @Override + public float getDigSpeed(ItemStack stack, Block block, int meta) { + if (!ElectricItem.manager.canUse(stack, cost)) { + return 1.0F; + } - if (Items.wooden_axe.getDigSpeed(stack, block, meta) > 1.0F || Items.wooden_sword.getDigSpeed(stack, block, meta) > 1.0F || Items.wooden_pickaxe.getDigSpeed(stack, block, meta) > 1.0F || Items.wooden_shovel.getDigSpeed(stack, block, meta) > 1.0F || Items.shears.getDigSpeed(stack, block, meta) > 1.0F) { - return efficiencyOnProperMaterial; - } else { - return super.getDigSpeed(stack, block, meta); - } - } + if (Items.wooden_axe.getDigSpeed(stack, block, meta) > 1.0F || Items.wooden_sword.getDigSpeed(stack, block, meta) > 1.0F || Items.wooden_pickaxe.getDigSpeed(stack, block, meta) > 1.0F || Items.wooden_shovel.getDigSpeed(stack, block, meta) > 1.0F || Items.shears.getDigSpeed(stack, block, meta) > 1.0F) { + return efficiencyOnProperMaterial; + } else { + return super.getDigSpeed(stack, block, meta); + } + } - @Override - public boolean isRepairable() { - return false; - } + @Override + public boolean isRepairable() { + return false; + } - @Override - public int getItemEnchantability() { - if (Config.enchanting == false) { - return 0; - } else { - return 4; - } - } + @Override + public int getItemEnchantability() { + if (Config.enchanting == false) { + return 0; + } else { + return 4; + } + } - @Override - public boolean isBookEnchantable(ItemStack itemstack1, ItemStack itemstack2) { - if (Config.enchanting == false) { - return false; - } else { - return true; - } - } + @Override + public boolean isBookEnchantable(ItemStack itemstack1, ItemStack itemstack2) { + if (Config.enchanting == false) { + return false; + } else { + return true; + } + } - @Override - public boolean hitEntity(ItemStack itemstack, EntityLivingBase entityliving, EntityLivingBase attacker) { - if (ElectricItem.manager.use(itemstack, hitCost, attacker)) { - entityliving.attackEntityFrom(DamageSource.causePlayerDamage((EntityPlayer) attacker), 8F); - } - return false; - } + @Override + public boolean hitEntity(ItemStack itemstack, EntityLivingBase entityliving, EntityLivingBase attacker) { + if (ElectricItem.manager.use(itemstack, hitCost, attacker)) { + entityliving.attackEntityFrom(DamageSource.causePlayerDamage((EntityPlayer) attacker), 8F); + } + return false; + } - @Override - public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float xOffset, float yOffset, float zOffset) { - for (int i = 0; i < player.inventory.mainInventory.length; i++) { - ItemStack torchStack = player.inventory.mainInventory[i]; - if (torchStack == null || !torchStack.getUnlocalizedName().toLowerCase().contains("torch")) { - continue; - } - Item item = torchStack.getItem(); - if (!(item instanceof ItemBlock)) { - continue; - } - int oldMeta = torchStack.getItemDamage(); - int oldSize = torchStack.stackSize; - boolean result = torchStack.tryPlaceItemIntoWorld(player, world, x, y, z, side, xOffset, yOffset, zOffset); - if (player.capabilities.isCreativeMode) { - torchStack.setItemDamage(oldMeta); - torchStack.stackSize = oldSize; - } else if (torchStack.stackSize <= 0) { - ForgeEventFactory.onPlayerDestroyItem(player, torchStack); - player.inventory.mainInventory[i] = null; - } - if (result) { - return true; - } - } + @Override + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float xOffset, float yOffset, float zOffset) { + for (int i = 0; i < player.inventory.mainInventory.length; i++) { + ItemStack torchStack = player.inventory.mainInventory[i]; + if (torchStack == null || !torchStack.getUnlocalizedName().toLowerCase().contains("torch")) { + continue; + } + Item item = torchStack.getItem(); + if (!(item instanceof ItemBlock)) { + continue; + } + int oldMeta = torchStack.getItemDamage(); + int oldSize = torchStack.stackSize; + boolean result = torchStack.tryPlaceItemIntoWorld(player, world, x, y, z, side, xOffset, yOffset, zOffset); + if (player.capabilities.isCreativeMode) { + torchStack.setItemDamage(oldMeta); + torchStack.stackSize = oldSize; + } else if (torchStack.stackSize <= 0) { + ForgeEventFactory.onPlayerDestroyItem(player, torchStack); + player.inventory.mainInventory[i] = null; + } + if (result) { + return true; + } + } - return super.onItemUse(stack, player, world, x, y, z, side, xOffset, yOffset, zOffset); - } + return super.onItemUse(stack, player, world, x, y, z, side, xOffset, yOffset, zOffset); + } - @Override - public Item getChargedItem(ItemStack itemStack) { - return this; - } + @Override + public Item getChargedItem(ItemStack itemStack) { + return this; + } - @Override - public Item getEmptyItem(ItemStack itemStack) { - return this; - } + @Override + public Item getEmptyItem(ItemStack itemStack) { + return this; + } } diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/tools/ItemOmnitoolThaumium.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/tools/ItemOmnitoolThaumium.java index f1f43b5..4e9796b 100644 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/tools/ItemOmnitoolThaumium.java +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/tools/ItemOmnitoolThaumium.java @@ -1,20 +1,22 @@ /******************************************************************************* * Copyright (c) 2014 Tombenpotter. * All rights reserved. - * + * * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * + * * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ package electricMagicTools.tombenpotter.electricmagictools.common.items.tools; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import electricMagicTools.tombenpotter.electricmagictools.common.Config; +import electricMagicTools.tombenpotter.electricmagictools.common.CreativeTab; +import electricMagicTools.tombenpotter.electricmagictools.common.ElectricMagicTools; import ic2.api.item.ElectricItem; - -import java.util.List; - import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -25,93 +27,91 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import electricMagicTools.tombenpotter.electricmagictools.common.Config; -import electricMagicTools.tombenpotter.electricmagictools.common.CreativeTab; + +import java.util.List; public class ItemOmnitoolThaumium extends ItemOmnitoolDiamond { - public int maxCharge = 140000; - private int cost; - private final int hitCost = 650; + public int maxCharge = 140000; + private int cost; + private final int hitCost = 650; - public ItemOmnitoolThaumium() { - super(); - this.efficiencyOnProperMaterial = 21F; - this.setCreativeTab(CreativeTab.tabTombenpotter); - this.setMaxStackSize(1); - if (Config.toolsInBore == false) { - this.setMaxDamage(27); - } else { - this.setMaxDamage(467); - } - } + public ItemOmnitoolThaumium() { + super(); + this.efficiencyOnProperMaterial = 21F; + this.setCreativeTab(CreativeTab.tabTombenpotter); + this.setMaxStackSize(1); + if (Config.toolsInBore == false) { + this.setMaxDamage(27); + } else { + this.setMaxDamage(467); + } + } - @SideOnly(Side.CLIENT) - @Override - public void registerIcons(IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon("electricmagictools:thaumiumomnitool"); - } + @SideOnly(Side.CLIENT) + @Override + public void registerIcons(IIconRegister iconRegister) { + this.itemIcon = iconRegister.registerIcon(ElectricMagicTools.texturePath + ":thaumiumomnitool"); + } - @Override - public int getMaxCharge(ItemStack itemStack) { - return maxCharge; - } + @Override + public int getMaxCharge(ItemStack itemStack) { + return maxCharge; + } - @Override - public int getTransferLimit(ItemStack itemStack) { - return 800; - } + @Override + public int getTransferLimit(ItemStack itemStack) { + return 800; + } - @Override - public boolean onBlockDestroyed(ItemStack stack, World world, Block block, int par4, int par5, int par6, EntityLivingBase entityLiving) { - if (Config.toolsInBore == false) { - cost = 300; - } else { - cost = 1; - } - ElectricItem.manager.use(stack, cost, entityLiving); - return true; - } + @Override + public boolean onBlockDestroyed(ItemStack stack, World world, Block block, int par4, int par5, int par6, EntityLivingBase entityLiving) { + if (Config.toolsInBore == false) { + cost = 300; + } else { + cost = 1; + } + ElectricItem.manager.use(stack, cost, entityLiving); + return true; + } - @Override - public boolean canHarvestBlock(Block block, ItemStack stack) { - return Items.diamond_axe.canHarvestBlock(block, stack) || Items.diamond_sword.canHarvestBlock(block, stack) || Items.diamond_pickaxe.canHarvestBlock(block, stack) || Items.diamond_shovel.canHarvestBlock(block, stack) || Items.shears.canHarvestBlock(block, stack); - } + @Override + public boolean canHarvestBlock(Block block, ItemStack stack) { + return Items.diamond_axe.canHarvestBlock(block, stack) || Items.diamond_sword.canHarvestBlock(block, stack) || Items.diamond_pickaxe.canHarvestBlock(block, stack) || Items.diamond_shovel.canHarvestBlock(block, stack) || Items.shears.canHarvestBlock(block, stack); + } - @Override - public float getDigSpeed(ItemStack stack, Block block, int meta) { - if (!ElectricItem.manager.canUse(stack, cost)) { - return 1.0F; - } + @Override + public float getDigSpeed(ItemStack stack, Block block, int meta) { + if (!ElectricItem.manager.canUse(stack, cost)) { + return 1.0F; + } - if (Items.wooden_axe.getDigSpeed(stack, block, meta) > 1.0F || Items.wooden_sword.getDigSpeed(stack, block, meta) > 1.0F || Items.wooden_pickaxe.getDigSpeed(stack, block, meta) > 1.0F || Items.wooden_shovel.getDigSpeed(stack, block, meta) > 1.0F || Items.shears.getDigSpeed(stack, block, meta) > 1.0F) { - return efficiencyOnProperMaterial; - } else { - return super.getDigSpeed(stack, block, meta); - } - } + if (Items.wooden_axe.getDigSpeed(stack, block, meta) > 1.0F || Items.wooden_sword.getDigSpeed(stack, block, meta) > 1.0F || Items.wooden_pickaxe.getDigSpeed(stack, block, meta) > 1.0F || Items.wooden_shovel.getDigSpeed(stack, block, meta) > 1.0F || Items.shears.getDigSpeed(stack, block, meta) > 1.0F) { + return efficiencyOnProperMaterial; + } else { + return super.getDigSpeed(stack, block, meta); + } + } - @Override - public boolean hitEntity(ItemStack itemstack, EntityLivingBase entityliving, EntityLivingBase attacker) { - if (ElectricItem.manager.use(itemstack, hitCost, attacker)) { - entityliving.attackEntityFrom(DamageSource.causePlayerDamage((EntityPlayer) attacker), 10F); - } - return false; - } + @Override + public boolean hitEntity(ItemStack itemstack, EntityLivingBase entityliving, EntityLivingBase attacker) { + if (ElectricItem.manager.use(itemstack, hitCost, attacker)) { + entityliving.attackEntityFrom(DamageSource.causePlayerDamage((EntityPlayer) attacker), 10F); + } + return false; + } - @SuppressWarnings({ "rawtypes", "unchecked" }) - @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { - ItemStack itemStack = new ItemStack(this, 1); - if (getChargedItem(itemStack) == this) { - ItemStack charged = new ItemStack(this, 1); - ElectricItem.manager.charge(charged, 2147483647, 2147483647, true, false); - itemList.add(charged); - } - if (getEmptyItem(itemStack) == this) { - itemList.add(new ItemStack(this, 1, getMaxDamage())); - } - } + @SuppressWarnings({"rawtypes", "unchecked"}) + @SideOnly(Side.CLIENT) + public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { + ItemStack itemStack = new ItemStack(this, 1); + if (getChargedItem(itemStack) == this) { + ItemStack charged = new ItemStack(this, 1); + ElectricItem.manager.charge(charged, 2147483647, 2147483647, true, false); + itemList.add(charged); + } + if (getEmptyItem(itemStack) == this) { + itemList.add(new ItemStack(this, 1, getMaxDamage())); + } + } } diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/tools/ItemRockbreakerDrill.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/tools/ItemRockbreakerDrill.java index 9793322..cb6a0df 100644 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/tools/ItemRockbreakerDrill.java +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/tools/ItemRockbreakerDrill.java @@ -1,27 +1,25 @@ /******************************************************************************* * Copyright (c) 2014 Tombenpotter. * All rights reserved. - * + * * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * + * * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. * http://www.minecraftforum.net/topic/1585216- - * + * * This class originally belongs to Azanor, but with his permission I took it, and modified it to make it work as I wanted to. ******************************************************************************/ package electricMagicTools.tombenpotter.electricmagictools.common.items.tools; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import electricMagicTools.tombenpotter.electricmagictools.common.Config; +import electricMagicTools.tombenpotter.electricmagictools.common.CreativeTab; +import electricMagicTools.tombenpotter.electricmagictools.common.ElectricMagicTools; import ic2.api.item.ElectricItem; import ic2.api.item.IElectricItem; - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -import javax.swing.Icon; - import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.IIconRegister; @@ -46,254 +44,258 @@ import net.minecraftforge.event.ForgeEventFactory; import thaumcraft.common.Thaumcraft; import thaumcraft.common.entities.EntityFollowingItem; import thaumcraft.common.lib.Utils; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import electricMagicTools.tombenpotter.electricmagictools.common.Config; -import electricMagicTools.tombenpotter.electricmagictools.common.CreativeTab; + +import javax.swing.*; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; public class ItemRockbreakerDrill extends ItemPickaxe implements IElectricItem { - private static final Block[] isEffective = { Blocks.nether_brick, Blocks.netherrack, Blocks.glowstone, Blocks.iron_block, Blocks.gold_block, Blocks.diamond_block, Blocks.lapis_block, Blocks.redstone_block, Blocks.redstone_ore, Blocks.emerald_ore, Blocks.emerald_block, Blocks.stonebrick, Blocks.glass, Blocks.stone, Blocks.gold_ore, Blocks.iron_ore, Blocks.coal_ore, Blocks.cobblestone, Blocks.diamond_ore, Blocks.lapis_ore, Blocks.dirt, Blocks.gravel, Blocks.sand, Blocks.sandstone, Blocks.soul_sand, Blocks.clay, Blocks.grass, Blocks.snow_layer, Blocks.snow, Blocks.farmland, Blocks.hardened_clay, Blocks.stained_hardened_clay, Blocks.mossy_cobblestone }; - public Icon icon; - int side; + private static final Block[] isEffective = {Blocks.nether_brick, Blocks.netherrack, Blocks.glowstone, Blocks.iron_block, Blocks.gold_block, Blocks.diamond_block, Blocks.lapis_block, Blocks.redstone_block, Blocks.redstone_ore, Blocks.emerald_ore, Blocks.emerald_block, Blocks.stonebrick, Blocks.glass, Blocks.stone, Blocks.gold_ore, Blocks.iron_ore, Blocks.coal_ore, Blocks.cobblestone, Blocks.diamond_ore, Blocks.lapis_ore, Blocks.dirt, Blocks.gravel, Blocks.sand, Blocks.sandstone, Blocks.soul_sand, Blocks.clay, Blocks.grass, Blocks.snow_layer, Blocks.snow, Blocks.farmland, Blocks.hardened_clay, Blocks.stained_hardened_clay, Blocks.mossy_cobblestone}; + public Icon icon; + int side; - public ItemRockbreakerDrill() { - super(ToolMaterial.EMERALD); - side = 0; - setCreativeTab(CreativeTab.tabTombenpotter); - this.efficiencyOnProperMaterial = 25F; - this.setMaxStackSize(1); - if (Config.toolsInBore == false) { - this.setMaxDamage(27); - } else { - this.setMaxDamage(2571); - } - } + public ItemRockbreakerDrill() { + super(ToolMaterial.EMERALD); + side = 0; + setCreativeTab(CreativeTab.tabTombenpotter); + this.efficiencyOnProperMaterial = 25F; + this.setMaxStackSize(1); + if (Config.toolsInBore == false) { + this.setMaxDamage(27); + } else { + this.setMaxDamage(2571); + } + } - public int maxCharge = 900000; - private int cost; - private final int searchCost = 1000; - private final int hitCost = 400; + public int maxCharge = 900000; + private int cost; + private final int searchCost = 1000; + private final int hitCost = 400; - @SideOnly(Side.CLIENT) - @Override - public void registerIcons(IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon("electricmagictools:rockbreakerdrill"); - } + @SideOnly(Side.CLIENT) + @Override + public void registerIcons(IIconRegister iconRegister) { + this.itemIcon = iconRegister.registerIcon(ElectricMagicTools.texturePath + ":rockbreakerdrill"); + } - @SuppressWarnings({ "rawtypes", "unchecked" }) - @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { - ItemStack itemStack = new ItemStack(this, 1); - if (getChargedItem(itemStack) == this) { - ItemStack charged = new ItemStack(this, 1); - ElectricItem.manager.charge(charged, 2147483647, 2147483647, true, false); - itemList.add(charged); - } - if (getEmptyItem(itemStack) == this) { - itemList.add(new ItemStack(this, 1, getMaxDamage())); - } - } + @SuppressWarnings({"rawtypes", "unchecked"}) + @SideOnly(Side.CLIENT) + public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { + ItemStack itemStack = new ItemStack(this, 1); + if (getChargedItem(itemStack) == this) { + ItemStack charged = new ItemStack(this, 1); + ElectricItem.manager.charge(charged, 2147483647, 2147483647, true, false); + itemList.add(charged); + } + if (getEmptyItem(itemStack) == this) { + itemList.add(new ItemStack(this, 1, getMaxDamage())); + } + } - private boolean isEffectiveAgainst(Block block) { - for (int var3 = 0; var3 < isEffective.length; var3++) { - if (isEffective[var3] == block) { - return true; - } - } - return false; - } + private boolean isEffectiveAgainst(Block block) { + for (int var3 = 0; var3 < isEffective.length; var3++) { + if (isEffective[var3] == block) { + return true; + } + } + return false; + } - @Override - public boolean onBlockStartBreak(ItemStack itemstack, int X, int Y, int Z, EntityPlayer player) { - MovingObjectPosition movingobjectposition = Utils.getTargetBlock(((Entity) (player)).worldObj, player, true); - if (movingobjectposition != null && movingobjectposition.typeOfHit == MovingObjectType.BLOCK) { - side = movingobjectposition.sideHit; - } - return super.onBlockStartBreak(itemstack, X, Y, Z, player); - } + @Override + public boolean onBlockStartBreak(ItemStack itemstack, int X, int Y, int Z, EntityPlayer player) { + MovingObjectPosition movingobjectposition = Utils.getTargetBlock(((Entity) (player)).worldObj, player, true); + if (movingobjectposition != null && movingobjectposition.typeOfHit == MovingObjectType.BLOCK) { + side = movingobjectposition.sideHit; + } + return super.onBlockStartBreak(itemstack, X, Y, Z, player); + } - @SuppressWarnings("rawtypes") - @Override - public boolean onBlockDestroyed(ItemStack stack, World world, Block block, int x, int y, int z, EntityLivingBase entityLiving) { - if (Config.toolsInBore == false) { - cost = 350; - } else { - cost = 1; - } - if (entityLiving.isSneaking()) { - return super.onBlockDestroyed(stack, world, block, x, y, z, entityLiving); - } - int md = world.getBlockMetadata(x, y, z); - if (ForgeHooks.isToolEffective(stack, block, md) || isEffectiveAgainst(block)) { - for (int aa = -1; aa <= 1; aa++) { - for (int bb = -1; bb <= 1; bb++) { - int xx = 0; - int yy = 0; - int zz = 0; - if (side <= 1) { - xx = aa; - zz = bb; - } else if (side <= 3) { - xx = aa; - yy = bb; - } else { - zz = aa; - yy = bb; - } - Block bl = world.getBlock(x + xx, y + yy, z + zz); - md = world.getBlockMetadata(x + xx, y + yy, z + zz); - if (!ForgeHooks.isToolEffective(stack, bl, md) && !isEffectiveAgainst(bl)) { - continue; - } - if (ElectricItem.manager.canUse(stack, cost)) { - ElectricItem.manager.use(stack, cost, entityLiving); - } - int fortune = EnchantmentHelper.getFortuneModifier(entityLiving); - world.setBlockToAir(x + xx, y + yy, z + zz); - ArrayList ret = bl.getDrops(world, x + xx, y + yy, z + zz, md, fortune); - boolean creative = false; - if ((entityLiving instanceof EntityPlayer) && ((EntityPlayer) entityLiving).capabilities.isCreativeMode) { - creative = true; - } - if (ret.size() <= 0 || creative || ((Entity) (entityLiving)).worldObj.isRemote) { - continue; - } - ItemStack is; - for (Iterator i$ = ret.iterator(); i$.hasNext(); world.spawnEntityInWorld(new EntityFollowingItem(world, (double) x + (double) xx + 0.5D, (double) y + (double) yy + 0.5D, (double) z + (double) zz + 0.5D, is, entityLiving, 3))) { - is = (ItemStack) i$.next(); - } - } - } - } - return true; - } + @SuppressWarnings("rawtypes") + @Override + public boolean onBlockDestroyed(ItemStack stack, World world, Block block, int x, int y, int z, EntityLivingBase entityLiving) { + if (Config.toolsInBore == false) { + cost = 350; + } else { + cost = 1; + } + if (entityLiving.isSneaking()) { + if (ElectricItem.manager.canUse(stack, cost)) { + ElectricItem.manager.use(stack, cost, entityLiving); + } + return true; + } + int md = world.getBlockMetadata(x, y, z); + if (ForgeHooks.isToolEffective(stack, block, md) || isEffectiveAgainst(block)) { + for (int aa = -1; aa <= 1; aa++) { + for (int bb = -1; bb <= 1; bb++) { + int xx = 0; + int yy = 0; + int zz = 0; + if (side <= 1) { + xx = aa; + zz = bb; + } else if (side <= 3) { + xx = aa; + yy = bb; + } else { + zz = aa; + yy = bb; + } + Block bl = world.getBlock(x + xx, y + yy, z + zz); + md = world.getBlockMetadata(x + xx, y + yy, z + zz); + if (!ForgeHooks.isToolEffective(stack, bl, md) && !isEffectiveAgainst(bl)) { + continue; + } + if (ElectricItem.manager.canUse(stack, cost)) { + ElectricItem.manager.use(stack, cost, entityLiving); + } + int fortune = EnchantmentHelper.getFortuneModifier(entityLiving); + world.setBlockToAir(x + xx, y + yy, z + zz); + ArrayList ret = bl.getDrops(world, x + xx, y + yy, z + zz, md, fortune); + boolean creative = false; + if ((entityLiving instanceof EntityPlayer) && ((EntityPlayer) entityLiving).capabilities.isCreativeMode) { + creative = true; + } + if (ret.size() <= 0 || creative || ((Entity) (entityLiving)).worldObj.isRemote) { + continue; + } + ItemStack is; + for (Iterator i$ = ret.iterator(); i$.hasNext(); world.spawnEntityInWorld(new EntityFollowingItem(world, (double) x + (double) xx + 0.5D, (double) y + (double) yy + 0.5D, (double) z + (double) zz + 0.5D, is, entityLiving, 3))) { + is = (ItemStack) i$.next(); + } + } + } + } + return true; + } - @SuppressWarnings("unused") - @Override - public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float xOffset, float yOffset, float zOffset) { - if (!player.isSneaking()) { - for (int i = 0; i < player.inventory.mainInventory.length; i++) { - ItemStack torchStack = player.inventory.mainInventory[i]; - if (torchStack == null || !torchStack.getUnlocalizedName().toLowerCase().contains("torch")) { - continue; - } - Item item = torchStack.getItem(); - if (!(item instanceof ItemBlock)) { - continue; - } - int oldMeta = torchStack.getItemDamage(); - int oldSize = torchStack.stackSize; - boolean result = torchStack.tryPlaceItemIntoWorld(player, world, x, y, z, side, xOffset, yOffset, zOffset); - if (player.capabilities.isCreativeMode) { - torchStack.setItemDamage(oldMeta); - torchStack.stackSize = oldSize; - } else if (torchStack.stackSize <= 0) { - ForgeEventFactory.onPlayerDestroyItem(player, torchStack); - player.inventory.mainInventory[i] = null; - } - if (result) { - return true; - } - } - } else { - ElectricItem.manager.use(stack, searchCost, player); - if (!world.isRemote) { - world.playSoundEffect(x + 0.5D, y + 0.5D, z + 0.5D, "thaumcraft:wandfail", 0.2F, 0.2F + world.rand.nextFloat() * 0.2F); - return super.onItemUse(stack, player, world, x, y, z, side, xOffset, xOffset, zOffset); - } - Minecraft mc = Minecraft.getMinecraft(); - Thaumcraft.instance.renderEventHandler.startScan(player, x, y, z, System.currentTimeMillis() + 5000L); + @SuppressWarnings("unused") + @Override + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float xOffset, float yOffset, float zOffset) { + if (!player.isSneaking()) { + for (int i = 0; i < player.inventory.mainInventory.length; i++) { + ItemStack torchStack = player.inventory.mainInventory[i]; + if (torchStack == null || !torchStack.getUnlocalizedName().toLowerCase().contains("torch")) { + continue; + } + Item item = torchStack.getItem(); + if (!(item instanceof ItemBlock)) { + continue; + } + int oldMeta = torchStack.getItemDamage(); + int oldSize = torchStack.stackSize; + boolean result = torchStack.tryPlaceItemIntoWorld(player, world, x, y, z, side, xOffset, yOffset, zOffset); + if (player.capabilities.isCreativeMode) { + torchStack.setItemDamage(oldMeta); + torchStack.stackSize = oldSize; + } else if (torchStack.stackSize <= 0) { + ForgeEventFactory.onPlayerDestroyItem(player, torchStack); + player.inventory.mainInventory[i] = null; + } + if (result) { + return true; + } + } + } else { + ElectricItem.manager.use(stack, searchCost, player); + if (!world.isRemote) { + world.playSoundEffect(x + 0.5D, y + 0.5D, z + 0.5D, "thaumcraft:wandfail", 0.2F, 0.2F + world.rand.nextFloat() * 0.2F); + return super.onItemUse(stack, player, world, x, y, z, side, xOffset, xOffset, zOffset); + } + Minecraft mc = Minecraft.getMinecraft(); + Thaumcraft.instance.renderEventHandler.startScan(player, x, y, z, System.currentTimeMillis() + 5000L); - player.swingItem(); - return super.onItemUse(stack, player, world, x, y, z, side, xOffset, yOffset, zOffset); - } + player.swingItem(); + return super.onItemUse(stack, player, world, x, y, z, side, xOffset, yOffset, zOffset); + } - return super.onItemUse(stack, player, world, x, y, z, side, xOffset, yOffset, zOffset); - } + return super.onItemUse(stack, player, world, x, y, z, side, xOffset, yOffset, zOffset); + } - public boolean onLeftClickEntity(ItemStack stack, EntityPlayer player, Entity entity) { - if (!((Entity) (player)).worldObj.isRemote && (!(entity instanceof EntityPlayer) || MinecraftServer.getServer().isPVPEnabled())) { - entity.setFire(2); - } - return super.onLeftClickEntity(stack, player, entity); - } + public boolean onLeftClickEntity(ItemStack stack, EntityPlayer player, Entity entity) { + if (!((Entity) (player)).worldObj.isRemote && (!(entity instanceof EntityPlayer) || MinecraftServer.getServer().isPVPEnabled())) { + entity.setFire(2); + } + return super.onLeftClickEntity(stack, player, entity); + } - @Override - public boolean hitEntity(ItemStack itemstack, EntityLivingBase entityliving, EntityLivingBase attacker) { - if (ElectricItem.manager.use(itemstack, hitCost, attacker)) { - entityliving.attackEntityFrom(DamageSource.causePlayerDamage((EntityPlayer) attacker), 12F); - } - return false; - } + @Override + public boolean hitEntity(ItemStack itemstack, EntityLivingBase entityliving, EntityLivingBase attacker) { + if (ElectricItem.manager.use(itemstack, hitCost, attacker)) { + entityliving.attackEntityFrom(DamageSource.causePlayerDamage((EntityPlayer) attacker), 12F); + } + return false; + } - @Override - public boolean canProvideEnergy(ItemStack itemStack) { - return false; - } + @Override + public boolean canProvideEnergy(ItemStack itemStack) { + return false; + } - @Override - public int getMaxCharge(ItemStack itemStack) { - return maxCharge; - } + @Override + public int getMaxCharge(ItemStack itemStack) { + return maxCharge; + } - @Override - public int getTier(ItemStack itemStack) { - return 3; - } + @Override + public int getTier(ItemStack itemStack) { + return 3; + } - @Override - public int getTransferLimit(ItemStack itemStack) { - return 900; - } + @Override + public int getTransferLimit(ItemStack itemStack) { + return 900; + } - @Override - public boolean canHarvestBlock(Block block, ItemStack stack) { - return Items.diamond_pickaxe.canHarvestBlock(block, stack) || Items.diamond_shovel.canHarvestBlock(block, stack); - } + @Override + public boolean canHarvestBlock(Block block, ItemStack stack) { + return Items.diamond_pickaxe.canHarvestBlock(block, stack) || Items.diamond_shovel.canHarvestBlock(block, stack); + } - @Override - public float getDigSpeed(ItemStack stack, Block block, int meta) { - if (!ElectricItem.manager.canUse(stack, cost)) { - return 1.0F; - } + @Override + public float getDigSpeed(ItemStack stack, Block block, int meta) { + if (!ElectricItem.manager.canUse(stack, cost)) { + return 1.0F; + } - if (Items.wooden_pickaxe.getDigSpeed(stack, block, meta) > 1.0F || Items.wooden_shovel.getDigSpeed(stack, block, meta) > 1.0F) { - return efficiencyOnProperMaterial; - } else { - return super.getDigSpeed(stack, block, meta); - } - } + if (Items.wooden_pickaxe.getDigSpeed(stack, block, meta) > 1.0F || Items.wooden_shovel.getDigSpeed(stack, block, meta) > 1.0F) { + return efficiencyOnProperMaterial; + } else { + return super.getDigSpeed(stack, block, meta); + } + } - @Override - public boolean isRepairable() { - return false; - } + @Override + public boolean isRepairable() { + return false; + } - @Override - public int getItemEnchantability() { - if (Config.enchanting == false) { - return 0; - } else { - return 6; - } - } + @Override + public int getItemEnchantability() { + if (Config.enchanting == false) { + return 0; + } else { + return 6; + } + } - @Override - public boolean isBookEnchantable(ItemStack itemstack1, ItemStack itemstack2) { - if (Config.enchanting == false) { - return false; - } else { - return true; - } - } + @Override + public boolean isBookEnchantable(ItemStack itemstack1, ItemStack itemstack2) { + if (Config.enchanting == false) { + return false; + } else { + return true; + } + } - @Override - public Item getChargedItem(ItemStack itemStack) { - return this; - } + @Override + public Item getChargedItem(ItemStack itemStack) { + return this; + } - @Override - public Item getEmptyItem(ItemStack itemStack) { - return this; - } + @Override + public Item getEmptyItem(ItemStack itemStack) { + return this; + } } diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/tools/ItemStreamChainsaw.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/tools/ItemStreamChainsaw.java index b93b89f..ff0415c 100644 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/tools/ItemStreamChainsaw.java +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/tools/ItemStreamChainsaw.java @@ -1,25 +1,26 @@ /******************************************************************************* * Copyright (c) 2014 Tombenpotter. * All rights reserved. - * + * * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * + * * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. * http://www.minecraftforum.net/topic/1585216- - * + * * This class originally belongs to Azanor, but with his permission I took it, and modified it to make it work as I wanted to. ******************************************************************************/ package electricMagicTools.tombenpotter.electricmagictools.common.items.tools; +import cpw.mods.fml.common.network.NetworkRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import electricMagicTools.tombenpotter.electricmagictools.common.Config; +import electricMagicTools.tombenpotter.electricmagictools.common.CreativeTab; +import electricMagicTools.tombenpotter.electricmagictools.common.ElectricMagicTools; import ic2.api.item.ElectricItem; import ic2.api.item.IElectricItem; - -import java.awt.Color; -import java.util.ArrayList; -import java.util.List; - import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -35,166 +36,165 @@ import net.minecraft.world.World; import thaumcraft.common.Thaumcraft; import thaumcraft.common.lib.Utils; import thaumcraft.common.lib.network.fx.PacketFXBlockBubble; -import cpw.mods.fml.common.network.NetworkRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import electricMagicTools.tombenpotter.electricmagictools.common.Config; -import electricMagicTools.tombenpotter.electricmagictools.common.CreativeTab; + +import java.awt.*; +import java.util.ArrayList; +import java.util.List; public class ItemStreamChainsaw extends ItemAxe implements IElectricItem { - boolean alternateServer; - boolean alternateClient; - @SuppressWarnings("rawtypes") - public static ArrayList oreDictLogs = new ArrayList(); - public int maxCharge = 900000; - private final int cost = 400; - private final int hitCost = 500; + boolean alternateServer; + boolean alternateClient; + @SuppressWarnings("rawtypes") + public static ArrayList oreDictLogs = new ArrayList(); + public int maxCharge = 900000; + private final int cost = 400; + private final int hitCost = 500; - public ItemStreamChainsaw() { - super(ToolMaterial.EMERALD); - this.efficiencyOnProperMaterial = 25F; - alternateServer = false; - alternateClient = false; - setCreativeTab(CreativeTab.tabTombenpotter); - this.maxStackSize = 1; - this.setMaxDamage(27); - } + public ItemStreamChainsaw() { + super(ToolMaterial.EMERALD); + this.efficiencyOnProperMaterial = 25F; + alternateServer = false; + alternateClient = false; + setCreativeTab(CreativeTab.tabTombenpotter); + this.maxStackSize = 1; + this.setMaxDamage(27); + } - public EnumAction getItemUseAction(ItemStack itemstack) { - return EnumAction.bow; - } + public EnumAction getItemUseAction(ItemStack itemstack) { + return EnumAction.bow; + } - public boolean onItemUse(ItemStack itemstack, EntityPlayer player, World world, int x, int y, int z, int par7, float par8, float par9, float par10) { - Block bi = world.getBlock(x, y, z); - if ((!player.isSneaking()) && (Utils.isWoodLog(world, x, y, z))) { - if (!world.isRemote) { - if (Utils.breakFurthestBlock(world, x, y, z, bi, player)) { - world.playSoundEffect(x, y, z, "thaumcraft:bubble", 0.15F, 1.0F); - ElectricItem.manager.use(itemstack, cost, player); - this.alternateServer = (!this.alternateServer); - } - } else { - player.swingItem(); - ElectricItem.manager.use(itemstack, cost, player); - this.alternateClient = (!this.alternateClient); - } - } - return super.onItemUse(itemstack, player, world, x, y, z, par7, par8, par9, par10); - } + public boolean onItemUse(ItemStack itemstack, EntityPlayer player, World world, int x, int y, int z, int par7, float par8, float par9, float par10) { + Block bi = world.getBlock(x, y, z); + if ((!player.isSneaking()) && (Utils.isWoodLog(world, x, y, z))) { + if (!world.isRemote) { + if (Utils.breakFurthestBlock(world, x, y, z, bi, player)) { + world.playSoundEffect(x, y, z, "thaumcraft:bubble", 0.15F, 1.0F); + ElectricItem.manager.use(itemstack, cost, player); + this.alternateServer = (!this.alternateServer); + } + } else { + player.swingItem(); + ElectricItem.manager.use(itemstack, cost, player); + this.alternateClient = (!this.alternateClient); + } + } + return super.onItemUse(itemstack, player, world, x, y, z, par7, par8, par9, par10); + } - public boolean onBlockStartBreak(ItemStack itemstack, int x, int y, int z, EntityPlayer player) { - World world = player.worldObj; - Block bi = world.getBlock(x, y, z); - if ((!player.isSneaking()) && (Utils.isWoodLog(world, x, y, z))) { - if (!world.isRemote) { - Utils.breakFurthestBlock(world, x, y, z, bi, player); - Thaumcraft.packetPipeline.sendToAllAround(new PacketFXBlockBubble(x, y, z, new Color(0.33F, 0.33F, 1.0F).getRGB()), new NetworkRegistry.TargetPoint(world.provider.dimensionId, x, y, z, 32.0D)); + public boolean onBlockStartBreak(ItemStack itemstack, int x, int y, int z, EntityPlayer player) { + World world = player.worldObj; + Block bi = world.getBlock(x, y, z); + if ((!player.isSneaking()) && (Utils.isWoodLog(world, x, y, z))) { + if (!world.isRemote) { + Utils.breakFurthestBlock(world, x, y, z, bi, player); + Thaumcraft.packetPipeline.sendToAllAround(new PacketFXBlockBubble(x, y, z, new Color(0.33F, 0.33F, 1.0F).getRGB()), new NetworkRegistry.TargetPoint(world.provider.dimensionId, x, y, z, 32.0D)); - world.playSoundEffect(x, y, z, "thaumcraft:bubble", 0.15F, 1.0F); - } - ElectricItem.manager.use(itemstack, cost, player); - return true; - } - return super.onBlockStartBreak(itemstack, x, y, z, player); - } + world.playSoundEffect(x, y, z, "thaumcraft:bubble", 0.15F, 1.0F); + } + ElectricItem.manager.use(itemstack, cost, player); + return true; + } + return super.onBlockStartBreak(itemstack, x, y, z, player); + } - @Override - public boolean canProvideEnergy(ItemStack itemStack) { - return false; - } + @Override + public boolean canProvideEnergy(ItemStack itemStack) { + return false; + } - @Override - public int getMaxCharge(ItemStack itemStack) { - return maxCharge; - } + @Override + public int getMaxCharge(ItemStack itemStack) { + return maxCharge; + } - @Override - public int getTier(ItemStack itemStack) { - return 3; - } + @Override + public int getTier(ItemStack itemStack) { + return 3; + } - @Override - public int getTransferLimit(ItemStack itemStack) { - return 900; - } + @Override + public int getTransferLimit(ItemStack itemStack) { + return 900; + } - @SideOnly(Side.CLIENT) - @Override - public void registerIcons(IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon("electricmagictools:streamchainsaw"); - } + @SideOnly(Side.CLIENT) + @Override + public void registerIcons(IIconRegister iconRegister) { + this.itemIcon = iconRegister.registerIcon(ElectricMagicTools.texturePath + ":streamchainsaw"); + } - @SuppressWarnings({ "rawtypes", "unchecked" }) - @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { - ItemStack itemStack = new ItemStack(this, 1); - if (getChargedItem(itemStack) == this) { - ItemStack charged = new ItemStack(this, 1); - ElectricItem.manager.charge(charged, 2147483647, 2147483647, true, false); - itemList.add(charged); - } - if (getEmptyItem(itemStack) == this) { - itemList.add(new ItemStack(this, 1, getMaxDamage())); - } - } + @SuppressWarnings({"rawtypes", "unchecked"}) + @SideOnly(Side.CLIENT) + public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { + ItemStack itemStack = new ItemStack(this, 1); + if (getChargedItem(itemStack) == this) { + ItemStack charged = new ItemStack(this, 1); + ElectricItem.manager.charge(charged, 2147483647, 2147483647, true, false); + itemList.add(charged); + } + if (getEmptyItem(itemStack) == this) { + itemList.add(new ItemStack(this, 1, getMaxDamage())); + } + } - @Override - public boolean canHarvestBlock(Block block, ItemStack stack) { - return Items.diamond_axe.canHarvestBlock(block, stack) || Items.diamond_sword.canHarvestBlock(block, stack); - } + @Override + public boolean canHarvestBlock(Block block, ItemStack stack) { + return Items.diamond_axe.canHarvestBlock(block, stack) || Items.diamond_sword.canHarvestBlock(block, stack); + } - @Override - public float getDigSpeed(ItemStack stack, Block block, int meta) { - if (!ElectricItem.manager.canUse(stack, cost)) { - return 1.0F; - } + @Override + public float getDigSpeed(ItemStack stack, Block block, int meta) { + if (!ElectricItem.manager.canUse(stack, cost)) { + return 1.0F; + } - if (Items.wooden_axe.getDigSpeed(stack, block, meta) > 1.0F || Items.wooden_sword.getDigSpeed(stack, block, meta) > 1.0F) { - return efficiencyOnProperMaterial; - } else { - return super.getDigSpeed(stack, block, meta); - } - } + if (Items.wooden_axe.getDigSpeed(stack, block, meta) > 1.0F || Items.wooden_sword.getDigSpeed(stack, block, meta) > 1.0F) { + return efficiencyOnProperMaterial; + } else { + return super.getDigSpeed(stack, block, meta); + } + } - @Override - public boolean isRepairable() { - return false; - } + @Override + public boolean isRepairable() { + return false; + } - @Override - public int getItemEnchantability() { - if (Config.enchanting == false) { - return 0; - } else { - return 4; - } - } + @Override + public int getItemEnchantability() { + if (Config.enchanting == false) { + return 0; + } else { + return 4; + } + } - @Override - public boolean isBookEnchantable(ItemStack itemstack1, ItemStack itemstack2) { - if (Config.enchanting == false) { - return false; - } else { - return true; - } - } + @Override + public boolean isBookEnchantable(ItemStack itemstack1, ItemStack itemstack2) { + if (Config.enchanting == false) { + return false; + } else { + return true; + } + } - @Override - public boolean hitEntity(ItemStack itemstack, EntityLivingBase entityliving, EntityLivingBase attacker) { - if (ElectricItem.manager.use(itemstack, hitCost, attacker)) { - entityliving.attackEntityFrom(DamageSource.causePlayerDamage((EntityPlayer) attacker), 12F); - } - return false; - } + @Override + public boolean hitEntity(ItemStack itemstack, EntityLivingBase entityliving, EntityLivingBase attacker) { + if (ElectricItem.manager.use(itemstack, hitCost, attacker)) { + entityliving.attackEntityFrom(DamageSource.causePlayerDamage((EntityPlayer) attacker), 12F); + } + return false; + } - @Override - public Item getChargedItem(ItemStack itemStack) { - return this; - } + @Override + public Item getChargedItem(ItemStack itemStack) { + return this; + } - @Override - public Item getEmptyItem(ItemStack itemStack) { - return this; - } + @Override + public Item getEmptyItem(ItemStack itemStack) { + return this; + } } diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/tools/ItemThaumiumChainsaw.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/tools/ItemThaumiumChainsaw.java index 509901a..938fcb4 100644 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/tools/ItemThaumiumChainsaw.java +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/tools/ItemThaumiumChainsaw.java @@ -1,21 +1,23 @@ /******************************************************************************* * Copyright (c) 2014 Tombenpotter. * All rights reserved. - * + * * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * + * * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ package electricMagicTools.tombenpotter.electricmagictools.common.items.tools; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import electricMagicTools.tombenpotter.electricmagictools.common.Config; +import electricMagicTools.tombenpotter.electricmagictools.common.CreativeTab; +import electricMagicTools.tombenpotter.electricmagictools.common.ElectricMagicTools; import ic2.api.item.ElectricItem; import ic2.api.item.IElectricItem; - -import java.util.List; - import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -29,156 +31,154 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; import net.minecraft.world.World; import net.minecraftforge.event.ForgeEventFactory; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import electricMagicTools.tombenpotter.electricmagictools.common.Config; -import electricMagicTools.tombenpotter.electricmagictools.common.CreativeTab; + +import java.util.List; public class ItemThaumiumChainsaw extends ItemAxe implements IElectricItem { - public int maxCharge = 60000; - private final int cost = 250; - private final int hitCost = 350; + public int maxCharge = 60000; + private final int cost = 250; + private final int hitCost = 350; - public ItemThaumiumChainsaw() { - super(ToolMaterial.EMERALD); - this.efficiencyOnProperMaterial = 21F; - this.setCreativeTab(CreativeTab.tabTombenpotter); - this.setMaxDamage(27); - this.setMaxStackSize(1); - } + public ItemThaumiumChainsaw() { + super(ToolMaterial.EMERALD); + this.efficiencyOnProperMaterial = 21F; + this.setCreativeTab(CreativeTab.tabTombenpotter); + this.setMaxDamage(27); + this.setMaxStackSize(1); + } - @SideOnly(Side.CLIENT) - @Override - public void registerIcons(IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon("electricmagictools:thaumiumchainsaw"); - } + @SideOnly(Side.CLIENT) + @Override + public void registerIcons(IIconRegister iconRegister) { + this.itemIcon = iconRegister.registerIcon(ElectricMagicTools.texturePath + ":thaumiumchainsaw"); + } - @Override - public boolean canProvideEnergy(ItemStack itemStack) { - return false; - } + @Override + public boolean canProvideEnergy(ItemStack itemStack) { + return false; + } - @Override - public int getMaxCharge(ItemStack itemStack) { - return maxCharge; - } + @Override + public int getMaxCharge(ItemStack itemStack) { + return maxCharge; + } - @Override - public int getTier(ItemStack itemStack) { - return 2; - } + @Override + public int getTier(ItemStack itemStack) { + return 2; + } - @Override - public int getTransferLimit(ItemStack itemStack) { - return 600; - } + @Override + public int getTransferLimit(ItemStack itemStack) { + return 600; + } - @SuppressWarnings({ "rawtypes", "unchecked" }) - @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { - ItemStack itemStack = new ItemStack(this, 1); - if (getChargedItem(itemStack) == this) { - ItemStack charged = new ItemStack(this, 1); - ElectricItem.manager.charge(charged, 2147483647, 2147483647, true, false); - itemList.add(charged); - } - if (getEmptyItem(itemStack) == this) { - itemList.add(new ItemStack(this, 1, getMaxDamage())); - } - } + @SuppressWarnings({"rawtypes", "unchecked"}) + @SideOnly(Side.CLIENT) + public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { + ItemStack itemStack = new ItemStack(this, 1); + if (getChargedItem(itemStack) == this) { + ItemStack charged = new ItemStack(this, 1); + ElectricItem.manager.charge(charged, 2147483647, 2147483647, true, false); + itemList.add(charged); + } + if (getEmptyItem(itemStack) == this) { + itemList.add(new ItemStack(this, 1, getMaxDamage())); + } + } - @Override - public boolean onBlockDestroyed(ItemStack stack, World world, Block block, int par4, int par5, int par6, EntityLivingBase entityLiving) { - ElectricItem.manager.use(stack, cost, entityLiving); - return true; - } + @Override + public boolean onBlockDestroyed(ItemStack stack, World world, Block block, int par4, int par5, int par6, EntityLivingBase entityLiving) { + ElectricItem.manager.use(stack, cost, entityLiving); + return true; + } - @Override - public boolean canHarvestBlock(Block block, ItemStack stack) { - return Items.diamond_axe.canHarvestBlock(block, stack) || Items.diamond_sword.canHarvestBlock(block, stack); - } + @Override + public boolean canHarvestBlock(Block block, ItemStack stack) { + return Items.diamond_axe.canHarvestBlock(block, stack) || Items.diamond_sword.canHarvestBlock(block, stack); + } - @Override - public float getDigSpeed(ItemStack stack, Block block, int meta) { - if (!ElectricItem.manager.canUse(stack, cost)) { - return 1.0F; - } + @Override + public float getDigSpeed(ItemStack stack, Block block, int meta) { + if (!ElectricItem.manager.canUse(stack, cost)) { + return 1.0F; + } - if (Items.wooden_axe.getDigSpeed(stack, block, meta) > 1.0F || Items.wooden_sword.getDigSpeed(stack, block, meta) > 1.0F) { - return efficiencyOnProperMaterial; - } else { - return super.getDigSpeed(stack, block, meta); - } - } + if (Items.wooden_axe.getDigSpeed(stack, block, meta) > 1.0F || Items.wooden_sword.getDigSpeed(stack, block, meta) > 1.0F) { + return efficiencyOnProperMaterial; + } else { + return super.getDigSpeed(stack, block, meta); + } + } - @Override - public boolean isRepairable() { - return false; - } + @Override + public boolean isRepairable() { + return false; + } - @Override - public int getItemEnchantability() { - if (Config.enchanting == false) { - return 0; - } else { - return 4; - } - } + @Override + public int getItemEnchantability() { + if (Config.enchanting == false) { + return 0; + } else { + return 4; + } + } - @Override - public boolean isBookEnchantable(ItemStack itemstack1, ItemStack itemstack2) { - if (Config.enchanting == false) { - return false; - } else { - return true; - } - } + @Override + public boolean isBookEnchantable(ItemStack itemstack1, ItemStack itemstack2) { + if (Config.enchanting == false) { + return false; + } else { + return true; + } + } - @Override - public boolean hitEntity(ItemStack itemstack, EntityLivingBase entityliving, EntityLivingBase attacker) { - if (ElectricItem.manager.use(itemstack, hitCost, attacker)) { - entityliving.attackEntityFrom(DamageSource.causePlayerDamage((EntityPlayer) attacker), 12F); - } - return false; - } + @Override + public boolean hitEntity(ItemStack itemstack, EntityLivingBase entityliving, EntityLivingBase attacker) { + if (ElectricItem.manager.use(itemstack, hitCost, attacker)) { + entityliving.attackEntityFrom(DamageSource.causePlayerDamage((EntityPlayer) attacker), 12F); + } + return false; + } - @Override - public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float xOffset, float yOffset, float zOffset) { - for (int i = 0; i < player.inventory.mainInventory.length; i++) { - ItemStack torchStack = player.inventory.mainInventory[i]; - if (torchStack == null || !torchStack.getUnlocalizedName().toLowerCase().contains("torch")) { - continue; - } - Item item = torchStack.getItem(); - if (!(item instanceof ItemBlock)) { - continue; - } - int oldMeta = torchStack.getItemDamage(); - int oldSize = torchStack.stackSize; - boolean result = torchStack.tryPlaceItemIntoWorld(player, world, x, y, z, side, xOffset, yOffset, zOffset); - if (player.capabilities.isCreativeMode) { - torchStack.setItemDamage(oldMeta); - torchStack.stackSize = oldSize; - } else if (torchStack.stackSize <= 0) { - ForgeEventFactory.onPlayerDestroyItem(player, torchStack); - player.inventory.mainInventory[i] = null; - } - if (result) { - return true; - } - } + @Override + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float xOffset, float yOffset, float zOffset) { + for (int i = 0; i < player.inventory.mainInventory.length; i++) { + ItemStack torchStack = player.inventory.mainInventory[i]; + if (torchStack == null || !torchStack.getUnlocalizedName().toLowerCase().contains("torch")) { + continue; + } + Item item = torchStack.getItem(); + if (!(item instanceof ItemBlock)) { + continue; + } + int oldMeta = torchStack.getItemDamage(); + int oldSize = torchStack.stackSize; + boolean result = torchStack.tryPlaceItemIntoWorld(player, world, x, y, z, side, xOffset, yOffset, zOffset); + if (player.capabilities.isCreativeMode) { + torchStack.setItemDamage(oldMeta); + torchStack.stackSize = oldSize; + } else if (torchStack.stackSize <= 0) { + ForgeEventFactory.onPlayerDestroyItem(player, torchStack); + player.inventory.mainInventory[i] = null; + } + if (result) { + return true; + } + } - return super.onItemUse(stack, player, world, x, y, z, side, xOffset, yOffset, zOffset); - } + return super.onItemUse(stack, player, world, x, y, z, side, xOffset, yOffset, zOffset); + } - @Override - public Item getChargedItem(ItemStack itemStack) { - return this; - } + @Override + public Item getChargedItem(ItemStack itemStack) { + return this; + } - @Override - public Item getEmptyItem(ItemStack itemStack) { - return this; - } + @Override + public Item getEmptyItem(ItemStack itemStack) { + return this; + } } diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/tools/ItemThaumiumDrill.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/tools/ItemThaumiumDrill.java index 1512524..1514f32 100644 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/tools/ItemThaumiumDrill.java +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/tools/ItemThaumiumDrill.java @@ -1,21 +1,23 @@ /******************************************************************************* * Copyright (c) 2014 Tombenpotter. * All rights reserved. - * + * * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * + * * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ package electricMagicTools.tombenpotter.electricmagictools.common.items.tools; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import electricMagicTools.tombenpotter.electricmagictools.common.Config; +import electricMagicTools.tombenpotter.electricmagictools.common.CreativeTab; +import electricMagicTools.tombenpotter.electricmagictools.common.ElectricMagicTools; import ic2.api.item.ElectricItem; import ic2.api.item.IElectricItem; - -import java.util.List; - import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -28,161 +30,159 @@ import net.minecraft.item.ItemPickaxe; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraftforge.event.ForgeEventFactory; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import electricMagicTools.tombenpotter.electricmagictools.common.Config; -import electricMagicTools.tombenpotter.electricmagictools.common.CreativeTab; + +import java.util.List; public class ItemThaumiumDrill extends ItemPickaxe implements IElectricItem { - public ItemThaumiumDrill() { - super(ToolMaterial.EMERALD); - this.efficiencyOnProperMaterial = 20F; - this.setCreativeTab(CreativeTab.tabTombenpotter); - this.setMaxStackSize(1); - if (Config.toolsInBore == false) { - this.setMaxDamage(27); - } else { - this.setMaxDamage(240); - } - } + public ItemThaumiumDrill() { + super(ToolMaterial.EMERALD); + this.efficiencyOnProperMaterial = 20F; + this.setCreativeTab(CreativeTab.tabTombenpotter); + this.setMaxStackSize(1); + if (Config.toolsInBore == false) { + this.setMaxDamage(27); + } else { + this.setMaxDamage(240); + } + } - public int maxCharge = 60000; - private int cost; + public int maxCharge = 60000; + private int cost; - @SideOnly(Side.CLIENT) - @Override - public void registerIcons(IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon("electricmagictools:thaumiumdrill"); - } + @SideOnly(Side.CLIENT) + @Override + public void registerIcons(IIconRegister iconRegister) { + this.itemIcon = iconRegister.registerIcon(ElectricMagicTools.texturePath + ":thaumiumdrill"); + } - @Override - public boolean canProvideEnergy(ItemStack itemStack) { - return false; - } + @Override + public boolean canProvideEnergy(ItemStack itemStack) { + return false; + } - @Override - public int getMaxCharge(ItemStack itemStack) { - return maxCharge; - } + @Override + public int getMaxCharge(ItemStack itemStack) { + return maxCharge; + } - @Override - public int getTier(ItemStack itemStack) { - return 2; - } + @Override + public int getTier(ItemStack itemStack) { + return 2; + } - @Override - public int getTransferLimit(ItemStack itemStack) { - return 100; - } + @Override + public int getTransferLimit(ItemStack itemStack) { + return 100; + } - @SuppressWarnings({ "rawtypes", "unchecked" }) - @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { - ItemStack itemStack = new ItemStack(this, 1); - if (getChargedItem(itemStack) == this) { - ItemStack charged = new ItemStack(this, 1); - ElectricItem.manager.charge(charged, 2147483647, 2147483647, true, false); - itemList.add(charged); - } - if (getEmptyItem(itemStack) == this) { - itemList.add(new ItemStack(this, 1, getMaxDamage())); - } - } + @SuppressWarnings({"rawtypes", "unchecked"}) + @SideOnly(Side.CLIENT) + public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { + ItemStack itemStack = new ItemStack(this, 1); + if (getChargedItem(itemStack) == this) { + ItemStack charged = new ItemStack(this, 1); + ElectricItem.manager.charge(charged, 2147483647, 2147483647, true, false); + itemList.add(charged); + } + if (getEmptyItem(itemStack) == this) { + itemList.add(new ItemStack(this, 1, getMaxDamage())); + } + } - @Override - public boolean onBlockDestroyed(ItemStack stack, World world, Block block, int par4, int par5, int par6, EntityLivingBase entityLiving) { - if (Config.toolsInBore == false) { - cost = 250; - } else { - cost = 1; - } - ElectricItem.manager.use(stack, cost, entityLiving); - return true; - } + @Override + public boolean onBlockDestroyed(ItemStack stack, World world, Block block, int par4, int par5, int par6, EntityLivingBase entityLiving) { + if (Config.toolsInBore == false) { + cost = 250; + } else { + cost = 1; + } + ElectricItem.manager.use(stack, cost, entityLiving); + return true; + } - @Override - public boolean canHarvestBlock(Block block, ItemStack stack) { - return Items.diamond_pickaxe.canHarvestBlock(block, stack) || Items.diamond_shovel.canHarvestBlock(block, stack); - } + @Override + public boolean canHarvestBlock(Block block, ItemStack stack) { + return Items.diamond_pickaxe.canHarvestBlock(block, stack) || Items.diamond_shovel.canHarvestBlock(block, stack); + } - @Override - public float getDigSpeed(ItemStack stack, Block block, int meta) { - if (!ElectricItem.manager.canUse(stack, cost)) { - return 1.0F; - } + @Override + public float getDigSpeed(ItemStack stack, Block block, int meta) { + if (!ElectricItem.manager.canUse(stack, cost)) { + return 1.0F; + } - if (Items.wooden_pickaxe.getDigSpeed(stack, block, meta) > 1.0F || Items.wooden_shovel.getDigSpeed(stack, block, meta) > 1.0F) { - return efficiencyOnProperMaterial; - } else { - return super.getDigSpeed(stack, block, meta); - } - } + if (Items.wooden_pickaxe.getDigSpeed(stack, block, meta) > 1.0F || Items.wooden_shovel.getDigSpeed(stack, block, meta) > 1.0F) { + return efficiencyOnProperMaterial; + } else { + return super.getDigSpeed(stack, block, meta); + } + } - @Override - public boolean isRepairable() { - return false; - } + @Override + public boolean isRepairable() { + return false; + } - @Override - public int getItemEnchantability() { - if (Config.enchanting == false) { - return 0; - } else { - return 4; - } - } + @Override + public int getItemEnchantability() { + if (Config.enchanting == false) { + return 0; + } else { + return 4; + } + } - @Override - public boolean isBookEnchantable(ItemStack itemstack1, ItemStack itemstack2) { - if (Config.enchanting == false) { - return false; - } else { - return true; - } - } + @Override + public boolean isBookEnchantable(ItemStack itemstack1, ItemStack itemstack2) { + if (Config.enchanting == false) { + return false; + } else { + return true; + } + } - @Override - public boolean hitEntity(ItemStack itemstack, EntityLivingBase entityliving, EntityLivingBase entityliving1) { - return true; - } + @Override + public boolean hitEntity(ItemStack itemstack, EntityLivingBase entityliving, EntityLivingBase entityliving1) { + return true; + } - @Override - public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float xOffset, float yOffset, float zOffset) { - for (int i = 0; i < player.inventory.mainInventory.length; i++) { - ItemStack torchStack = player.inventory.mainInventory[i]; - if (torchStack == null || !torchStack.getUnlocalizedName().toLowerCase().contains("torch")) { - continue; - } - Item item = torchStack.getItem(); - if (!(item instanceof ItemBlock)) { - continue; - } - int oldMeta = torchStack.getItemDamage(); - int oldSize = torchStack.stackSize; - boolean result = torchStack.tryPlaceItemIntoWorld(player, world, x, y, z, side, xOffset, yOffset, zOffset); - if (player.capabilities.isCreativeMode) { - torchStack.setItemDamage(oldMeta); - torchStack.stackSize = oldSize; - } else if (torchStack.stackSize <= 0) { - ForgeEventFactory.onPlayerDestroyItem(player, torchStack); - player.inventory.mainInventory[i] = null; - } - if (result) { - return true; - } - } + @Override + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float xOffset, float yOffset, float zOffset) { + for (int i = 0; i < player.inventory.mainInventory.length; i++) { + ItemStack torchStack = player.inventory.mainInventory[i]; + if (torchStack == null || !torchStack.getUnlocalizedName().toLowerCase().contains("torch")) { + continue; + } + Item item = torchStack.getItem(); + if (!(item instanceof ItemBlock)) { + continue; + } + int oldMeta = torchStack.getItemDamage(); + int oldSize = torchStack.stackSize; + boolean result = torchStack.tryPlaceItemIntoWorld(player, world, x, y, z, side, xOffset, yOffset, zOffset); + if (player.capabilities.isCreativeMode) { + torchStack.setItemDamage(oldMeta); + torchStack.stackSize = oldSize; + } else if (torchStack.stackSize <= 0) { + ForgeEventFactory.onPlayerDestroyItem(player, torchStack); + player.inventory.mainInventory[i] = null; + } + if (result) { + return true; + } + } - return super.onItemUse(stack, player, world, x, y, z, side, xOffset, yOffset, zOffset); - } + return super.onItemUse(stack, player, world, x, y, z, side, xOffset, yOffset, zOffset); + } - @Override - public Item getChargedItem(ItemStack itemStack) { - return this; - } + @Override + public Item getChargedItem(ItemStack itemStack) { + return this; + } - @Override - public Item getEmptyItem(ItemStack itemStack) { - return this; - } + @Override + public Item getEmptyItem(ItemStack itemStack) { + return this; + } } diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/tools/hammer/ItemElectricThorHammer.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/tools/hammer/ItemElectricThorHammer.java index c3c49e1..4cbaecd 100644 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/tools/hammer/ItemElectricThorHammer.java +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/tools/hammer/ItemElectricThorHammer.java @@ -1,21 +1,24 @@ /******************************************************************************* * Copyright (c) 2014 Tombenpotter. * All rights reserved. - * + * * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * + * * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ package electricMagicTools.tombenpotter.electricmagictools.common.items.tools.hammer; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import electricMagicTools.tombenpotter.electricmagictools.common.Config; +import electricMagicTools.tombenpotter.electricmagictools.common.CreativeTab; +import electricMagicTools.tombenpotter.electricmagictools.common.ElectricMagicTools; +import electricMagicTools.tombenpotter.electricmagictools.common.entities.EntityArcher; import ic2.api.item.ElectricItem; import ic2.api.item.IElectricItem; - -import java.util.List; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; @@ -28,177 +31,174 @@ import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.util.DamageSource; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import electricMagicTools.tombenpotter.electricmagictools.common.Config; -import electricMagicTools.tombenpotter.electricmagictools.common.CreativeTab; -import electricMagicTools.tombenpotter.electricmagictools.common.entities.EntityArcher; + +import java.util.List; public class ItemElectricThorHammer extends ItemSword implements IElectricItem { - public int maxCharge = 1000000; - private final int hitCost = 5000; - private final int lightningCost = 75000; + public int maxCharge = 1000000; + private final int hitCost = 5000; + private final int lightningCost = 75000; - public ItemElectricThorHammer() { - super(ToolMaterial.EMERALD); - this.setCreativeTab(CreativeTab.tabTombenpotter); - this.setMaxDamage(27); - this.setMaxStackSize(1); - // OreDictionary.registerOre("craftingToolForgeHammer", this); - } + public ItemElectricThorHammer() { + super(ToolMaterial.EMERALD); + this.setCreativeTab(CreativeTab.tabTombenpotter); + this.setMaxDamage(27); + this.setMaxStackSize(1); + // OreDictionary.registerOre("craftingToolForgeHammer", this); + } - @Override - public boolean canProvideEnergy(ItemStack itemStack) { - return false; - } + @Override + public boolean canProvideEnergy(ItemStack itemStack) { + return false; + } - @Override - public int getMaxCharge(ItemStack itemStack) { - return maxCharge; - } + @Override + public int getMaxCharge(ItemStack itemStack) { + return maxCharge; + } - @Override - public int getTier(ItemStack itemStack) { - return 2; - } + @Override + public int getTier(ItemStack itemStack) { + return 2; + } - @Override - public int getTransferLimit(ItemStack itemStack) { - return 100; - } + @Override + public int getTransferLimit(ItemStack itemStack) { + return 100; + } - @SideOnly(Side.CLIENT) - @Override - public void registerIcons(IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon("electricmagictools:hammer/electricthorhammer"); - } + @SideOnly(Side.CLIENT) + @Override + public void registerIcons(IIconRegister iconRegister) { + this.itemIcon = iconRegister.registerIcon(ElectricMagicTools.texturePath + ":hammer/electricthorhammer"); + } - @SuppressWarnings({ "rawtypes", "unchecked" }) - @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { - ItemStack itemStack = new ItemStack(this, 1); - if (getChargedItem(itemStack) == this) { - ItemStack charged = new ItemStack(this, 1); - ElectricItem.manager.charge(charged, 2147483647, 2147483647, true, false); - itemList.add(charged); - } - if (getEmptyItem(itemStack) == this) { - itemList.add(new ItemStack(this, 1, getMaxDamage())); - } - } + @SuppressWarnings({"rawtypes", "unchecked"}) + @SideOnly(Side.CLIENT) + public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { + ItemStack itemStack = new ItemStack(this, 1); + if (getChargedItem(itemStack) == this) { + ItemStack charged = new ItemStack(this, 1); + ElectricItem.manager.charge(charged, 2147483647, 2147483647, true, false); + itemList.add(charged); + } + if (getEmptyItem(itemStack) == this) { + itemList.add(new ItemStack(this, 1, getMaxDamage())); + } + } - @Override - public boolean isRepairable() { - return false; - } + @Override + public boolean isRepairable() { + return false; + } - @Override - public int getItemEnchantability() { - if (Config.enchanting == false) { - return 0; - } else { - return 4; - } - } + @Override + public int getItemEnchantability() { + if (Config.enchanting == false) { + return 0; + } else { + return 4; + } + } - @Override - public boolean isBookEnchantable(ItemStack itemstack1, ItemStack itemstack2) { - if (Config.enchanting == false) { - return false; - } else { - return true; - } - } + @Override + public boolean isBookEnchantable(ItemStack itemstack1, ItemStack itemstack2) { + if (Config.enchanting == false) { + return false; + } else { + return true; + } + } - @Override - public boolean hitEntity(ItemStack itemstack, EntityLivingBase entityliving, EntityLivingBase attacker) { - if (ElectricItem.manager.use(itemstack, hitCost, attacker)) { - entityliving.attackEntityFrom(DamageSource.causePlayerDamage((EntityPlayer) attacker), 19F); - } - return false; - } + @Override + public boolean hitEntity(ItemStack itemstack, EntityLivingBase entityliving, EntityLivingBase attacker) { + if (ElectricItem.manager.use(itemstack, hitCost, attacker)) { + entityliving.attackEntityFrom(DamageSource.causePlayerDamage((EntityPlayer) attacker), 19F); + } + return false; + } - @SuppressWarnings({ "rawtypes", "unchecked" }) - @Override - public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { - list.add(player.getCommandSenderName() + "'s Hammer"); - } + @SuppressWarnings({"rawtypes", "unchecked"}) + @Override + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { + list.add(player.getCommandSenderName() + "'s Hammer"); + } - @Override - public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer player) { - if (player.capabilities.isCreativeMode) { - return itemstack; - } else if (ElectricItem.manager.canUse(itemstack, lightningCost)) { - player.swingItem(); - // Corners - world.spawnEntityInWorld(new EntityLightningBolt(world, player.posX + 8, player.posY, player.posZ - 8)); - world.spawnEntityInWorld(new EntityLightningBolt(world, player.posX - 8, player.posY, player.posZ + 8)); - world.spawnEntityInWorld(new EntityLightningBolt(world, player.posX - 8, player.posY, player.posZ - 8)); - world.spawnEntityInWorld(new EntityLightningBolt(world, player.posX + 8, player.posY, player.posZ + 8)); + @Override + public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer player) { + if (player.capabilities.isCreativeMode) { + return itemstack; + } else if (ElectricItem.manager.canUse(itemstack, lightningCost)) { + player.swingItem(); + // Corners + world.spawnEntityInWorld(new EntityLightningBolt(world, player.posX + 8, player.posY, player.posZ - 8)); + world.spawnEntityInWorld(new EntityLightningBolt(world, player.posX - 8, player.posY, player.posZ + 8)); + world.spawnEntityInWorld(new EntityLightningBolt(world, player.posX - 8, player.posY, player.posZ - 8)); + world.spawnEntityInWorld(new EntityLightningBolt(world, player.posX + 8, player.posY, player.posZ + 8)); - // Fronts - world.spawnEntityInWorld(new EntityLightningBolt(world, player.posX + 8, player.posY, player.posZ)); - world.spawnEntityInWorld(new EntityLightningBolt(world, player.posX - 8, player.posY, player.posZ)); - world.spawnEntityInWorld(new EntityLightningBolt(world, player.posX, player.posY, player.posZ - 8)); - world.spawnEntityInWorld(new EntityLightningBolt(world, player.posX, player.posY, player.posZ + 8)); + // Fronts + world.spawnEntityInWorld(new EntityLightningBolt(world, player.posX + 8, player.posY, player.posZ)); + world.spawnEntityInWorld(new EntityLightningBolt(world, player.posX - 8, player.posY, player.posZ)); + world.spawnEntityInWorld(new EntityLightningBolt(world, player.posX, player.posY, player.posZ - 8)); + world.spawnEntityInWorld(new EntityLightningBolt(world, player.posX, player.posY, player.posZ + 8)); - // Others - world.spawnEntityInWorld(new EntityLightningBolt(world, player.posX + 8, player.posY, player.posZ + 1)); - world.spawnEntityInWorld(new EntityLightningBolt(world, player.posX - 8, player.posY, player.posZ + 2)); - world.spawnEntityInWorld(new EntityLightningBolt(world, player.posX + 8, player.posY, player.posZ + 3)); - world.spawnEntityInWorld(new EntityLightningBolt(world, player.posX - 8, player.posY, player.posZ + 4)); + // Others + world.spawnEntityInWorld(new EntityLightningBolt(world, player.posX + 8, player.posY, player.posZ + 1)); + world.spawnEntityInWorld(new EntityLightningBolt(world, player.posX - 8, player.posY, player.posZ + 2)); + world.spawnEntityInWorld(new EntityLightningBolt(world, player.posX + 8, player.posY, player.posZ + 3)); + world.spawnEntityInWorld(new EntityLightningBolt(world, player.posX - 8, player.posY, player.posZ + 4)); - world.spawnEntityInWorld(new EntityLightningBolt(world, player.posX + 8, player.posY, player.posZ - 1)); - world.spawnEntityInWorld(new EntityLightningBolt(world, player.posX - 8, player.posY, player.posZ - 2)); - world.spawnEntityInWorld(new EntityLightningBolt(world, player.posX + 8, player.posY, player.posZ - 3)); - world.spawnEntityInWorld(new EntityLightningBolt(world, player.posX - 8, player.posY, player.posZ - 4)); + world.spawnEntityInWorld(new EntityLightningBolt(world, player.posX + 8, player.posY, player.posZ - 1)); + world.spawnEntityInWorld(new EntityLightningBolt(world, player.posX - 8, player.posY, player.posZ - 2)); + world.spawnEntityInWorld(new EntityLightningBolt(world, player.posX + 8, player.posY, player.posZ - 3)); + world.spawnEntityInWorld(new EntityLightningBolt(world, player.posX - 8, player.posY, player.posZ - 4)); - world.spawnEntityInWorld(new EntityLightningBolt(world, player.posX + 1, player.posY, player.posZ + 8)); - world.spawnEntityInWorld(new EntityLightningBolt(world, player.posX + 2, player.posY, player.posZ - 8)); - world.spawnEntityInWorld(new EntityLightningBolt(world, player.posX + 3, player.posY, player.posZ + 8)); - world.spawnEntityInWorld(new EntityLightningBolt(world, player.posX + 4, player.posY, player.posZ - 8)); + world.spawnEntityInWorld(new EntityLightningBolt(world, player.posX + 1, player.posY, player.posZ + 8)); + world.spawnEntityInWorld(new EntityLightningBolt(world, player.posX + 2, player.posY, player.posZ - 8)); + world.spawnEntityInWorld(new EntityLightningBolt(world, player.posX + 3, player.posY, player.posZ + 8)); + world.spawnEntityInWorld(new EntityLightningBolt(world, player.posX + 4, player.posY, player.posZ - 8)); - world.spawnEntityInWorld(new EntityLightningBolt(world, player.posX - 1, player.posY, player.posZ + 8)); - world.spawnEntityInWorld(new EntityLightningBolt(world, player.posX - 2, player.posY, player.posZ - 8)); - world.spawnEntityInWorld(new EntityLightningBolt(world, player.posX - 3, player.posY, player.posZ + 8)); - world.spawnEntityInWorld(new EntityLightningBolt(world, player.posX - 4, player.posY, player.posZ - 8)); + world.spawnEntityInWorld(new EntityLightningBolt(world, player.posX - 1, player.posY, player.posZ + 8)); + world.spawnEntityInWorld(new EntityLightningBolt(world, player.posX - 2, player.posY, player.posZ - 8)); + world.spawnEntityInWorld(new EntityLightningBolt(world, player.posX - 3, player.posY, player.posZ + 8)); + world.spawnEntityInWorld(new EntityLightningBolt(world, player.posX - 4, player.posY, player.posZ - 8)); - EntityArcher archer; - archer = new EntityArcher(world); - archer.setPosition(player.posX + 8, player.posY + 2, player.posZ - 8); - world.spawnEntityInWorld(archer); + EntityArcher archer; + archer = new EntityArcher(world); + archer.setPosition(player.posX + 8, player.posY + 2, player.posZ - 8); + world.spawnEntityInWorld(archer); - EntityArcher archer1; - archer1 = new EntityArcher(world); - archer1.setPosition(player.posX - 8, player.posY + 2, player.posZ + 8); - world.spawnEntityInWorld(archer1); + EntityArcher archer1; + archer1 = new EntityArcher(world); + archer1.setPosition(player.posX - 8, player.posY + 2, player.posZ + 8); + world.spawnEntityInWorld(archer1); - EntityArcher archer2; - archer2 = new EntityArcher(world); - archer2.setPosition(player.posX - 8, player.posY + 2, player.posZ - 8); - world.spawnEntityInWorld(archer2); + EntityArcher archer2; + archer2 = new EntityArcher(world); + archer2.setPosition(player.posX - 8, player.posY + 2, player.posZ - 8); + world.spawnEntityInWorld(archer2); - EntityArcher archer3; - archer3 = new EntityArcher(world); - archer3.setPosition(player.posX + 8, player.posY + 2, player.posZ + 8); - world.spawnEntityInWorld(archer3); - ElectricItem.manager.use(itemstack, lightningCost, player); - return itemstack; - } else { - world.spawnEntityInWorld(new EntityLightningBolt(world, player.posX, player.posY, player.posZ)); - player.addPotionEffect(new PotionEffect(Potion.harm.getId(), 1, 1)); - return itemstack; - } - } + EntityArcher archer3; + archer3 = new EntityArcher(world); + archer3.setPosition(player.posX + 8, player.posY + 2, player.posZ + 8); + world.spawnEntityInWorld(archer3); + ElectricItem.manager.use(itemstack, lightningCost, player); + return itemstack; + } else { + world.spawnEntityInWorld(new EntityLightningBolt(world, player.posX, player.posY, player.posZ)); + player.addPotionEffect(new PotionEffect(Potion.harm.getId(), 1, 1)); + return itemstack; + } + } - @Override - public Item getChargedItem(ItemStack itemStack) { - return this; - } + @Override + public Item getChargedItem(ItemStack itemStack) { + return this; + } - @Override - public Item getEmptyItem(ItemStack itemStack) { - return this; - } + @Override + public Item getEmptyItem(ItemStack itemStack) { + return this; + } } diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/tools/hammer/ItemTaintedThorHammer.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/tools/hammer/ItemTaintedThorHammer.java index 6c84727..797583b 100644 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/tools/hammer/ItemTaintedThorHammer.java +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/tools/hammer/ItemTaintedThorHammer.java @@ -1,18 +1,19 @@ /******************************************************************************* * Copyright (c) 2014 Tombenpotter. * All rights reserved. - * + * * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * + * * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ package electricMagicTools.tombenpotter.electricmagictools.common.items.tools.hammer; -import java.util.List; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import electricMagicTools.tombenpotter.electricmagictools.common.ElectricMagicTools; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -20,53 +21,53 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; import net.minecraft.world.World; import thaumcraft.common.entities.projectile.EntityAlumentum; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; + +import java.util.List; public class ItemTaintedThorHammer extends ItemThorHammer { - public ItemTaintedThorHammer() { - super(); - this.setMaxDamage(1000); - // OreDictionary.registerOre("craftingToolForgeHammer", this); - } + public ItemTaintedThorHammer() { + super(); + this.setMaxDamage(1000); + // OreDictionary.registerOre("craftingToolForgeHammer", this); + } - @SideOnly(Side.CLIENT) - @Override - public void registerIcons(IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon("electricmagictools:hammer/taintedthorhammer"); - } + @SideOnly(Side.CLIENT) + @Override + public void registerIcons(IIconRegister iconRegister) { + this.itemIcon = iconRegister.registerIcon(ElectricMagicTools.texturePath + ":hammer/taintedthorhammer"); + } - @Override - public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer player) { - player.swingItem(); - world.spawnEntityInWorld(new EntityAlumentum(world, player.posX + 8, player.posY, player.posZ - 8)); - world.spawnEntityInWorld(new EntityAlumentum(world, player.posX - 8, player.posY, player.posZ + 8)); - world.spawnEntityInWorld(new EntityAlumentum(world, player.posX - 8, player.posY, player.posZ - 8)); - world.spawnEntityInWorld(new EntityAlumentum(world, player.posX + 8, player.posY, player.posZ + 8)); - world.spawnEntityInWorld(new EntityAlumentum(world, player.posX, player.posY + 4, player.posZ)); - world.spawnEntityInWorld(new EntityAlumentum(world, player.posX, player.posY + 8, player.posZ)); + @Override + public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer player) { + player.swingItem(); + world.spawnEntityInWorld(new EntityAlumentum(world, player.posX + 8, player.posY, player.posZ - 8)); + world.spawnEntityInWorld(new EntityAlumentum(world, player.posX - 8, player.posY, player.posZ + 8)); + world.spawnEntityInWorld(new EntityAlumentum(world, player.posX - 8, player.posY, player.posZ - 8)); + world.spawnEntityInWorld(new EntityAlumentum(world, player.posX + 8, player.posY, player.posZ + 8)); + world.spawnEntityInWorld(new EntityAlumentum(world, player.posX, player.posY + 4, player.posZ)); + world.spawnEntityInWorld(new EntityAlumentum(world, player.posX, player.posY + 8, player.posZ)); - if (player.capabilities.isCreativeMode) { - return itemstack; - } else { - itemstack.damageItem(40, player); - return itemstack; - } - } + if (player.capabilities.isCreativeMode) { + return itemstack; + } else { + itemstack.damageItem(40, player); + return itemstack; + } + } - @Override - public boolean hitEntity(ItemStack itemstack, EntityLivingBase entityliving, EntityLivingBase attacker) { - entityliving.attackEntityFrom(DamageSource.causePlayerDamage((EntityPlayer) attacker), 2F); - itemstack.damageItem(1, attacker); - return true; - } + @Override + public boolean hitEntity(ItemStack itemstack, EntityLivingBase entityliving, EntityLivingBase attacker) { + entityliving.attackEntityFrom(DamageSource.causePlayerDamage((EntityPlayer) attacker), 2F); + itemstack.damageItem(1, attacker); + return true; + } - @SuppressWarnings({ "rawtypes", "unchecked" }) - @Override - public void addInformation(ItemStack stack, EntityPlayer par2EntityPlayer, List list, boolean par4) { - list.add("It was, once the Hammer of Thor."); - list.add("It is now very dangerous."); - list.add("Do NOT right-click."); - } + @SuppressWarnings({"rawtypes", "unchecked"}) + @Override + public void addInformation(ItemStack stack, EntityPlayer par2EntityPlayer, List list, boolean par4) { + list.add("It was, once the Hammer of Thor."); + list.add("It is now very dangerous."); + list.add("Do NOT right-click."); + } } diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/tools/hammer/ItemThorHammer.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/tools/hammer/ItemThorHammer.java index 1a6b5a4..ac887ee 100644 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/tools/hammer/ItemThorHammer.java +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/items/tools/hammer/ItemThorHammer.java @@ -1,18 +1,20 @@ /******************************************************************************* * Copyright (c) 2014 Tombenpotter. * All rights reserved. - * + * * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * + * * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ package electricMagicTools.tombenpotter.electricmagictools.common.items.tools.hammer; -import java.util.List; - +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import electricMagicTools.tombenpotter.electricmagictools.common.CreativeTab; +import electricMagicTools.tombenpotter.electricmagictools.common.ElectricMagicTools; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -27,79 +29,78 @@ import net.minecraft.util.MovingObjectPosition.MovingObjectType; import net.minecraft.util.Vec3; import net.minecraft.world.World; import thaumcraft.api.IRepairable; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import electricMagicTools.tombenpotter.electricmagictools.common.CreativeTab; + +import java.util.List; public class ItemThorHammer extends ItemSword implements IRepairable { - public ItemThorHammer() { - super(ToolMaterial.EMERALD); - this.setCreativeTab(CreativeTab.tabTombenpotter); - this.setMaxStackSize(1); - this.setMaxDamage(2000); - // OreDictionary.registerOre("craftingToolForgeHammer", this); - } + public ItemThorHammer() { + super(ToolMaterial.EMERALD); + this.setCreativeTab(CreativeTab.tabTombenpotter); + this.setMaxStackSize(1); + this.setMaxDamage(2000); + // OreDictionary.registerOre("craftingToolForgeHammer", this); + } - @SideOnly(Side.CLIENT) - @Override - public void registerIcons(IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon("electricmagictools:hammer/thorhammer"); - } + @SideOnly(Side.CLIENT) + @Override + public void registerIcons(IIconRegister iconRegister) { + this.itemIcon = iconRegister.registerIcon(ElectricMagicTools.texturePath + ":hammer/thorhammer"); + } - @Override - public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer player) { - player.swingItem(); - float f = 1.0F; - float f1 = player.prevRotationPitch + ((player.rotationPitch - player.prevRotationPitch) * f); - float f2 = player.prevRotationYaw + ((player.rotationYaw - player.prevRotationYaw) * f); - double d = player.prevPosX + ((player.posX - player.prevPosX) * f); - double d1 = (player.prevPosY + ((player.posY - player.prevPosY) * f) + 1.6200000000000001D) - player.yOffset; - double d2 = player.prevPosZ + ((player.posZ - player.prevPosZ) * f); - Vec3 vec3d = Vec3.createVectorHelper(d, d1, d2); - float f3 = MathHelper.cos((-f2 * 0.01745329F) - 3.141593F); - float f4 = MathHelper.sin((-f2 * 0.01745329F) - 3.141593F); - float f5 = -MathHelper.cos(-f1 * 0.01745329F); - float f6 = MathHelper.sin(-f1 * 0.01745329F); - float f7 = f4 * f5; - float f8 = f6; - float f9 = f3 * f5; - double d3 = 5000D; - Vec3 vec3d1 = vec3d.addVector(f7 * d3, f8 * d3, f9 * d3); - MovingObjectPosition movingobjectposition = player.worldObj.rayTraceBlocks(vec3d, vec3d1, true); - if (movingobjectposition == null) { - return itemstack; - } - if (movingobjectposition.typeOfHit == MovingObjectType.BLOCK) { - int i = movingobjectposition.blockX; - int j = movingobjectposition.blockY; - int k = movingobjectposition.blockZ; - world.spawnEntityInWorld(new EntityLightningBolt(world, i, j, k)); - } else if (movingobjectposition.typeOfHit == MovingObjectType.ENTITY) { - Entity entityhit = movingobjectposition.entityHit; - double x = entityhit.posX; - double y = entityhit.posY; - double z = entityhit.posZ; - world.spawnEntityInWorld(new EntityLightningBolt(world, x, y, z)); - } - if (player.capabilities.isCreativeMode) { - return itemstack; - } else { - itemstack.damageItem(20, player); - return itemstack; - } - } + @Override + public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer player) { + player.swingItem(); + float f = 1.0F; + float f1 = player.prevRotationPitch + ((player.rotationPitch - player.prevRotationPitch) * f); + float f2 = player.prevRotationYaw + ((player.rotationYaw - player.prevRotationYaw) * f); + double d = player.prevPosX + ((player.posX - player.prevPosX) * f); + double d1 = (player.prevPosY + ((player.posY - player.prevPosY) * f) + 1.6200000000000001D) - player.yOffset; + double d2 = player.prevPosZ + ((player.posZ - player.prevPosZ) * f); + Vec3 vec3d = Vec3.createVectorHelper(d, d1, d2); + float f3 = MathHelper.cos((-f2 * 0.01745329F) - 3.141593F); + float f4 = MathHelper.sin((-f2 * 0.01745329F) - 3.141593F); + float f5 = -MathHelper.cos(-f1 * 0.01745329F); + float f6 = MathHelper.sin(-f1 * 0.01745329F); + float f7 = f4 * f5; + float f8 = f6; + float f9 = f3 * f5; + double d3 = 5000D; + Vec3 vec3d1 = vec3d.addVector(f7 * d3, f8 * d3, f9 * d3); + MovingObjectPosition movingobjectposition = player.worldObj.rayTraceBlocks(vec3d, vec3d1, true); + if (movingobjectposition == null) { + return itemstack; + } + if (movingobjectposition.typeOfHit == MovingObjectType.BLOCK) { + int i = movingobjectposition.blockX; + int j = movingobjectposition.blockY; + int k = movingobjectposition.blockZ; + world.spawnEntityInWorld(new EntityLightningBolt(world, i, j, k)); + } else if (movingobjectposition.typeOfHit == MovingObjectType.ENTITY) { + Entity entityhit = movingobjectposition.entityHit; + double x = entityhit.posX; + double y = entityhit.posY; + double z = entityhit.posZ; + world.spawnEntityInWorld(new EntityLightningBolt(world, x, y, z)); + } + if (player.capabilities.isCreativeMode) { + return itemstack; + } else { + itemstack.damageItem(20, player); + return itemstack; + } + } - @Override - public boolean hitEntity(ItemStack itemstack, EntityLivingBase entityliving, EntityLivingBase attacker) { - entityliving.attackEntityFrom(DamageSource.causePlayerDamage((EntityPlayer) attacker), 12F); - itemstack.damageItem(1, attacker); - return true; - } + @Override + public boolean hitEntity(ItemStack itemstack, EntityLivingBase entityliving, EntityLivingBase attacker) { + entityliving.attackEntityFrom(DamageSource.causePlayerDamage((EntityPlayer) attacker), 12F); + itemstack.damageItem(1, attacker); + return true; + } - @SuppressWarnings({ "rawtypes", "unchecked" }) - @Override - public void addInformation(ItemStack stack, EntityPlayer par2EntityPlayer, List list, boolean par4) { - list.add("The Hammer of Thor"); - } + @SuppressWarnings({"rawtypes", "unchecked"}) + @Override + public void addInformation(ItemStack stack, EntityPlayer par2EntityPlayer, List list, boolean par4) { + list.add("The Hammer of Thor"); + } } diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/lib/CraftingAspects.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/lib/CraftingAspects.java index fd73b97..0d7b0a9 100644 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/lib/CraftingAspects.java +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/lib/CraftingAspects.java @@ -1,10 +1,10 @@ /******************************************************************************* * Copyright (c) 2014 Tombenpotter. * All rights reserved. - * + * * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * + * * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. * http://www.minecraftforum.net/topic/1585216- @@ -16,49 +16,52 @@ import thaumcraft.api.aspects.AspectList; public class CraftingAspects { - public static AspectList thaumiumDrillCrafting = new AspectList().add(Aspect.TOOL, 16).add(Aspect.MINE, 16).add(Aspect.ENERGY, 16); - public static AspectList thaumiumChainsawCrafting = new AspectList().add(Aspect.TOOL, 16).add(Aspect.WEAPON, 16).add(Aspect.ENERGY, 16); - public static AspectList thaumicQuantumHelmetCrafting = new AspectList().add(Aspect.ARMOR, 25).add(Aspect.SENSES, 25).add(Aspect.ENERGY, 25); - public static AspectList diamondOmnitoolCrafting = new AspectList().add(Aspect.ORDER, 15).add(Aspect.AIR, 15); - public static AspectList thaumiumOmnitoolCrafting = new AspectList().add(Aspect.TOOL, 25).add(Aspect.MINE, 25).add(Aspect.ENERGY, 25).add(Aspect.WEAPON, 25); - public static AspectList thaumicNanoHelmetCrafting = new AspectList().add(Aspect.ARMOR, 16).add(Aspect.SENSES, 16).add(Aspect.ENERGY, 16); - public static AspectList laserFocusCrafting = new AspectList().add(Aspect.FIRE, 30).add(Aspect.MOTION, 16).add(Aspect.WEAPON, 30).add(Aspect.DEATH, 16); - public static AspectList christmasFocusCrafting = new AspectList().add(Aspect.ORDER, 20).add(Aspect.AIR, 20); - public static AspectList shieldFocusCrafting = new AspectList().add(Aspect.AIR, 16).add(Aspect.ARMOR, 20).add(Aspect.CRYSTAL, 16).add(Aspect.TRAP, 20).add(Aspect.LIFE, 16); - public static AspectList electricGogglesCrafting = new AspectList().add(Aspect.AIR, 20).add(Aspect.ORDER, 20).add(Aspect.WATER, 20); - public static AspectList potentiaGeneratorCrafting = new AspectList().add(Aspect.ENERGY, 32).add(Aspect.MAGIC, 32).add(Aspect.METAL, 32).add(Aspect.EXCHANGE, 32); - public static AspectList ignisGeneratorCrafting = new AspectList().add(Aspect.FIRE, 16).add(Aspect.EXCHANGE, 8); - public static AspectList auramGeneratorCrafting = new AspectList().add(Aspect.AURA, 16).add(Aspect.EXCHANGE, 8); - public static AspectList arborGeneratorCrafting = new AspectList().add(Aspect.TREE, 16).add(Aspect.EXCHANGE, 8); - public static AspectList streamChaisnawCrafting = new AspectList().add(Aspect.ENERGY, 48).add(Aspect.TREE, 48).add(Aspect.TOOL, 32).add(Aspect.WATER, 32); - public static AspectList rockbreakerDrillCrafting = new AspectList().add(Aspect.TOOL, 32).add(Aspect.ENERGY, 48).add(Aspect.MINE, 32); - public static AspectList shieldBlockCrafting = new AspectList().add(Aspect.ORDER, 1).add(Aspect.ENTROPY, 1); - public static AspectList tinyUraniumCrafting = new AspectList().add(Aspect.FIRE, 1).add(Aspect.WATER, 1).add(Aspect.AIR, 1).add(Aspect.EARTH, 1).add(Aspect.ORDER, 1).add(Aspect.ENTROPY, 1); - public static AspectList thorHammerCrafting = new AspectList().add(Aspect.WEAPON, 48).add(Aspect.WEATHER, 48).add(Aspect.ELDRITCH, 32); - public static AspectList superchargedThorHammerCrafting = new AspectList().add(Aspect.WEAPON, 48).add(Aspect.ENERGY, 64).add(Aspect.BEAST, 32); - public static AspectList wandCharger = new AspectList().add(Aspect.ENERGY, 48).add(Aspect.CRAFT, 48).add(Aspect.EXCHANGE, 48).add(Aspect.GREED, 64); - public static AspectList compressedSolars = new AspectList().add(Aspect.FIRE, 8).add(Aspect.WATER, 8).add(Aspect.AIR, 8).add(Aspect.EARTH, 8).add(Aspect.ORDER, 8).add(Aspect.ENTROPY, 8); - public static AspectList solarHelmetRevealing = new AspectList().add(Aspect.ENERGY, 32).add(Aspect.AIR, 32).add(Aspect.LIGHT, 25); - public static AspectList electricBootsTravel = new AspectList().add(Aspect.ENERGY, 16).add(Aspect.ARMOR, 32).add(Aspect.MOTION, 32); - public static AspectList nanoBootsTravel = new AspectList().add(Aspect.ENERGY, 25).add(Aspect.ARMOR, 32).add(Aspect.MOTION, 48); - public static AspectList quantumBootsTravel = new AspectList().add(Aspect.ENERGY, 32).add(Aspect.ARMOR, 32).add(Aspect.MOTION, 64); - public static AspectList electricScribingTools = new AspectList().add(Aspect.AIR, 16).add(Aspect.ORDER, 16).add(Aspect.ENTROPY, 16); - public static AspectList etherealProcessor = new AspectList().add(Aspect.MECHANISM, 16).add(Aspect.MAGIC, 16).add(Aspect.CRAFT, 16); - public static AspectList waterSolars = new AspectList().add(Aspect.WATER, 16).add(Aspect.MAGIC, 16).add(Aspect.EXCHANGE, 16); - public static AspectList darkSolars = new AspectList().add(Aspect.ENTROPY, 16).add(Aspect.MAGIC, 16).add(Aspect.EXCHANGE, 16); - public static AspectList orderSolars = new AspectList().add(Aspect.ORDER, 16).add(Aspect.MAGIC, 16).add(Aspect.EXCHANGE, 16); - public static AspectList fireSolars = new AspectList().add(Aspect.FIRE, 16).add(Aspect.MAGIC, 16).add(Aspect.EXCHANGE, 16); - public static AspectList airSolars = new AspectList().add(Aspect.AIR, 16).add(Aspect.MAGIC, 16).add(Aspect.EXCHANGE, 16); - public static AspectList earthSolars = new AspectList().add(Aspect.EARTH, 16).add(Aspect.MAGIC, 16).add(Aspect.EXCHANGE, 16); - public static AspectList uuMatterInfusions = new AspectList().add(Aspect.FIRE, 32).add(Aspect.WATER, 32).add(Aspect.AIR, 32).add(Aspect.EARTH, 32).add(Aspect.ORDER, 32).add(Aspect.ENTROPY, 32); - public static AspectList lesserUUMInfusions = new AspectList().add(Aspect.FIRE, 16).add(Aspect.WATER, 16).add(Aspect.AIR, 16).add(Aspect.EARTH, 16).add(Aspect.ORDER, 16).add(Aspect.ENTROPY, 16); - public static AspectList cheapUUMInfusions = new AspectList().add(Aspect.FIRE, 8).add(Aspect.WATER, 8).add(Aspect.AIR, 8).add(Aspect.EARTH, 8).add(Aspect.ORDER, 8).add(Aspect.ENTROPY, 8); - public static AspectList cheapestUUMInfusions = new AspectList().add(Aspect.FIRE, 4).add(Aspect.WATER, 4).add(Aspect.AIR, 4).add(Aspect.EARTH, 4).add(Aspect.ORDER, 4).add(Aspect.ENTROPY, 4); - public static AspectList portableNode = new AspectList().add(Aspect.MAGIC, 32).add(Aspect.AURA, 32).add(Aspect.GREED, 32); - public static AspectList electricHoeGrowth = new AspectList().add(Aspect.ENERGY, 32).add(Aspect.PLANT, 25).add(Aspect.CROP, 32).add(Aspect.MAGIC, 48); - public static AspectList chargeFocus = new AspectList().add(Aspect.EXCHANGE, 25).add(Aspect.ENERGY, 32).add(Aspect.MECHANISM, 32); - public static AspectList wandChargeFocus = new AspectList().add(Aspect.ENERGY, 48).add(Aspect.AURA, 32).add(Aspect.EXCHANGE, 48).add(Aspect.GREED, 64); - public static AspectList inventoryChargingRing = new AspectList().add(Aspect.ENERGY, 64).add(Aspect.CRYSTAL, 32).add(Aspect.MAGIC, 48); - public static AspectList armorChargingRing = new AspectList().add(Aspect.ENERGY, 64).add(Aspect.ARMOR, 32).add(Aspect.MAGIC, 48); - + public static AspectList thaumiumDrillCrafting = new AspectList().add(Aspect.TOOL, 16).add(Aspect.MINE, 16).add(Aspect.ENERGY, 16); + public static AspectList thaumiumChainsawCrafting = new AspectList().add(Aspect.TOOL, 16).add(Aspect.WEAPON, 16).add(Aspect.ENERGY, 16); + public static AspectList thaumicQuantumHelmetCrafting = new AspectList().add(Aspect.ARMOR, 25).add(Aspect.SENSES, 25).add(Aspect.ENERGY, 25); + public static AspectList diamondOmnitoolCrafting = new AspectList().add(Aspect.ORDER, 15).add(Aspect.AIR, 15); + public static AspectList thaumiumOmnitoolCrafting = new AspectList().add(Aspect.TOOL, 25).add(Aspect.MINE, 25).add(Aspect.ENERGY, 25).add(Aspect.WEAPON, 25); + public static AspectList thaumicNanoHelmetCrafting = new AspectList().add(Aspect.ARMOR, 16).add(Aspect.SENSES, 16).add(Aspect.ENERGY, 16); + public static AspectList laserFocusCrafting = new AspectList().add(Aspect.FIRE, 30).add(Aspect.MOTION, 16).add(Aspect.WEAPON, 30).add(Aspect.DEATH, 16); + public static AspectList christmasFocusCrafting = new AspectList().add(Aspect.ORDER, 20).add(Aspect.AIR, 20); + public static AspectList shieldFocusCrafting = new AspectList().add(Aspect.AIR, 16).add(Aspect.ARMOR, 20).add(Aspect.CRYSTAL, 16).add(Aspect.TRAP, 20).add(Aspect.LIFE, 16); + public static AspectList electricGogglesCrafting = new AspectList().add(Aspect.AIR, 20).add(Aspect.ORDER, 20).add(Aspect.WATER, 20); + public static AspectList potentiaGeneratorCrafting = new AspectList().add(Aspect.ENERGY, 32).add(Aspect.MAGIC, 32).add(Aspect.METAL, 32).add(Aspect.EXCHANGE, 32); + public static AspectList ignisGeneratorCrafting = new AspectList().add(Aspect.FIRE, 16).add(Aspect.EXCHANGE, 8); + public static AspectList auramGeneratorCrafting = new AspectList().add(Aspect.AURA, 16).add(Aspect.EXCHANGE, 8); + public static AspectList arborGeneratorCrafting = new AspectList().add(Aspect.TREE, 16).add(Aspect.EXCHANGE, 8); + public static AspectList streamChaisnawCrafting = new AspectList().add(Aspect.ENERGY, 48).add(Aspect.TREE, 48).add(Aspect.TOOL, 32).add(Aspect.WATER, 32); + public static AspectList rockbreakerDrillCrafting = new AspectList().add(Aspect.TOOL, 32).add(Aspect.ENERGY, 48).add(Aspect.MINE, 32); + public static AspectList shieldBlockCrafting = new AspectList().add(Aspect.ORDER, 1).add(Aspect.ENTROPY, 1); + public static AspectList tinyUraniumCrafting = new AspectList().add(Aspect.FIRE, 1).add(Aspect.WATER, 1).add(Aspect.AIR, 1).add(Aspect.EARTH, 1).add(Aspect.ORDER, 1).add(Aspect.ENTROPY, 1); + public static AspectList thorHammerCrafting = new AspectList().add(Aspect.WEAPON, 48).add(Aspect.WEATHER, 48).add(Aspect.ELDRITCH, 32); + public static AspectList superchargedThorHammerCrafting = new AspectList().add(Aspect.WEAPON, 48).add(Aspect.ENERGY, 64).add(Aspect.BEAST, 32); + public static AspectList wandCharger = new AspectList().add(Aspect.ENERGY, 48).add(Aspect.CRAFT, 48).add(Aspect.EXCHANGE, 48).add(Aspect.GREED, 64); + public static AspectList compressedSolars = new AspectList().add(Aspect.FIRE, 8).add(Aspect.WATER, 8).add(Aspect.AIR, 8).add(Aspect.EARTH, 8).add(Aspect.ORDER, 8).add(Aspect.ENTROPY, 8); + public static AspectList solarHelmetRevealing = new AspectList().add(Aspect.ENERGY, 32).add(Aspect.AIR, 32).add(Aspect.LIGHT, 25); + public static AspectList electricBootsTravel = new AspectList().add(Aspect.ENERGY, 16).add(Aspect.ARMOR, 32).add(Aspect.MOTION, 32); + public static AspectList nanoBootsTravel = new AspectList().add(Aspect.ENERGY, 25).add(Aspect.ARMOR, 32).add(Aspect.MOTION, 48); + public static AspectList quantumBootsTravel = new AspectList().add(Aspect.ENERGY, 32).add(Aspect.ARMOR, 32).add(Aspect.MOTION, 64); + public static AspectList electricScribingTools = new AspectList().add(Aspect.AIR, 16).add(Aspect.ORDER, 16).add(Aspect.ENTROPY, 16); + public static AspectList etherealProcessor = new AspectList().add(Aspect.MECHANISM, 16).add(Aspect.MAGIC, 16).add(Aspect.CRAFT, 16); + public static AspectList waterSolars = new AspectList().add(Aspect.WATER, 16).add(Aspect.MAGIC, 16).add(Aspect.EXCHANGE, 16); + public static AspectList darkSolars = new AspectList().add(Aspect.ENTROPY, 16).add(Aspect.MAGIC, 16).add(Aspect.EXCHANGE, 16); + public static AspectList orderSolars = new AspectList().add(Aspect.ORDER, 16).add(Aspect.MAGIC, 16).add(Aspect.EXCHANGE, 16); + public static AspectList fireSolars = new AspectList().add(Aspect.FIRE, 16).add(Aspect.MAGIC, 16).add(Aspect.EXCHANGE, 16); + public static AspectList airSolars = new AspectList().add(Aspect.AIR, 16).add(Aspect.MAGIC, 16).add(Aspect.EXCHANGE, 16); + public static AspectList earthSolars = new AspectList().add(Aspect.EARTH, 16).add(Aspect.MAGIC, 16).add(Aspect.EXCHANGE, 16); + public static AspectList uuMatterInfusions = new AspectList().add(Aspect.FIRE, 32).add(Aspect.WATER, 32).add(Aspect.AIR, 32).add(Aspect.EARTH, 32).add(Aspect.ORDER, 32).add(Aspect.ENTROPY, 32); + public static AspectList lesserUUMInfusions = new AspectList().add(Aspect.FIRE, 16).add(Aspect.WATER, 16).add(Aspect.AIR, 16).add(Aspect.EARTH, 16).add(Aspect.ORDER, 16).add(Aspect.ENTROPY, 16); + public static AspectList cheapUUMInfusions = new AspectList().add(Aspect.FIRE, 8).add(Aspect.WATER, 8).add(Aspect.AIR, 8).add(Aspect.EARTH, 8).add(Aspect.ORDER, 8).add(Aspect.ENTROPY, 8); + public static AspectList cheapestUUMInfusions = new AspectList().add(Aspect.FIRE, 4).add(Aspect.WATER, 4).add(Aspect.AIR, 4).add(Aspect.EARTH, 4).add(Aspect.ORDER, 4).add(Aspect.ENTROPY, 4); + public static AspectList portableNode = new AspectList().add(Aspect.MAGIC, 32).add(Aspect.AURA, 32).add(Aspect.GREED, 32); + public static AspectList electricHoeGrowth = new AspectList().add(Aspect.ENERGY, 32).add(Aspect.PLANT, 25).add(Aspect.CROP, 32).add(Aspect.MAGIC, 48); + public static AspectList chargeFocus = new AspectList().add(Aspect.EXCHANGE, 25).add(Aspect.ENERGY, 32).add(Aspect.MECHANISM, 32); + public static AspectList wandChargeFocus = new AspectList().add(Aspect.ENERGY, 48).add(Aspect.AURA, 32).add(Aspect.EXCHANGE, 48).add(Aspect.GREED, 64); + public static AspectList inventoryChargingRing = new AspectList().add(Aspect.ENERGY, 64).add(Aspect.CRYSTAL, 32).add(Aspect.MAGIC, 48); + public static AspectList armorChargingRing = new AspectList().add(Aspect.ENERGY, 64).add(Aspect.ARMOR, 32).add(Aspect.MAGIC, 48); + public static AspectList thaumiumWing = new AspectList().add(Aspect.FIRE, 48).add(Aspect.WATER, 48).add(Aspect.AIR, 48).add(Aspect.EARTH, 48).add(Aspect.ORDER, 48).add(Aspect.ENTROPY, 48); + public static AspectList nanoWing = new AspectList().add(Aspect.FLIGHT, 48).add(Aspect.AIR, 32).add(Aspect.MECHANISM, 48).add(Aspect.ENERGY, 32); + public static AspectList quantumWing = new AspectList().add(Aspect.FLIGHT, 48).add(Aspect.AIR, 32).add(Aspect.MECHANISM, 48).add(Aspect.ENERGY, 32).add(Aspect.ARMOR, 48); + } diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/lib/ResearchAspects.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/lib/ResearchAspects.java index f85dcd4..6ea8056 100644 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/lib/ResearchAspects.java +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/lib/ResearchAspects.java @@ -1,10 +1,10 @@ /******************************************************************************* * Copyright (c) 2014 Tombenpotter. * All rights reserved. - * + * * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * + * * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. * http://www.minecraftforum.net/topic/1585216- @@ -16,46 +16,49 @@ import thaumcraft.api.aspects.AspectList; public class ResearchAspects { - public static AspectList thaumiumDrillResearch = new AspectList().add(Aspect.ENERGY, 5).add(Aspect.TOOL, 6).add(Aspect.MINE, 4); - public static AspectList thaumiumChainsawResearch = new AspectList().add(Aspect.ENERGY, 5).add(Aspect.WEAPON, 6).add(Aspect.TOOL, 4); - public static AspectList thaumicQuantumHelmet = new AspectList().add(Aspect.ARMOR, 8).add(Aspect.ENERGY, 4).add(Aspect.SENSES, 6); - public static AspectList diamondOmnitoolResearch = new AspectList().add(Aspect.ENERGY, 2).add(Aspect.TOOL, 3).add(Aspect.MINE, 2).add(Aspect.WEAPON, 2); - public static AspectList thaumiumOmnitoolResearch = new AspectList().add(Aspect.ENERGY, 5).add(Aspect.TOOL, 6).add(Aspect.MINE, 4).add(Aspect.WEAPON, 6); - public static AspectList thaumicNanoHelmet = new AspectList().add(Aspect.ENERGY, 5).add(Aspect.SENSES, 8).add(Aspect.ARMOR, 6); - public static AspectList laserFocusResearch = new AspectList().add(Aspect.FIRE, 3).add(Aspect.DEATH, 2).add(Aspect.WEAPON, 3); - public static AspectList christmasFocusResearch = new AspectList().add(Aspect.COLD, 2).add(Aspect.BEAST, 5).add(Aspect.LIFE, 6); - public static AspectList shieldFocusResearch = new AspectList().add(Aspect.ARMOR, 5).add(Aspect.AIR, 2).add(Aspect.CRYSTAL, 3).add(Aspect.TRAP, 2); - public static AspectList electricGogglesResearch = new AspectList().add(Aspect.ARMOR, 8).add(Aspect.ENERGY, 5).add(Aspect.SENSES, 6); - public static AspectList potentiaGeneratorResearch = new AspectList().add(Aspect.ENERGY, 4).add(Aspect.EXCHANGE, 4).add(Aspect.METAL, 3); - public static AspectList ignisGeneratorResearch = new AspectList().add(Aspect.EXCHANGE, 4).add(Aspect.FIRE, 3); - public static AspectList auramGeneratorResearch = new AspectList().add(Aspect.EXCHANGE, 4).add(Aspect.AURA, 3); - public static AspectList arborGeneratorResearch = new AspectList().add(Aspect.EXCHANGE, 4).add(Aspect.TREE, 3); - public static AspectList streamChainsawResearch = new AspectList().add(Aspect.TOOL, 3).add(Aspect.TREE, 3).add(Aspect.WATER, 6).add(Aspect.ENERGY, 4); - public static AspectList rockbreakerDrillResearch = new AspectList().add(Aspect.ENERGY, 3).add(Aspect.FIRE, 2).add(Aspect.MINE, 3); - public static AspectList shieldBlockResearch = new AspectList().add(Aspect.ARMOR, 3).add(Aspect.TRAP, 2); - public static AspectList tinyUraniumResearch = new AspectList().add(Aspect.POISON, 4).add(Aspect.DEATH, 3).add(Aspect.EXCHANGE, 3); - public static AspectList thorHammerResearch = new AspectList().add(Aspect.WEAPON, 3).add(Aspect.WEATHER, 4).add(Aspect.ELDRITCH, 3); - public static AspectList superchargedThorHammerResearch = new AspectList().add(Aspect.WEAPON, 4).add(Aspect.ENERGY, 6).add(Aspect.BEAST, 4); - public static AspectList wandCharger = new AspectList().add(Aspect.ENERGY, 4).add(Aspect.CRAFT, 2).add(Aspect.EXCHANGE, 3).add(Aspect.GREED, 5); - public static AspectList compressedSolars = new AspectList().add(Aspect.ENERGY, 4).add(Aspect.LIGHT, 3).add(Aspect.METAL, 2); - public static AspectList solarHelmetRevealing = new AspectList().add(Aspect.ENERGY, 5).add(Aspect.AIR, 2).add(Aspect.LIGHT, 4); - public static AspectList electricBootsTravel = new AspectList().add(Aspect.ENERGY, 2).add(Aspect.ARMOR, 5).add(Aspect.MOTION, 2); - public static AspectList nanoBootsTravel = new AspectList().add(Aspect.ENERGY, 3).add(Aspect.ARMOR, 5).add(Aspect.MOTION, 3); - public static AspectList quantumBootsTravel = new AspectList().add(Aspect.ENERGY, 4).add(Aspect.ARMOR, 5).add(Aspect.MOTION, 4); - public static AspectList electricScribingTools = new AspectList().add(Aspect.ENERGY, 5).add(Aspect.DARKNESS, 3).add(Aspect.CRAFT, 1); - public static AspectList etherealProcessor = new AspectList().add(Aspect.MECHANISM, 3).add(Aspect.MAGIC, 4).add(Aspect.CRAFT, 5); - public static AspectList waterSolars = new AspectList().add(Aspect.WATER, 4).add(Aspect.MAGIC, 3).add(Aspect.ENERGY, 4); - public static AspectList darkSolars = new AspectList().add(Aspect.ENTROPY, 4).add(Aspect.MAGIC, 3).add(Aspect.ENERGY, 4); - public static AspectList orderSolars = new AspectList().add(Aspect.ORDER, 4).add(Aspect.MAGIC, 3).add(Aspect.ENERGY, 4); - public static AspectList fireSolars = new AspectList().add(Aspect.FIRE, 4).add(Aspect.MAGIC, 3).add(Aspect.ENERGY, 4); - public static AspectList airSolars = new AspectList().add(Aspect.AIR, 4).add(Aspect.MAGIC, 3).add(Aspect.ENERGY, 4); - public static AspectList earthSolars = new AspectList().add(Aspect.EARTH, 4).add(Aspect.MAGIC, 3).add(Aspect.ENERGY, 4); - public static AspectList uuMInfusion = new AspectList().add(Aspect.ELDRITCH, 4).add(Aspect.MAGIC, 4).add(Aspect.CRAFT, 5); - public static AspectList portableNode = new AspectList().add(Aspect.MAGIC, 5).add(Aspect.AURA, 5).add(Aspect.GREED, 5); - public static AspectList electricHoeGrowth = new AspectList().add(Aspect.ENERGY, 4).add(Aspect.PLANT, 4).add(Aspect.CROP, 5).add(Aspect.MAGIC, 4); - public static AspectList chargeFocus = new AspectList().add(Aspect.EXCHANGE, 4).add(Aspect.ENERGY, 5).add(Aspect.MECHANISM, 4); - public static AspectList wandChargeFocus = new AspectList().add(Aspect.ENERGY, 5).add(Aspect.AURA, 4).add(Aspect.EXCHANGE, 4).add(Aspect.GREED, 5); - public static AspectList inventoryChargingRing = new AspectList().add(Aspect.ENERGY, 4).add(Aspect.CRYSTAL, 4).add(Aspect.MAGIC, 4); - public static AspectList armorChargingRing = new AspectList().add(Aspect.ENERGY, 4).add(Aspect.ARMOR, 4).add(Aspect.MAGIC, 4); - + public static AspectList thaumiumDrillResearch = new AspectList().add(Aspect.ENERGY, 5).add(Aspect.TOOL, 6).add(Aspect.MINE, 4); + public static AspectList thaumiumChainsawResearch = new AspectList().add(Aspect.ENERGY, 5).add(Aspect.WEAPON, 6).add(Aspect.TOOL, 4); + public static AspectList thaumicQuantumHelmet = new AspectList().add(Aspect.ARMOR, 8).add(Aspect.ENERGY, 4).add(Aspect.SENSES, 6); + public static AspectList diamondOmnitoolResearch = new AspectList().add(Aspect.ENERGY, 2).add(Aspect.TOOL, 3).add(Aspect.MINE, 2).add(Aspect.WEAPON, 2); + public static AspectList thaumiumOmnitoolResearch = new AspectList().add(Aspect.ENERGY, 5).add(Aspect.TOOL, 6).add(Aspect.MINE, 4).add(Aspect.WEAPON, 6); + public static AspectList thaumicNanoHelmet = new AspectList().add(Aspect.ENERGY, 5).add(Aspect.SENSES, 8).add(Aspect.ARMOR, 6); + public static AspectList laserFocusResearch = new AspectList().add(Aspect.FIRE, 3).add(Aspect.DEATH, 2).add(Aspect.WEAPON, 3); + public static AspectList christmasFocusResearch = new AspectList().add(Aspect.COLD, 2).add(Aspect.BEAST, 5).add(Aspect.LIFE, 6); + public static AspectList shieldFocusResearch = new AspectList().add(Aspect.ARMOR, 5).add(Aspect.AIR, 2).add(Aspect.CRYSTAL, 3).add(Aspect.TRAP, 2); + public static AspectList electricGogglesResearch = new AspectList().add(Aspect.ARMOR, 8).add(Aspect.ENERGY, 5).add(Aspect.SENSES, 6); + public static AspectList potentiaGeneratorResearch = new AspectList().add(Aspect.ENERGY, 4).add(Aspect.EXCHANGE, 4).add(Aspect.METAL, 3); + public static AspectList ignisGeneratorResearch = new AspectList().add(Aspect.EXCHANGE, 4).add(Aspect.FIRE, 3); + public static AspectList auramGeneratorResearch = new AspectList().add(Aspect.EXCHANGE, 4).add(Aspect.AURA, 3); + public static AspectList arborGeneratorResearch = new AspectList().add(Aspect.EXCHANGE, 4).add(Aspect.TREE, 3); + public static AspectList streamChainsawResearch = new AspectList().add(Aspect.TOOL, 3).add(Aspect.TREE, 3).add(Aspect.WATER, 6).add(Aspect.ENERGY, 4); + public static AspectList rockbreakerDrillResearch = new AspectList().add(Aspect.ENERGY, 3).add(Aspect.FIRE, 2).add(Aspect.MINE, 3); + public static AspectList shieldBlockResearch = new AspectList().add(Aspect.ARMOR, 3).add(Aspect.TRAP, 2); + public static AspectList tinyUraniumResearch = new AspectList().add(Aspect.POISON, 4).add(Aspect.DEATH, 3).add(Aspect.EXCHANGE, 3); + public static AspectList thorHammerResearch = new AspectList().add(Aspect.WEAPON, 3).add(Aspect.WEATHER, 4).add(Aspect.ELDRITCH, 3); + public static AspectList superchargedThorHammerResearch = new AspectList().add(Aspect.WEAPON, 4).add(Aspect.ENERGY, 6).add(Aspect.BEAST, 4); + public static AspectList wandCharger = new AspectList().add(Aspect.ENERGY, 4).add(Aspect.CRAFT, 2).add(Aspect.EXCHANGE, 3).add(Aspect.GREED, 5); + public static AspectList compressedSolars = new AspectList().add(Aspect.ENERGY, 4).add(Aspect.LIGHT, 3).add(Aspect.METAL, 2); + public static AspectList solarHelmetRevealing = new AspectList().add(Aspect.ENERGY, 5).add(Aspect.AIR, 2).add(Aspect.LIGHT, 4); + public static AspectList electricBootsTravel = new AspectList().add(Aspect.ENERGY, 2).add(Aspect.ARMOR, 5).add(Aspect.MOTION, 2); + public static AspectList nanoBootsTravel = new AspectList().add(Aspect.ENERGY, 3).add(Aspect.ARMOR, 5).add(Aspect.MOTION, 3); + public static AspectList quantumBootsTravel = new AspectList().add(Aspect.ENERGY, 4).add(Aspect.ARMOR, 5).add(Aspect.MOTION, 4); + public static AspectList electricScribingTools = new AspectList().add(Aspect.ENERGY, 5).add(Aspect.DARKNESS, 3).add(Aspect.CRAFT, 1); + public static AspectList etherealProcessor = new AspectList().add(Aspect.MECHANISM, 3).add(Aspect.MAGIC, 4).add(Aspect.CRAFT, 5); + public static AspectList waterSolars = new AspectList().add(Aspect.WATER, 4).add(Aspect.MAGIC, 3).add(Aspect.ENERGY, 4); + public static AspectList darkSolars = new AspectList().add(Aspect.ENTROPY, 4).add(Aspect.MAGIC, 3).add(Aspect.ENERGY, 4); + public static AspectList orderSolars = new AspectList().add(Aspect.ORDER, 4).add(Aspect.MAGIC, 3).add(Aspect.ENERGY, 4); + public static AspectList fireSolars = new AspectList().add(Aspect.FIRE, 4).add(Aspect.MAGIC, 3).add(Aspect.ENERGY, 4); + public static AspectList airSolars = new AspectList().add(Aspect.AIR, 4).add(Aspect.MAGIC, 3).add(Aspect.ENERGY, 4); + public static AspectList earthSolars = new AspectList().add(Aspect.EARTH, 4).add(Aspect.MAGIC, 3).add(Aspect.ENERGY, 4); + public static AspectList uuMInfusion = new AspectList().add(Aspect.ELDRITCH, 4).add(Aspect.MAGIC, 4).add(Aspect.CRAFT, 5); + public static AspectList portableNode = new AspectList().add(Aspect.MAGIC, 5).add(Aspect.AURA, 5).add(Aspect.GREED, 5); + public static AspectList electricHoeGrowth = new AspectList().add(Aspect.ENERGY, 4).add(Aspect.PLANT, 4).add(Aspect.CROP, 5).add(Aspect.MAGIC, 4); + public static AspectList chargeFocus = new AspectList().add(Aspect.EXCHANGE, 4).add(Aspect.ENERGY, 5).add(Aspect.MECHANISM, 4); + public static AspectList wandChargeFocus = new AspectList().add(Aspect.ENERGY, 5).add(Aspect.AURA, 4).add(Aspect.EXCHANGE, 4).add(Aspect.GREED, 5); + public static AspectList inventoryChargingRing = new AspectList().add(Aspect.ENERGY, 4).add(Aspect.CRYSTAL, 4).add(Aspect.MAGIC, 4); + public static AspectList armorChargingRing = new AspectList().add(Aspect.ENERGY, 4).add(Aspect.ARMOR, 4).add(Aspect.MAGIC, 4); + public static AspectList thaumiumWing = new AspectList().add(Aspect.FLIGHT, 5).add(Aspect.AIR, 5).add(Aspect.MECHANISM, 8); + public static AspectList nanoWing = new AspectList().add(Aspect.FLIGHT, 5).add(Aspect.AIR, 5).add(Aspect.MECHANISM, 8).add(Aspect.ENERGY, 4); + public static AspectList quantumWing = new AspectList().add(Aspect.FLIGHT, 5).add(Aspect.AIR, 5).add(Aspect.MECHANISM, 8).add(Aspect.ENERGY, 4); + } diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/lib/TextHelper.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/lib/TextHelper.java new file mode 100644 index 0000000..dafb750 --- /dev/null +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/lib/TextHelper.java @@ -0,0 +1,40 @@ +package electricMagicTools.tombenpotter.electricmagictools.common.lib; + +public class TextHelper { + + /** + * Color Coding * + */ + public static String black = "�0"; + public static String darkBlue = "�1"; + public static String darkGreen = "�2"; + public static String darkAqua = "�3"; + public static String darkRed = "�4"; + public static String darkPurple = "�5"; + public static String gold = "�6"; + public static String gray = "�7"; + public static String darkGray = "�8"; + public static String blue = "�9"; + public static String green = "�a"; + public static String aqua = "�b"; + public static String red = "�c"; + public static String lightPurple = "�d"; + public static String yellow = "�e"; + public static String white = "�f"; + + /** + * Text Formating * + */ + public static String obfuscated = "�k"; + public static String bold = "�l"; + public static String strikethrough = "�m"; + public static String underline = "�n"; + public static String italics = "�o"; + public static String resetFormatting = "�r"; + + /** + * Useful Tooltips * + */ + public static String shiftForMoreInfo = darkGreen + italics + "Press Shift for more information"; + +} diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/recipes/EMTInitRecipes.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/recipes/EMTInitRecipes.java index a6104f3..99845b3 100644 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/recipes/EMTInitRecipes.java +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/recipes/EMTInitRecipes.java @@ -1,16 +1,20 @@ /******************************************************************************* * Copyright (c) 2014 Tombenpotter. * All rights reserved. - * + * * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * + * * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ package electricMagicTools.tombenpotter.electricmagictools.common.recipes; +import cpw.mods.fml.common.FMLLog; +import cpw.mods.fml.common.Loader; +import cpw.mods.fml.common.registry.GameRegistry; +import electricMagicTools.tombenpotter.electricmagictools.common.ItemRegistry; import ic2.api.item.IC2Items; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -18,39 +22,54 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraftforge.oredict.OreDictionary; import thaumcraft.common.config.ConfigItems; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.registry.GameRegistry; -import electricMagicTools.tombenpotter.electricmagictools.common.ItemRegistry; public class EMTInitRecipes { - public static void add() { + public static void add() { - /** Crafting Recipes **/ - ironOmnitool = GameRegistry.addShapedRecipe(new ItemStack(ItemRegistry.ironOmnitool), "X", "Z", "Y", 'X', new ItemStack(IC2Items.getItem("chainsaw").getItem(), 1, OreDictionary.WILDCARD_VALUE), 'Y', new ItemStack(IC2Items.getItem("miningDrill").getItem(), 1, OreDictionary.WILDCARD_VALUE), 'Z', IC2Items.getItem("plateiron")); + /** Crafting Recipes **/ + ironOmnitool = GameRegistry.addShapedRecipe(new ItemStack(ItemRegistry.ironOmnitool), "X", "Z", "Y", 'X', new ItemStack(IC2Items.getItem("chainsaw").getItem(), 1, OreDictionary.WILDCARD_VALUE), 'Y', new ItemStack(IC2Items.getItem("miningDrill").getItem(), 1, OreDictionary.WILDCARD_VALUE), 'Z', IC2Items.getItem("plateiron")); + diamondChainsaw = GameRegistry.addShapedRecipe(new ItemStack(ItemRegistry.diamondChainsaw), " X ", "XYX", 'X', new ItemStack(Items.diamond), 'Y', new ItemStack(IC2Items.getItem("chainsaw").getItem(), 1, OreDictionary.WILDCARD_VALUE)); + ductTape = GameRegistry.addShapedRecipe(new ItemStack(ItemRegistry.itemEMTItems, 1, 9), "XXX", "YYY", "XXX", 'X', new ItemStack(ItemRegistry.itemEMTItems, 1, 8), 'Y', new ItemStack(Items.paper)); + featherMesh = GameRegistry.addShapedRecipe(new ItemStack(ItemRegistry.itemEMTItems, 1, 7), "XYX", "YXY", "XYX", 'X', new ItemStack(Items.feather), 'Y', new ItemStack(ItemRegistry.itemEMTItems, 1, 9)); + featherWing = GameRegistry.addShapedRecipe(new ItemStack(ItemRegistry.itemEMTItems, 1, 12), "XYZ", "XYZ", "XYZ", 'X', new ItemStack(ItemRegistry.itemEMTItems, 1, 7), 'Y', new ItemStack(ItemRegistry.itemEMTItems, 1, 8), 'Z', new ItemStack(ItemRegistry.itemEMTItems, 1, 11)); + featherWings = GameRegistry.addShapedRecipe(new ItemStack(ItemRegistry.featherWing), "XX", 'X', new ItemStack(ItemRegistry.itemEMTItems, 1, 12)); + taintedFeathers = GameRegistry.addShapedRecipe(new ItemStack(ItemRegistry.itemEMTItems, 1, 14), " X ", "XYX", " X ", 'X', new ItemStack(ConfigItems.itemResource, 1, 12), 'Y', new ItemStack(Items.feather)); - diamondChainsaw = GameRegistry.addShapedRecipe(new ItemStack(ItemRegistry.diamondChainsaw), " X ", "XYX", 'X', new ItemStack(Items.diamond), 'Y', new ItemStack(IC2Items.getItem("chainsaw").getItem(), 1, OreDictionary.WILDCARD_VALUE)); + if (Loader.isModLoaded("gregtech_addon") == false) { + GameRegistry.addShapedRecipe(IC2Items.getItem("diamondDrill"), " Y ", "YXY", 'Y', new ItemStack(Items.diamond), 'X', new ItemStack(IC2Items.getItem("miningDrill").getItem(), 1, OreDictionary.WILDCARD_VALUE)); + } else { + FMLLog.info("[EMT] Gregtech Addon detected. Disabling the fix for the Diamond Drill recipe."); + } - if (Loader.isModLoaded("gregtech_addon") == false) { - GameRegistry.addShapedRecipe(IC2Items.getItem("diamondDrill"), " Y ", "YXY", 'Y', new ItemStack(Items.diamond), 'X', new ItemStack(IC2Items.getItem("miningDrill").getItem(), 1, OreDictionary.WILDCARD_VALUE)); - } else { - System.out.println("[EMT] Gregtech Addon detected. Disabling the fix for the Diamond Drill recipe."); - } + GameRegistry.addRecipe(IC2Items.getItem("nanoHelmet"), "XYX", "XZX", 'X', IC2Items.getItem("carbonPlate"), 'Y', new ItemStack(IC2Items.getItem("energyCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE), 'Z', new ItemStack(IC2Items.getItem("nightvisionGoggles").getItem(), 1, OreDictionary.WILDCARD_VALUE)); + GameRegistry.addShapedRecipe(IC2Items.getItem("generator"), "X", "Y", "Z", 'X', new ItemStack(IC2Items.getItem("chargedReBattery").getItem(), 1, OreDictionary.WILDCARD_VALUE), 'Y', IC2Items.getItem("machine"), 'Z', new ItemStack(Blocks.furnace)); + GameRegistry.addShapedRecipe(IC2Items.getItem("generator"), "X", "Y", "Z", 'X', IC2Items.getItem("reBattery"), 'Y', IC2Items.getItem("machine"), 'Z', new ItemStack(Blocks.furnace)); - GameRegistry.addRecipe(IC2Items.getItem("nanoHelmet"), "XYX", "XZX", 'X', IC2Items.getItem("carbonPlate"), 'Y', new ItemStack(IC2Items.getItem("energyCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE), 'Z', new ItemStack(IC2Items.getItem("nightvisionGoggles").getItem(), 1, OreDictionary.WILDCARD_VALUE)); + /** OreDict Crafting Recipes **/ + for (int i = 0; i < OreDictionary.getOres("logWood").size(); i++) { + cardboard = GameRegistry.addShapedRecipe(new ItemStack(ItemRegistry.itemEMTItems, 1, 11), "XXX", "YYY", "XXX", 'X', new ItemStack(Items.paper), 'Y', OreDictionary.getOres("logWood").get(i)); + } + for (int i = 0; i < OreDictionary.getOres("itemRubber").size(); i++) { + rubberBall = GameRegistry.addShapedRecipe(new ItemStack(ItemRegistry.itemEMTItems, 1, 10), "XXX", "XXX", "XXX", 'X', OreDictionary.getOres("itemRubber").get(i)); + } - GameRegistry.addShapedRecipe(IC2Items.getItem("generator"), "X", "Y", "Z", 'X', new ItemStack(IC2Items.getItem("chargedReBattery").getItem(), 1, OreDictionary.WILDCARD_VALUE), 'Y', IC2Items.getItem("machine"), 'Z', new ItemStack(Blocks.furnace)); + /** Smelting Recipes **/ + GameRegistry.addSmelting(new ItemStack(ItemRegistry.itemEMTItems, 1, 1), new ItemStack(ConfigItems.itemResource, 1, 6), 0.0F); + GameRegistry.addSmelting(new ItemStack(ItemRegistry.itemEMTItems, 1, 2), new ItemStack(ConfigItems.itemResource, 1, 6), 0.0F); + GameRegistry.addSmelting(new ItemStack(ItemRegistry.itemEMTItems, 1, 3), new ItemStack(ConfigItems.itemResource, 1, 3), 0.0F); + GameRegistry.addSmelting(new ItemStack(ItemRegistry.itemEMTItems, 1, 4), new ItemStack(ConfigItems.itemResource, 1, 3), 0.0F); + GameRegistry.addSmelting(new ItemStack(ItemRegistry.itemEMTItems, 1, 10), new ItemStack(ItemRegistry.itemEMTItems, 2, 8), 0.0F); - GameRegistry.addShapedRecipe(IC2Items.getItem("generator"), "X", "Y", "Z", 'X', IC2Items.getItem("reBattery"), 'Y', IC2Items.getItem("machine"), 'Z', new ItemStack(Blocks.furnace)); + } - /** Smelting Recipes **/ - GameRegistry.addSmelting(new ItemStack(ItemRegistry.itemEMTItems, 1, 1), new ItemStack(ConfigItems.itemResource, 1, 6), 0.0F); - GameRegistry.addSmelting(new ItemStack(ItemRegistry.itemEMTItems, 1, 2), new ItemStack(ConfigItems.itemResource, 1, 6), 0.0F); - GameRegistry.addSmelting(new ItemStack(ItemRegistry.itemEMTItems, 1, 3), new ItemStack(ConfigItems.itemResource, 1, 3), 0.0F); - GameRegistry.addSmelting(new ItemStack(ItemRegistry.itemEMTItems, 1, 4), new ItemStack(ConfigItems.itemResource, 1, 3), 0.0F); - - } - - public static IRecipe ironOmnitool; - public static IRecipe diamondChainsaw; + public static IRecipe ironOmnitool; + public static IRecipe diamondChainsaw; + public static IRecipe ductTape; + public static IRecipe rubberBall; + public static IRecipe featherMesh; + public static IRecipe cardboard; + public static IRecipe featherWing; + public static IRecipe featherWings; + public static IRecipe taintedFeathers; } diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/recipes/EMTPostInitRecipes.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/recipes/EMTPostInitRecipes.java index c72055d..2deea78 100644 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/recipes/EMTPostInitRecipes.java +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/recipes/EMTPostInitRecipes.java @@ -1,17 +1,24 @@ /******************************************************************************* * Copyright (c) 2014 Tombenpotter. * All rights reserved. - * + * * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * + * * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ package electricMagicTools.tombenpotter.electricmagictools.common.recipes; +import cpw.mods.fml.common.FMLLog; +import cpw.mods.fml.common.registry.GameRegistry; +import electricMagicTools.tombenpotter.electricmagictools.common.BlockRegistry; +import electricMagicTools.tombenpotter.electricmagictools.common.Config; +import electricMagicTools.tombenpotter.electricmagictools.common.ItemRegistry; +import electricMagicTools.tombenpotter.electricmagictools.common.lib.CraftingAspects; import ic2.api.item.IC2Items; +import ic2.api.recipe.IRecipeInput; import ic2.api.recipe.RecipeInputItemStack; import ic2.api.recipe.Recipes; import ic2.core.Ic2Items; @@ -29,244 +36,274 @@ import thaumcraft.api.crafting.ShapedArcaneRecipe; import thaumcraft.api.crafting.ShapelessArcaneRecipe; import thaumcraft.common.config.ConfigBlocks; import thaumcraft.common.config.ConfigItems; -import cpw.mods.fml.common.registry.GameRegistry; -import electricMagicTools.tombenpotter.electricmagictools.common.BlockRegistry; -import electricMagicTools.tombenpotter.electricmagictools.common.ItemRegistry; -import electricMagicTools.tombenpotter.electricmagictools.common.lib.CraftingAspects; + +import java.util.Iterator; public class EMTPostInitRecipes { - public static void add() { + public static void add() { - /** Infusion Recipes **/ + /** Infusion Recipes **/ - thaumiumDrill = ThaumcraftApi.addInfusionCraftingRecipe("Thaumium Drill", new ItemStack(ItemRegistry.thaumiumDrill), 5, CraftingAspects.thaumiumDrillCrafting, new ItemStack(IC2Items.getItem("diamondDrill").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack[] { new ItemStack(Items.diamond), new ItemStack(Items.diamond), new ItemStack(ItemRegistry.thaumiumPlate), new ItemStack(ItemRegistry.thaumiumPlate), new ItemStack(ItemRegistry.thaumiumPlate), IC2Items.getItem("denseplateiron") }); + thaumiumDrill = ThaumcraftApi.addInfusionCraftingRecipe("Thaumium Drill", new ItemStack(ItemRegistry.thaumiumDrill), 5, CraftingAspects.thaumiumDrillCrafting, new ItemStack(IC2Items.getItem("diamondDrill").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(Items.diamond), new ItemStack(Items.diamond), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), IC2Items.getItem("denseplateiron")}); - thaumiumChainsaw = ThaumcraftApi.addInfusionCraftingRecipe("Thaumium Chainsaw", new ItemStack(ItemRegistry.thaumiumChainsaw), 5, CraftingAspects.thaumiumChainsawCrafting, new ItemStack(ItemRegistry.diamondChainsaw, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[] { new ItemStack(Items.diamond), new ItemStack(Items.diamond), new ItemStack(ItemRegistry.thaumiumPlate), new ItemStack(ItemRegistry.thaumiumPlate), new ItemStack(ItemRegistry.thaumiumPlate), IC2Items.getItem("denseplateiron") }); + thaumiumChainsaw = ThaumcraftApi.addInfusionCraftingRecipe("Thaumium Chainsaw", new ItemStack(ItemRegistry.thaumiumChainsaw), 5, CraftingAspects.thaumiumChainsawCrafting, new ItemStack(ItemRegistry.diamondChainsaw, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(Items.diamond), new ItemStack(Items.diamond), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), IC2Items.getItem("denseplateiron")}); - thaumicQuantumHelmet = ThaumcraftApi.addInfusionCraftingRecipe("Quantum Goggles of Revealing", new ItemStack(ItemRegistry.quantumThaumicHelmet), 6, CraftingAspects.thaumicQuantumHelmetCrafting, new ItemStack(ItemRegistry.nanoThaumicHelmet, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[] { new ItemStack(Items.diamond), new ItemStack(Items.milk_bucket), new ItemStack(IC2Items.getItem("quantumHelmet").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(ItemRegistry.thaumiumPlate), new ItemStack(ItemRegistry.thaumiumPlate), IC2Items.getItem("iridiumPlate"), IC2Items.getItem("advancedCircuit") }); + thaumicQuantumHelmet = ThaumcraftApi.addInfusionCraftingRecipe("Quantum Goggles of Revealing", new ItemStack(ItemRegistry.quantumThaumicHelmet), 6, CraftingAspects.thaumicQuantumHelmetCrafting, new ItemStack(ItemRegistry.nanoThaumicHelmet, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(Items.diamond), new ItemStack(Items.milk_bucket), new ItemStack(IC2Items.getItem("quantumHelmet").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), IC2Items.getItem("iridiumPlate"), IC2Items.getItem("advancedCircuit")}); - thaumicNanoHelmet = ThaumcraftApi.addInfusionCraftingRecipe("Nanosuit Goggles of Revealing", new ItemStack(ItemRegistry.nanoThaumicHelmet), 5, CraftingAspects.thaumicNanoHelmetCrafting, new ItemStack(ItemRegistry.electricGoggles, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[] { new ItemStack(Items.diamond), new ItemStack(Items.gold_ingot), new ItemStack(IC2Items.getItem("nanoHelmet").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(ItemRegistry.thaumiumPlate), new ItemStack(ItemRegistry.thaumiumPlate), IC2Items.getItem("carbonPlate"), IC2Items.getItem("electronicCircuit") }); + thaumicNanoHelmet = ThaumcraftApi.addInfusionCraftingRecipe("Nanosuit Goggles of Revealing", new ItemStack(ItemRegistry.nanoThaumicHelmet), 5, CraftingAspects.thaumicNanoHelmetCrafting, new ItemStack(ItemRegistry.electricGoggles, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(Items.diamond), new ItemStack(Items.gold_ingot), new ItemStack(IC2Items.getItem("nanoHelmet").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), IC2Items.getItem("carbonPlate"), IC2Items.getItem("electronicCircuit")}); - thaumiumOmnitool = ThaumcraftApi.addInfusionCraftingRecipe("Thaumium Omnitool", new ItemStack(ItemRegistry.thaumiumOmnitool), 6, CraftingAspects.thaumiumOmnitoolCrafting, new ItemStack(ItemRegistry.thaumiumChainsaw, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[] { new ItemStack(ItemRegistry.thaumiumDrill, 1, OreDictionary.WILDCARD_VALUE), new ItemStack(ItemRegistry.thaumiumPlate), new ItemStack(ItemRegistry.thaumiumPlate), new ItemStack(ItemRegistry.thaumiumPlate), IC2Items.getItem("carbonPlate"), IC2Items.getItem("plateobsidian") }); + thaumiumOmnitool = ThaumcraftApi.addInfusionCraftingRecipe("Thaumium Omnitool", new ItemStack(ItemRegistry.thaumiumOmnitool), 6, CraftingAspects.thaumiumOmnitoolCrafting, new ItemStack(ItemRegistry.thaumiumChainsaw, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(ItemRegistry.thaumiumDrill, 1, OreDictionary.WILDCARD_VALUE), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), IC2Items.getItem("carbonPlate"), IC2Items.getItem("plateobsidian")}); - diamondOmnitoolToThaumium = ThaumcraftApi.addInfusionCraftingRecipe("Thaumium Omnitool", new ItemStack(ItemRegistry.thaumiumOmnitool), 6, CraftingAspects.thaumiumOmnitoolCrafting, new ItemStack(ItemRegistry.diamondOmnitool, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[] { new ItemStack(Blocks.diamond_block), new ItemStack(ConfigBlocks.blockMetalDevice, 1, 9), new ItemStack(ConfigBlocks.blockMetalDevice, 1, 9), new ItemStack(IC2Items.getItem("energyCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE), IC2Items.getItem("carbonPlate"), IC2Items.getItem("advancedCircuit") }); + diamondOmnitoolToThaumium = ThaumcraftApi.addInfusionCraftingRecipe("Thaumium Omnitool", new ItemStack(ItemRegistry.thaumiumOmnitool), 6, CraftingAspects.thaumiumOmnitoolCrafting, new ItemStack(ItemRegistry.diamondOmnitool, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(Blocks.diamond_block), new ItemStack(ConfigBlocks.blockMetalDevice, 1, 9), new ItemStack(ConfigBlocks.blockMetalDevice, 1, 9), new ItemStack(IC2Items.getItem("energyCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE), IC2Items.getItem("carbonPlate"), IC2Items.getItem("advancedCircuit")}); - explosionFocus = ThaumcraftApi.addInfusionCraftingRecipe("Explosion Focus", new ItemStack(ItemRegistry.explosionFocus), 6, CraftingAspects.laserFocusCrafting, new ItemStack(ConfigItems.itemFocusHellbat, 1), new ItemStack[] { new ItemStack(IC2Items.getItem("miningLaser").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(Items.arrow), new ItemStack(Items.gunpowder), new ItemStack(Items.firework_charge), new ItemStack(ConfigItems.itemResource, 1, 1), new ItemStack(ConfigItems.itemWispEssence, 1) }); + explosionFocus = ThaumcraftApi.addInfusionCraftingRecipe("Explosion Focus", new ItemStack(ItemRegistry.explosionFocus), 6, CraftingAspects.laserFocusCrafting, new ItemStack(ConfigItems.itemFocusHellbat, 1), new ItemStack[]{new ItemStack(IC2Items.getItem("miningLaser").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(Items.arrow), new ItemStack(Items.gunpowder), new ItemStack(Items.firework_charge), new ItemStack(ConfigItems.itemResource, 1, 1)}); - shieldFocus = ThaumcraftApi.addInfusionCraftingRecipe("Shield Focus", new ItemStack(ItemRegistry.shieldFocus), 4, CraftingAspects.shieldFocusCrafting, new ItemStack(ConfigItems.itemFocusPortableHole, 1), new ItemStack[] { IC2Items.getItem("reinforcedStone"), IC2Items.getItem("reinforcedGlass"), IC2Items.getItem("reinforcedStone"), IC2Items.getItem("reinforcedGlass"), new ItemStack(Blocks.soul_sand), new ItemStack(Blocks.obsidian), new ItemStack(Blocks.obsidian) }); + shieldFocus = ThaumcraftApi.addInfusionCraftingRecipe("Shield Focus", new ItemStack(ItemRegistry.shieldFocus), 4, CraftingAspects.shieldFocusCrafting, new ItemStack(ConfigItems.itemFocusPortableHole, 1), new ItemStack[]{IC2Items.getItem("reinforcedStone"), IC2Items.getItem("reinforcedGlass"), IC2Items.getItem("reinforcedStone"), IC2Items.getItem("reinforcedGlass"), new ItemStack(Blocks.soul_sand), new ItemStack(Blocks.obsidian), new ItemStack(Blocks.obsidian)}); - potentiaGenerator = ThaumcraftApi.addInfusionCraftingRecipe("Potentia Generator", new ItemStack(BlockRegistry.essentiaGens, 1, 0), 6, CraftingAspects.potentiaGeneratorCrafting, IC2Items.getItem("semifluidGenerator"), new ItemStack[] { new ItemStack(Items.diamond), new ItemStack(ConfigItems.itemFocusTrade), new ItemStack(Blocks.hopper), new ItemStack(ConfigBlocks.blockJar), IC2Items.getItem("mvTransformer"), IC2Items.getItem("advancedMachine"), IC2Items.getItem("orewashingplant"), IC2Items.getItem("scrap") }); + potentiaGenerator = ThaumcraftApi.addInfusionCraftingRecipe("Potentia Generator", new ItemStack(BlockRegistry.essentiaGens, 1, 0), 6, CraftingAspects.potentiaGeneratorCrafting, IC2Items.getItem("semifluidGenerator"), new ItemStack[]{new ItemStack(Items.diamond), new ItemStack(ConfigItems.itemFocusTrade), new ItemStack(Blocks.hopper), new ItemStack(ConfigBlocks.blockJar), IC2Items.getItem("mvTransformer"), IC2Items.getItem("advancedMachine"), IC2Items.getItem("orewashingplant"), IC2Items.getItem("scrap")}); - streamChainsaw = ThaumcraftApi.addInfusionCraftingRecipe("Chainsaw of the Stream", new ItemStack(ItemRegistry.streamChainsaw), 6, CraftingAspects.streamChaisnawCrafting, new ItemStack(ItemRegistry.thaumiumChainsaw, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[] { new ItemStack(Items.water_bucket), new ItemStack(ConfigItems.itemAxeElemental), new ItemStack(ConfigBlocks.blockMagicalLog), new ItemStack(IC2Items.getItem("lapotronCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE), IC2Items.getItem("compressedPlantBall"), IC2Items.getItem("iridiumPlate"), IC2Items.getItem("overclockerUpgrade") }); + streamChainsaw = ThaumcraftApi.addInfusionCraftingRecipe("Chainsaw of the Stream", new ItemStack(ItemRegistry.streamChainsaw), 6, CraftingAspects.streamChaisnawCrafting, new ItemStack(ItemRegistry.thaumiumChainsaw, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(Items.water_bucket), new ItemStack(ConfigItems.itemAxeElemental), new ItemStack(ConfigBlocks.blockMagicalLog), new ItemStack(IC2Items.getItem("lapotronCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE), IC2Items.getItem("compressedPlantBall"), IC2Items.getItem("iridiumPlate"), IC2Items.getItem("overclockerUpgrade")}); - rockbreakerDrill = ThaumcraftApi.addInfusionCraftingRecipe("Drill of the Rockbreaker", new ItemStack(ItemRegistry.rockbreakerDrill), 6, CraftingAspects.rockbreakerDrillCrafting, new ItemStack(ItemRegistry.thaumiumDrill, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[] { new ItemStack(Items.flint_and_steel), new ItemStack(Items.fire_charge), new ItemStack(ConfigItems.itemPickElemental), new ItemStack(ConfigItems.itemShovelElemental), new ItemStack(IC2Items.getItem("lapotronCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE), IC2Items.getItem("reinforcedStone"), IC2Items.getItem("iridiumPlate"), IC2Items.getItem("overclockerUpgrade") }); + rockbreakerDrill = ThaumcraftApi.addInfusionCraftingRecipe("Drill of the Rockbreaker", new ItemStack(ItemRegistry.rockbreakerDrill), 6, CraftingAspects.rockbreakerDrillCrafting, new ItemStack(ItemRegistry.thaumiumDrill, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(Items.flint_and_steel), new ItemStack(Items.fire_charge), new ItemStack(ConfigItems.itemPickElemental), new ItemStack(ConfigItems.itemShovelElemental), new ItemStack(IC2Items.getItem("lapotronCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE), IC2Items.getItem("reinforcedStone"), IC2Items.getItem("iridiumPlate"), IC2Items.getItem("overclockerUpgrade")}); - thorHammer = ThaumcraftApi.addInfusionCraftingRecipe("Mjolnir", new ItemStack(ItemRegistry.thorHammer), 7, CraftingAspects.thorHammerCrafting, new ItemStack(ItemRegistry.taintedThorHammer, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[] { new ItemStack(ItemRegistry.lightningSummoner), new ItemStack(ItemRegistry.lightningSummoner), new ItemStack(ConfigItems.itemSwordElemental), new ItemStack(ConfigItems.itemResource, 1, 1), new ItemStack(ConfigItems.itemFocusShock), IC2Items.getItem("rubber") }); + thorHammer = ThaumcraftApi.addInfusionCraftingRecipe("Mjolnir", new ItemStack(ItemRegistry.thorHammer), 7, CraftingAspects.thorHammerCrafting, new ItemStack(ItemRegistry.taintedThorHammer, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(ItemRegistry.itemEMTItems, 1, 6), new ItemStack(ItemRegistry.itemEMTItems, 1, 6), new ItemStack(ConfigItems.itemSwordElemental), new ItemStack(ConfigItems.itemResource, 1, 1), new ItemStack(ConfigItems.itemFocusShock), IC2Items.getItem("rubber")}); - superchargedThorHammer = ThaumcraftApi.addInfusionCraftingRecipe("Supercharged Mjolnir", new ItemStack(ItemRegistry.electricThorHammer), 10, CraftingAspects.superchargedThorHammerCrafting, new ItemStack(ItemRegistry.thorHammer, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[] { new ItemStack(ItemRegistry.lightningSummoner), new ItemStack(ItemRegistry.lightningSummoner), new ItemStack(Blocks.web), new ItemStack(ConfigItems.itemFocusHellbat), new ItemStack(ConfigItems.itemSwordElemental), new ItemStack(IC2Items.getItem("lapotronCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE), IC2Items.getItem("iridiumPlate"), IC2Items.getItem("iridiumPlate"), new ItemStack(IC2Items.getItem("nanoSaber").getItem(), 1, OreDictionary.WILDCARD_VALUE) }); + superchargedThorHammer = ThaumcraftApi.addInfusionCraftingRecipe("Supercharged Mjolnir", new ItemStack(ItemRegistry.electricThorHammer), 10, CraftingAspects.superchargedThorHammerCrafting, new ItemStack(ItemRegistry.thorHammer, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(ItemRegistry.itemEMTItems, 1, 6), new ItemStack(ItemRegistry.itemEMTItems, 1, 6), new ItemStack(Blocks.web), new ItemStack(ConfigItems.itemFocusHellbat), new ItemStack(ConfigItems.itemSwordElemental), new ItemStack(IC2Items.getItem("lapotronCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE), IC2Items.getItem("iridiumPlate"), IC2Items.getItem("iridiumPlate"), new ItemStack(IC2Items.getItem("nanoSaber").getItem(), 1, OreDictionary.WILDCARD_VALUE)}); - wandRecharger = ThaumcraftApi.addInfusionCraftingRecipe("Industrial Wand Charging Station", new ItemStack(BlockRegistry.emtMachines, 1, 0), 6, CraftingAspects.wandCharger, new ItemStack(ConfigBlocks.blockStoneDevice, 1, 5), new ItemStack[] { IC2Items.getItem("replicator"), IC2Items.getItem("iridiumPlate"), new ItemStack(Blocks.diamond_block), new ItemStack(ConfigItems.itemShard, 1, 5), new ItemStack(ConfigBlocks.blockJar) }); + wandRecharger = ThaumcraftApi.addInfusionCraftingRecipe("Industrial Wand Charging Station", new ItemStack(BlockRegistry.emtMachines, 1, 0), 6, CraftingAspects.wandCharger, new ItemStack(ConfigBlocks.blockStoneDevice, 1, 5), new ItemStack[]{IC2Items.getItem("replicator"), IC2Items.getItem("iridiumPlate"), new ItemStack(Blocks.diamond_block), new ItemStack(ConfigItems.itemShard, 1, 5), new ItemStack(ConfigBlocks.blockJar)}); - solarHelmetRevealing = ThaumcraftApi.addInfusionCraftingRecipe("Solar Helmet of Revealing", new ItemStack(ItemRegistry.solarHelmetRevealing), 5, CraftingAspects.solarHelmetRevealing, new ItemStack(ItemRegistry.quantumThaumicHelmet, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[] { new ItemStack(BlockRegistry.emtSolars, 1, 1), IC2Items.getItem("glassFiberCableItems"), new ItemStack(IC2Items.getItem("lapotronCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(ConfigItems.itemShard, 1, 4) }); + solarHelmetRevealing = ThaumcraftApi.addInfusionCraftingRecipe("Solar Helmet of Revealing", new ItemStack(ItemRegistry.solarHelmetRevealing), 5, CraftingAspects.solarHelmetRevealing, new ItemStack(ItemRegistry.quantumThaumicHelmet, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(BlockRegistry.emtSolars, 1, 1), IC2Items.getItem("glassFiberCableItem"), new ItemStack(IC2Items.getItem("lapotronCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(ConfigItems.itemShard, 1, 4)}); - electricBootsTravel = ThaumcraftApi.addInfusionCraftingRecipe("Electric Boots of the Traveller", new ItemStack(ItemRegistry.electricBootsTraveller), 2, CraftingAspects.electricBootsTravel, new ItemStack(ConfigItems.itemBootsTraveller), new ItemStack[] { new ItemStack(Items.diamond), IC2Items.getItem("elemotor"), IC2Items.getItem("coil"), IC2Items.getItem("hazmatBoots"), new ItemStack(IC2Items.getItem("advBattery").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(ConfigItems.itemWispEssence) }); + electricBootsTravel = ThaumcraftApi.addInfusionCraftingRecipe("Electric Boots of the Traveller", new ItemStack(ItemRegistry.electricBootsTraveller), 2, CraftingAspects.electricBootsTravel, new ItemStack(ConfigItems.itemBootsTraveller), new ItemStack[]{new ItemStack(Items.diamond), IC2Items.getItem("elemotor"), IC2Items.getItem("coil"), IC2Items.getItem("hazmatBoots"), new ItemStack(IC2Items.getItem("advBattery").getItem(), 1, OreDictionary.WILDCARD_VALUE)}); - nanoBootsTravel = ThaumcraftApi.addInfusionCraftingRecipe("Nano Boots of the Traveller", new ItemStack(ItemRegistry.nanoBootsTraveller), 2, CraftingAspects.nanoBootsTravel, new ItemStack(ItemRegistry.electricBootsTraveller, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[] { new ItemStack(Items.diamond), new ItemStack(IC2Items.getItem("nanoBoots").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(IC2Items.getItem("energyCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(ConfigItems.itemWispEssence), new ItemStack(ConfigItems.itemWispEssence) }); + nanoBootsTravel = ThaumcraftApi.addInfusionCraftingRecipe("Nano Boots of the Traveller", new ItemStack(ItemRegistry.nanoBootsTraveller), 2, CraftingAspects.nanoBootsTravel, new ItemStack(ItemRegistry.electricBootsTraveller, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(Items.diamond), new ItemStack(IC2Items.getItem("nanoBoots").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(IC2Items.getItem("energyCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE)}); - quantumBootsTravel = ThaumcraftApi.addInfusionCraftingRecipe("Quantum Boots of the Traveller", new ItemStack(ItemRegistry.quantumBootsTraveller), 2, CraftingAspects.quantumBootsTravel, new ItemStack(ItemRegistry.nanoBootsTraveller, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[] { new ItemStack(Blocks.diamond_block), new ItemStack(IC2Items.getItem("quantumBoots").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(IC2Items.getItem("lapotronCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE), IC2Items.getItem("iridiumPlate"), new ItemStack(ConfigItems.itemWispEssence), new ItemStack(ConfigItems.itemWispEssence), new ItemStack(ConfigItems.itemWispEssence) }); + quantumBootsTravel = ThaumcraftApi.addInfusionCraftingRecipe("Quantum Boots of the Traveller", new ItemStack(ItemRegistry.quantumBootsTraveller), 2, CraftingAspects.quantumBootsTravel, new ItemStack(ItemRegistry.nanoBootsTraveller, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(Blocks.diamond_block), new ItemStack(IC2Items.getItem("quantumBoots").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(IC2Items.getItem("lapotronCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE), IC2Items.getItem("iridiumPlate")}); - etheralProcessor = ThaumcraftApi.addInfusionCraftingRecipe("Etheral Processor", new ItemStack(BlockRegistry.emtMachines, 1, 1), 3, CraftingAspects.etherealProcessor, IC2Items.getItem("macerator"), new ItemStack[] { IC2Items.getItem("electroFurnace"), new ItemStack(ConfigBlocks.blockMetalDevice, 1, 9), new ItemStack(Blocks.end_stone), new ItemStack(Blocks.end_stone), new ItemStack(Blocks.iron_block), new ItemStack(Blocks.iron_block), new ItemStack(ItemRegistry.thaumiumPlate), new ItemStack(ItemRegistry.thaumiumPlate) }); + etheralProcessor = ThaumcraftApi.addInfusionCraftingRecipe("Etheral Processor", new ItemStack(BlockRegistry.emtMachines, 1, 1), 3, CraftingAspects.etherealProcessor, IC2Items.getItem("macerator"), new ItemStack[]{IC2Items.getItem("electroFurnace"), new ItemStack(ConfigBlocks.blockMetalDevice, 1, 9), new ItemStack(Blocks.end_stone), new ItemStack(Blocks.end_stone), new ItemStack(Blocks.iron_block), new ItemStack(Blocks.iron_block), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), new ItemStack(ItemRegistry.itemEMTItems, 1, 5)}); - tripleCompressedSolar = ThaumcraftApi.addInfusionCraftingRecipe("Compressed Solars", new ItemStack(BlockRegistry.emtSolars, 1, 2), 2, CraftingAspects.compressedSolars, new ItemStack(BlockRegistry.emtSolars, 1, 1), new ItemStack[] { new ItemStack(BlockRegistry.emtSolars, 1, 1), new ItemStack(BlockRegistry.emtSolars, 1, 1), new ItemStack(BlockRegistry.emtSolars, 1, 1), new ItemStack(BlockRegistry.emtSolars, 1, 1), new ItemStack(BlockRegistry.emtSolars, 1, 1), new ItemStack(BlockRegistry.emtSolars, 1, 1), new ItemStack(BlockRegistry.emtSolars, 1, 1), new ItemStack(BlockRegistry.emtSolars, 1, 1) }); + tripleCompressedSolar = ThaumcraftApi.addInfusionCraftingRecipe("Compressed Solars", new ItemStack(BlockRegistry.emtSolars, 1, 2), 2, CraftingAspects.compressedSolars, new ItemStack(BlockRegistry.emtSolars, 1, 1), new ItemStack[]{new ItemStack(BlockRegistry.emtSolars, 1, 1), new ItemStack(BlockRegistry.emtSolars, 1, 1), new ItemStack(BlockRegistry.emtSolars, 1, 1), new ItemStack(BlockRegistry.emtSolars, 1, 1), new ItemStack(BlockRegistry.emtSolars, 1, 1), new ItemStack(BlockRegistry.emtSolars, 1, 1), new ItemStack(BlockRegistry.emtSolars, 1, 1), new ItemStack(BlockRegistry.emtSolars, 1, 1)}); - electricHoeGrowth = ThaumcraftApi.addInfusionCraftingRecipe("Electric Hoe of Growth", new ItemStack(ItemRegistry.electricHoeGrowth), 4, CraftingAspects.electricHoeGrowth, new ItemStack(ConfigItems.itemHoeElemental), new ItemStack[] { new ItemStack(IC2Items.getItem("lapotronCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(IC2Items.getItem("electricHoe").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(Items.dye, 1, 15), IC2Items.getItem("elemotor"), IC2Items.getItem("coil"), new ItemStack(Blocks.sapling, 1, OreDictionary.WILDCARD_VALUE) }); + electricHoeGrowth = ThaumcraftApi.addInfusionCraftingRecipe("Electric Hoe of Growth", new ItemStack(ItemRegistry.electricHoeGrowth), 4, CraftingAspects.electricHoeGrowth, new ItemStack(ConfigItems.itemHoeElemental), new ItemStack[]{new ItemStack(IC2Items.getItem("lapotronCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(IC2Items.getItem("electricHoe").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(Items.dye, 1, 15), IC2Items.getItem("elemotor"), IC2Items.getItem("coil"), new ItemStack(Blocks.sapling, 1, OreDictionary.WILDCARD_VALUE)}); - chargeFocus = ThaumcraftApi.addInfusionCraftingRecipe("Wand Focus: Charging", new ItemStack(ItemRegistry.chargeFocus), 4, CraftingAspects.chargeFocus, new ItemStack(IC2Items.getItem("advBattery").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack[] { IC2Items.getItem("generator"), IC2Items.getItem("batBox"), new ItemStack(ItemRegistry.thaumiumPlate), new ItemStack(ItemRegistry.thaumiumPlate), new ItemStack(ConfigItems.itemShard, 1, OreDictionary.WILDCARD_VALUE), new ItemStack(ConfigItems.itemShard, 1, OreDictionary.WILDCARD_VALUE) }); + chargeFocus = ThaumcraftApi.addInfusionCraftingRecipe("Wand Focus: Charging", new ItemStack(ItemRegistry.chargeFocus), 4, CraftingAspects.chargeFocus, new ItemStack(IC2Items.getItem("advBattery").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{IC2Items.getItem("generator"), IC2Items.getItem("batBox"), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), new ItemStack(ConfigItems.itemShard, 1, OreDictionary.WILDCARD_VALUE), new ItemStack(ConfigItems.itemShard, 1, OreDictionary.WILDCARD_VALUE)}); - wandChargeFocus = ThaumcraftApi.addInfusionCraftingRecipe("Wand Focus: Wand Charging", new ItemStack(ItemRegistry.wandChargeFocus), 5, CraftingAspects.wandChargeFocus, new ItemStack(BlockRegistry.emtMachines, 1, 0), new ItemStack[] { new ItemStack(ItemRegistry.chargeFocus), new ItemStack(IC2Items.getItem("energyPack").getItem(), 1, OreDictionary.WILDCARD_VALUE), IC2Items.getItem("iridiumPlate"), IC2Items.getItem("iridiumPlate") }); + wandChargeFocus = ThaumcraftApi.addInfusionCraftingRecipe("Wand Focus: Wand Charging", new ItemStack(ItemRegistry.wandChargeFocus), 5, CraftingAspects.wandChargeFocus, new ItemStack(BlockRegistry.emtMachines, 1, 0), new ItemStack[]{new ItemStack(ItemRegistry.chargeFocus), new ItemStack(IC2Items.getItem("energyPack").getItem(), 1, OreDictionary.WILDCARD_VALUE), IC2Items.getItem("iridiumPlate"), IC2Items.getItem("iridiumPlate")}); - inventoryChargingRing = ThaumcraftApi.addInfusionCraftingRecipe("Inventory Charging Ring", new ItemStack(ItemRegistry.emtBauble, 1, 1), 6, CraftingAspects.inventoryChargingRing, new ItemStack(ConfigItems.itemBaubleBlanks, 1, 1), new ItemStack[] { new ItemStack(ItemRegistry.thaumiumDrill, 1, OreDictionary.WILDCARD_VALUE), IC2Items.getItem("generator"), IC2Items.getItem("geothermalGenerator"), IC2Items.getItem("waterMill"), IC2Items.getItem("solarPanel"), IC2Items.getItem("windMill"), IC2Items.getItem("nuclearReactor") }); + inventoryChargingRing = ThaumcraftApi.addInfusionCraftingRecipe("Inventory Charging Ring", new ItemStack(ItemRegistry.emtBauble, 1, 1), 6, CraftingAspects.inventoryChargingRing, new ItemStack(ConfigItems.itemBaubleBlanks, 1, 1), new ItemStack[]{new ItemStack(ItemRegistry.thaumiumDrill, 1, OreDictionary.WILDCARD_VALUE), IC2Items.getItem("generator"), IC2Items.getItem("geothermalGenerator"), IC2Items.getItem("waterMill"), IC2Items.getItem("solarPanel"), IC2Items.getItem("windMill"), IC2Items.getItem("nuclearReactor")}); - armorChargingRing = ThaumcraftApi.addInfusionCraftingRecipe("Armor Charging Ring", new ItemStack(ItemRegistry.emtBauble, 1, 0), 6, CraftingAspects.armorChargingRing, new ItemStack(ConfigItems.itemBaubleBlanks, 1, 1), new ItemStack[] { new ItemStack(ItemRegistry.electricBootsTraveller, 1, OreDictionary.WILDCARD_VALUE), IC2Items.getItem("generator"), IC2Items.getItem("geothermalGenerator"), IC2Items.getItem("waterMill"), IC2Items.getItem("solarPanel"), IC2Items.getItem("windMill"), IC2Items.getItem("nuclearReactor") }); + armorChargingRing = ThaumcraftApi.addInfusionCraftingRecipe("Armor Charging Ring", new ItemStack(ItemRegistry.emtBauble, 1, 0), 6, CraftingAspects.armorChargingRing, new ItemStack(ConfigItems.itemBaubleBlanks, 1, 1), new ItemStack[]{new ItemStack(ItemRegistry.electricBootsTraveller, 1, OreDictionary.WILDCARD_VALUE), IC2Items.getItem("generator"), IC2Items.getItem("geothermalGenerator"), IC2Items.getItem("waterMill"), IC2Items.getItem("solarPanel"), IC2Items.getItem("windMill"), IC2Items.getItem("nuclearReactor")}); - /** Arcane Worktable Recipes **/ + nanoWings = ThaumcraftApi.addInfusionCraftingRecipe("Nanosuit Wings", new ItemStack(ItemRegistry.nanoWing), 4, CraftingAspects.nanoWing, new ItemStack(ItemRegistry.thaumiumWing), new ItemStack[]{IC2Items.getItem("carbonPlate"), IC2Items.getItem("carbonPlate"), IC2Items.getItem("carbonPlate"), new ItemStack(IC2Items.getItem("nanoBodyarmor").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(ConfigItems.itemResource, 1, 1)}); - diamondOmnitool = ThaumcraftApi.addShapelessArcaneCraftingRecipe("Diamond Omnitool", new ItemStack(ItemRegistry.diamondOmnitool), CraftingAspects.diamondOmnitoolCrafting, new ItemStack(ItemRegistry.diamondChainsaw, 1, OreDictionary.WILDCARD_VALUE), new ItemStack(IC2Items.getItem("diamondDrill").getItem(), 1, OreDictionary.WILDCARD_VALUE)); + quantumWings = ThaumcraftApi.addInfusionCraftingRecipe("Quantum Wings", new ItemStack(ItemRegistry.quantumWing), 6, CraftingAspects.quantumWing, new ItemStack(ItemRegistry.nanoWing, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{IC2Items.getItem("iridiumPlate"), IC2Items.getItem("iridiumPlate"), IC2Items.getItem("iridiumPlate"), new ItemStack(IC2Items.getItem("quantumBodyarmor").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(ConfigItems.itemResource, 1, 1)}); - ironOmnitoolToDiamond = ThaumcraftApi.addArcaneCraftingRecipe("Diamond Omnitool", new ItemStack(ItemRegistry.diamondOmnitool), CraftingAspects.diamondOmnitoolCrafting, "XAX", "XBX", "XAX", 'X', new ItemStack(Items.diamond), 'A', IC2Items.getItem("advancedCircuit"), 'B', new ItemStack(ItemRegistry.ironOmnitool, 1, OreDictionary.WILDCARD_VALUE)); + /** Arcane Worktable Recipes **/ - christmasFocus = ThaumcraftApi.addArcaneCraftingRecipe("Kris-tmas Focus", new ItemStack(ItemRegistry.christmasFocus), CraftingAspects.christmasFocusCrafting, "XYX", "YZY", "XYX", 'X', new ItemStack(Blocks.snow), 'Y', new ItemStack(Blocks.pumpkin), 'Z', new ItemStack(ConfigItems.itemFocusFrost)); + diamondOmnitool = ThaumcraftApi.addShapelessArcaneCraftingRecipe("Diamond Omnitool", new ItemStack(ItemRegistry.diamondOmnitool), CraftingAspects.diamondOmnitoolCrafting, new ItemStack(ItemRegistry.diamondChainsaw, 1, OreDictionary.WILDCARD_VALUE), new ItemStack(IC2Items.getItem("diamondDrill").getItem(), 1, OreDictionary.WILDCARD_VALUE)); - electricGoggles = ThaumcraftApi.addArcaneCraftingRecipe("Electric Goggles", new ItemStack(ItemRegistry.electricGoggles), CraftingAspects.electricGogglesCrafting, " Y ", "AZA", "BXB", 'Z', new ItemStack(ConfigItems.itemGoggles), 'X', IC2Items.getItem("electronicCircuit"), 'Y', new ItemStack(Items.diamond_helmet), 'A', new ItemStack(IC2Items.getItem("chargedReBattery").getItem(), 1, OreDictionary.WILDCARD_VALUE), 'B', Items.repeater); + ironOmnitoolToDiamond = ThaumcraftApi.addArcaneCraftingRecipe("Diamond Omnitool", new ItemStack(ItemRegistry.diamondOmnitool), CraftingAspects.diamondOmnitoolCrafting, "XAX", "XBX", "XAX", 'X', new ItemStack(Items.diamond), 'A', IC2Items.getItem("advancedCircuit"), 'B', new ItemStack(ItemRegistry.ironOmnitool, 1, OreDictionary.WILDCARD_VALUE)); - shieldBlock = ThaumcraftApi.addArcaneCraftingRecipe("Shield Blocks", new ItemStack(BlockRegistry.shield, 8), CraftingAspects.shieldBlockCrafting, "XYX", "X X", "XYX", 'X', new ItemStack(Blocks.glass), 'Y', new ItemStack(Blocks.obsidian)); + christmasFocus = ThaumcraftApi.addArcaneCraftingRecipe("Kris-tmas Focus", new ItemStack(ItemRegistry.christmasFocus), CraftingAspects.christmasFocusCrafting, "XYX", "YZY", "XYX", 'X', new ItemStack(Blocks.snow), 'Y', new ItemStack(Blocks.pumpkin), 'Z', new ItemStack(ConfigItems.itemFocusFrost)); - tinyUranium = ThaumcraftApi.addShapelessArcaneCraftingRecipe("Tiny Uranium", new ItemStack(IC2Items.getItem("smallUran235").getItem(), 7), CraftingAspects.tinyUraniumCrafting, IC2Items.getItem("Uran238")); + electricGoggles = ThaumcraftApi.addArcaneCraftingRecipe("Electric Goggles", new ItemStack(ItemRegistry.electricGoggles), CraftingAspects.electricGogglesCrafting, " Y ", "AZA", "BXB", 'Z', new ItemStack(ConfigItems.itemGoggles), 'X', IC2Items.getItem("electronicCircuit"), 'Y', new ItemStack(Items.diamond_helmet), 'A', new ItemStack(IC2Items.getItem("chargedReBattery").getItem(), 1, OreDictionary.WILDCARD_VALUE), 'B', Items.repeater); - compressedSolar = ThaumcraftApi.addArcaneCraftingRecipe("Compressed Solars", new ItemStack(BlockRegistry.emtSolars, 1, 0), CraftingAspects.compressedSolars, "XXX", "XXX", "XXX", 'X', IC2Items.getItem("solarPanel")); + shieldBlock = ThaumcraftApi.addArcaneCraftingRecipe("Shield Blocks", new ItemStack(BlockRegistry.shield, 8), CraftingAspects.shieldBlockCrafting, "XYX", "X X", "XYX", 'X', new ItemStack(Blocks.glass), 'Y', new ItemStack(Blocks.obsidian)); - doubleCompressedSolar = ThaumcraftApi.addArcaneCraftingRecipe("Compressed Solars", new ItemStack(BlockRegistry.emtSolars, 1, 1), CraftingAspects.compressedSolars, "XXX", "XXX", "XXX", 'X', new ItemStack(BlockRegistry.emtSolars, 1, 0)); + tinyUranium = ThaumcraftApi.addShapelessArcaneCraftingRecipe("Tiny Uranium", new ItemStack(IC2Items.getItem("smallUran235").getItem(), 7), CraftingAspects.tinyUraniumCrafting, IC2Items.getItem("Uran238")); - electricScribingTools = ThaumcraftApi.addArcaneCraftingRecipe("Electric Scribing Tools", new ItemStack(ItemRegistry.electricScribingTools), CraftingAspects.electricScribingTools, "YXY", "XZX", "YXY", 'Y', IC2Items.getItem("electronicCircuit"), 'X', new ItemStack(ConfigItems.itemInkwell), 'Z', new ItemStack(IC2Items.getItem("energyCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE)); + compressedSolar = ThaumcraftApi.addArcaneCraftingRecipe("Compressed Solars", new ItemStack(BlockRegistry.emtSolars, 1, 0), CraftingAspects.compressedSolars, "XXX", "XXX", "XXX", 'X', IC2Items.getItem("solarPanel")); - /** Crucible Recipes **/ + doubleCompressedSolar = ThaumcraftApi.addArcaneCraftingRecipe("Compressed Solars", new ItemStack(BlockRegistry.emtSolars, 1, 1), CraftingAspects.compressedSolars, "XXX", "XXX", "XXX", 'X', new ItemStack(BlockRegistry.emtSolars, 1, 0)); - ignisGenerator = ThaumcraftApi.addCrucibleRecipe("Ignis Generator", new ItemStack(BlockRegistry.essentiaGens, 1, 1), new ItemStack(BlockRegistry.essentiaGens, 1, 0), CraftingAspects.ignisGeneratorCrafting); + electricScribingTools = ThaumcraftApi.addArcaneCraftingRecipe("Electric Scribing Tools", new ItemStack(ItemRegistry.electricScribingTools), CraftingAspects.electricScribingTools, "YXY", "XZX", "YXY", 'Y', IC2Items.getItem("electronicCircuit"), 'X', new ItemStack(ConfigItems.itemInkwell), 'Z', new ItemStack(IC2Items.getItem("energyCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE)); - auramGenerator = ThaumcraftApi.addCrucibleRecipe("Auram Generator", new ItemStack(BlockRegistry.essentiaGens, 1, 2), new ItemStack(BlockRegistry.essentiaGens, 1, 0), CraftingAspects.auramGeneratorCrafting); + thaumiumWing = ThaumcraftApi.addArcaneCraftingRecipe("Thaumium Reinforced Wings", new ItemStack(ItemRegistry.itemEMTItems, 1, 15), CraftingAspects.thaumiumWing, "XYZ", "XYZ", "XYZ", 'X', new ItemStack(ItemRegistry.itemEMTItems, 1, 14), 'Y', new ItemStack(ItemRegistry.itemEMTItems, 1, 5), 'Z', new ItemStack(ItemRegistry.itemEMTItems, 1, 13)); - arborGenerator = ThaumcraftApi.addCrucibleRecipe("Arbor Generator", new ItemStack(BlockRegistry.essentiaGens, 1, 3), new ItemStack(BlockRegistry.essentiaGens, 1, 0), CraftingAspects.arborGeneratorCrafting); + thaumiumWings = ThaumcraftApi.addArcaneCraftingRecipe("Thaumium Reinforced Wings", new ItemStack(ItemRegistry.thaumiumWing), CraftingAspects.thaumiumWing, "XX", 'X', new ItemStack(ItemRegistry.itemEMTItems, 1, 15)); - waterSolar = ThaumcraftApi.addCrucibleRecipe("Water Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 3), new ItemStack(BlockRegistry.emtSolars, 1, 0), CraftingAspects.waterSolars); + /** Crucible Recipes **/ - doubleWaterSolar = ThaumcraftApi.addCrucibleRecipe("Water Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 4), new ItemStack(BlockRegistry.emtSolars, 1, 1), CraftingAspects.waterSolars); + ignisGenerator = ThaumcraftApi.addCrucibleRecipe("Ignis Generator", new ItemStack(BlockRegistry.essentiaGens, 1, 1), new ItemStack(BlockRegistry.essentiaGens, 1, 0), CraftingAspects.ignisGeneratorCrafting); - tripleWaterSolar = ThaumcraftApi.addCrucibleRecipe("Water Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 5), new ItemStack(BlockRegistry.emtSolars, 1, 2), CraftingAspects.waterSolars); + auramGenerator = ThaumcraftApi.addCrucibleRecipe("Auram Generator", new ItemStack(BlockRegistry.essentiaGens, 1, 2), new ItemStack(BlockRegistry.essentiaGens, 1, 0), CraftingAspects.auramGeneratorCrafting); - darkSolar = ThaumcraftApi.addCrucibleRecipe("Entropy Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 6), new ItemStack(BlockRegistry.emtSolars, 1, 0), CraftingAspects.darkSolars); + arborGenerator = ThaumcraftApi.addCrucibleRecipe("Arbor Generator", new ItemStack(BlockRegistry.essentiaGens, 1, 3), new ItemStack(BlockRegistry.essentiaGens, 1, 0), CraftingAspects.arborGeneratorCrafting); - doubleDarkSolar = ThaumcraftApi.addCrucibleRecipe("Entropy Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 7), new ItemStack(BlockRegistry.emtSolars, 1, 1), CraftingAspects.darkSolars); + waterSolar = ThaumcraftApi.addCrucibleRecipe("Water Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 3), new ItemStack(BlockRegistry.emtSolars, 1, 0), CraftingAspects.waterSolars); - tripleDarkSolar = ThaumcraftApi.addCrucibleRecipe("Entropy Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 8), new ItemStack(BlockRegistry.emtSolars, 1, 2), CraftingAspects.darkSolars); + doubleWaterSolar = ThaumcraftApi.addCrucibleRecipe("Water Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 4), new ItemStack(BlockRegistry.emtSolars, 1, 1), CraftingAspects.waterSolars); - orderSolar = ThaumcraftApi.addCrucibleRecipe("Order Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 9), new ItemStack(BlockRegistry.emtSolars, 1, 0), CraftingAspects.orderSolars); + tripleWaterSolar = ThaumcraftApi.addCrucibleRecipe("Water Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 5), new ItemStack(BlockRegistry.emtSolars, 1, 2), CraftingAspects.waterSolars); - doubleOrderSolar = ThaumcraftApi.addCrucibleRecipe("Order Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 10), new ItemStack(BlockRegistry.emtSolars, 1, 1), CraftingAspects.orderSolars); + darkSolar = ThaumcraftApi.addCrucibleRecipe("Entropy Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 6), new ItemStack(BlockRegistry.emtSolars, 1, 0), CraftingAspects.darkSolars); - tripleOrderSolar = ThaumcraftApi.addCrucibleRecipe("Order Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 11), new ItemStack(BlockRegistry.emtSolars, 1, 2), CraftingAspects.orderSolars); + doubleDarkSolar = ThaumcraftApi.addCrucibleRecipe("Entropy Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 7), new ItemStack(BlockRegistry.emtSolars, 1, 1), CraftingAspects.darkSolars); - fireSolar = ThaumcraftApi.addCrucibleRecipe("Fire Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 12), new ItemStack(BlockRegistry.emtSolars, 1, 0), CraftingAspects.fireSolars); + tripleDarkSolar = ThaumcraftApi.addCrucibleRecipe("Entropy Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 8), new ItemStack(BlockRegistry.emtSolars, 1, 2), CraftingAspects.darkSolars); - doubleFireSolar = ThaumcraftApi.addCrucibleRecipe("Fire Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 13), new ItemStack(BlockRegistry.emtSolars, 1, 1), CraftingAspects.fireSolars); + orderSolar = ThaumcraftApi.addCrucibleRecipe("Order Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 9), new ItemStack(BlockRegistry.emtSolars, 1, 0), CraftingAspects.orderSolars); - tripleFireSolar = ThaumcraftApi.addCrucibleRecipe("Fire Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 14), new ItemStack(BlockRegistry.emtSolars, 1, 2), CraftingAspects.fireSolars); + doubleOrderSolar = ThaumcraftApi.addCrucibleRecipe("Order Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 10), new ItemStack(BlockRegistry.emtSolars, 1, 1), CraftingAspects.orderSolars); - airSolar = ThaumcraftApi.addCrucibleRecipe("Air Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 15), new ItemStack(BlockRegistry.emtSolars, 1, 0), CraftingAspects.airSolars); + tripleOrderSolar = ThaumcraftApi.addCrucibleRecipe("Order Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 11), new ItemStack(BlockRegistry.emtSolars, 1, 2), CraftingAspects.orderSolars); - doubleAirSolar = ThaumcraftApi.addCrucibleRecipe("Air Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars2, 1, 0), new ItemStack(BlockRegistry.emtSolars, 1, 1), CraftingAspects.airSolars); + fireSolar = ThaumcraftApi.addCrucibleRecipe("Fire Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 12), new ItemStack(BlockRegistry.emtSolars, 1, 0), CraftingAspects.fireSolars); - tripleAirSolar = ThaumcraftApi.addCrucibleRecipe("Air Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars2, 1, 1), new ItemStack(BlockRegistry.emtSolars, 1, 2), CraftingAspects.airSolars); + doubleFireSolar = ThaumcraftApi.addCrucibleRecipe("Fire Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 13), new ItemStack(BlockRegistry.emtSolars, 1, 1), CraftingAspects.fireSolars); - earthSolar = ThaumcraftApi.addCrucibleRecipe("Earth Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars2, 1, 2), new ItemStack(BlockRegistry.emtSolars, 1, 0), CraftingAspects.earthSolars); + tripleFireSolar = ThaumcraftApi.addCrucibleRecipe("Fire Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 14), new ItemStack(BlockRegistry.emtSolars, 1, 2), CraftingAspects.fireSolars); - doubleEarthSolar = ThaumcraftApi.addCrucibleRecipe("Earth Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars2, 1, 3), new ItemStack(BlockRegistry.emtSolars, 1, 1), CraftingAspects.earthSolars); + airSolar = ThaumcraftApi.addCrucibleRecipe("Air Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars, 1, 15), new ItemStack(BlockRegistry.emtSolars, 1, 0), CraftingAspects.airSolars); - tripleEarthSolar = ThaumcraftApi.addCrucibleRecipe("Earth Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars2, 1, 4), new ItemStack(BlockRegistry.emtSolars, 1, 2), CraftingAspects.earthSolars); + doubleAirSolar = ThaumcraftApi.addCrucibleRecipe("Air Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars2, 1, 0), new ItemStack(BlockRegistry.emtSolars, 1, 1), CraftingAspects.airSolars); - portableNode = ThaumcraftApi.addCrucibleRecipe("Portable Node", new ItemStack(BlockRegistry.portableNode), new ItemStack(ConfigItems.itemJarFilled), CraftingAspects.portableNode); + tripleAirSolar = ThaumcraftApi.addCrucibleRecipe("Air Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars2, 1, 1), new ItemStack(BlockRegistry.emtSolars, 1, 2), CraftingAspects.airSolars); - /** IC2 Stuff related recipes **/ + earthSolar = ThaumcraftApi.addCrucibleRecipe("Earth Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars2, 1, 2), new ItemStack(BlockRegistry.emtSolars, 1, 0), CraftingAspects.earthSolars); + + doubleEarthSolar = ThaumcraftApi.addCrucibleRecipe("Earth Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars2, 1, 3), new ItemStack(BlockRegistry.emtSolars, 1, 1), CraftingAspects.earthSolars); + + tripleEarthSolar = ThaumcraftApi.addCrucibleRecipe("Earth Infused Solar Panels", new ItemStack(BlockRegistry.emtSolars2, 1, 4), new ItemStack(BlockRegistry.emtSolars, 1, 2), CraftingAspects.earthSolars); + + portableNode = ThaumcraftApi.addCrucibleRecipe("Portable Node", new ItemStack(BlockRegistry.portableNode), new ItemStack(ConfigItems.itemJarFilled), CraftingAspects.portableNode); + + /** IC2 Stuff related recipes **/ /* Ore Clusters Macerator Recipes */ - ItemStack ironClusterRecipe = IC2Items.getItem("smallIronDust").copy(); - ironClusterRecipe.stackSize = 22; - Recipes.macerator.addRecipe(new RecipeInputItemStack(new ItemStack(ConfigItems.itemNugget, 1, 16)), null, ironClusterRecipe); + ItemStack ironClusterRecipe = IC2Items.getItem("smallIronDust").copy(); + ironClusterRecipe.stackSize = 22; + Recipes.macerator.addRecipe(new RecipeInputItemStack(new ItemStack(ConfigItems.itemNugget, 1, 16)), null, ironClusterRecipe); - ItemStack goldClusterRecipe = IC2Items.getItem("smallGoldDust").copy(); - goldClusterRecipe.stackSize = 22; - Recipes.macerator.addRecipe(new RecipeInputItemStack(new ItemStack(ConfigItems.itemNugget, 1, 31)), null, goldClusterRecipe); + ItemStack goldClusterRecipe = IC2Items.getItem("smallGoldDust").copy(); + goldClusterRecipe.stackSize = 22; + Recipes.macerator.addRecipe(new RecipeInputItemStack(new ItemStack(ConfigItems.itemNugget, 1, 31)), null, goldClusterRecipe); - ItemStack copperClusterRecipe = IC2Items.getItem("smallCopperDust").copy(); - copperClusterRecipe.stackSize = 22; - Recipes.macerator.addRecipe(new RecipeInputItemStack(new ItemStack(ConfigItems.itemNugget, 1, 17)), null, copperClusterRecipe); + ItemStack copperClusterRecipe = IC2Items.getItem("smallCopperDust").copy(); + copperClusterRecipe.stackSize = 22; + Recipes.macerator.addRecipe(new RecipeInputItemStack(new ItemStack(ConfigItems.itemNugget, 1, 17)), null, copperClusterRecipe); - ItemStack tinClusterRecipe = IC2Items.getItem("smallTinDust").copy(); - tinClusterRecipe.stackSize = 22; - Recipes.macerator.addRecipe(new RecipeInputItemStack(new ItemStack(ConfigItems.itemNugget, 1, 18)), null, tinClusterRecipe); + ItemStack tinClusterRecipe = IC2Items.getItem("smallTinDust").copy(); + tinClusterRecipe.stackSize = 22; + Recipes.macerator.addRecipe(new RecipeInputItemStack(new ItemStack(ConfigItems.itemNugget, 1, 18)), null, tinClusterRecipe); - ItemStack silverClusterRecipe = IC2Items.getItem("smallSilverDust").copy(); - silverClusterRecipe.stackSize = 22; - Recipes.macerator.addRecipe(new RecipeInputItemStack(new ItemStack(ConfigItems.itemNugget, 1, 19)), null, silverClusterRecipe); + ItemStack silverClusterRecipe = IC2Items.getItem("smallSilverDust").copy(); + silverClusterRecipe.stackSize = 22; + Recipes.macerator.addRecipe(new RecipeInputItemStack(new ItemStack(ConfigItems.itemNugget, 1, 19)), null, silverClusterRecipe); - ItemStack leadClusterRecipe = IC2Items.getItem("smallLeadDust").copy(); - leadClusterRecipe.stackSize = 22; - Recipes.macerator.addRecipe(new RecipeInputItemStack(new ItemStack(ConfigItems.itemNugget, 1, 20)), null, leadClusterRecipe); + ItemStack leadClusterRecipe = IC2Items.getItem("smallLeadDust").copy(); + leadClusterRecipe.stackSize = 22; + Recipes.macerator.addRecipe(new RecipeInputItemStack(new ItemStack(ConfigItems.itemNugget, 1, 20)), null, leadClusterRecipe); /* Thaumium Plates Recipes */ - thaumiumPlate = GameRegistry.addShapedRecipe(new ItemStack(ItemRegistry.thaumiumPlate), "X", "Y", "Z", 'Y', new ItemStack(ConfigItems.itemResource, 1, 2), 'X', new ItemStack(IC2Items.getItem("ForgeHammer").getItem(), 1, OreDictionary.WILDCARD_VALUE), 'Z', new ItemStack(Blocks.obsidian)); - Recipes.metalformerRolling.addRecipe(new RecipeInputItemStack(new ItemStack(ConfigItems.itemResource, 1, 2)), null, new ItemStack(ItemRegistry.thaumiumPlate)); + thaumiumPlate = GameRegistry.addShapedRecipe(new ItemStack(ItemRegistry.itemEMTItems, 1, 5), "X", "Y", "Z", 'Y', new ItemStack(ConfigItems.itemResource, 1, 2), 'X', new ItemStack(IC2Items.getItem("ForgeHammer").getItem(), 1, OreDictionary.WILDCARD_VALUE), 'Z', new ItemStack(Blocks.obsidian)); + Recipes.metalformerRolling.addRecipe(new RecipeInputItemStack(new ItemStack(ConfigItems.itemResource, 1, 2)), null, new ItemStack(ItemRegistry.itemEMTItems, 1, 5)); + + /* Iron Sheet Recipe */ + Recipes.metalformerRolling.addRecipe(new RecipeInputItemStack(IC2Items.getItem("denseplateiron")), null, new ItemStack(ItemRegistry.itemEMTItems, 1, 13)); /* Ore Processing for Amber and Cinnabar */ - ItemStack crushedAmberRecipe = new ItemStack(ItemRegistry.itemEMTItems, 1, 1); - crushedAmberRecipe.stackSize = 2; - Recipes.macerator.addRecipe(new RecipeInputItemStack(new ItemStack(ConfigBlocks.blockCustomOre, 1, 7)), null, crushedAmberRecipe); + if (Config.removeAmberAndCinnabarMacerating == true) { + for (Iterator it = Recipes.macerator.getRecipes().keySet().iterator(); it.hasNext(); ) { + IRecipeInput input = it.next(); + if (input.matches(new ItemStack(ConfigBlocks.blockCustomOre, 1, 7))) { + it.remove(); + FMLLog.info("[EMT] Electro-Magic Tools : Removing conflicting amber macerating recipe(s)"); + } + } - ItemStack crushedCinnabarRecipe = new ItemStack(ItemRegistry.itemEMTItems, 1, 3); - crushedCinnabarRecipe.stackSize = 2; - Recipes.macerator.addRecipe(new RecipeInputItemStack(new ItemStack(ConfigBlocks.blockCustomOre, 1, 0)), null, crushedCinnabarRecipe); + for (Iterator it = Recipes.macerator.getRecipes().keySet().iterator(); it.hasNext(); ) { + IRecipeInput input = it.next(); + if (input.matches(new ItemStack(ConfigBlocks.blockCustomOre, 1, 0))) { + it.remove(); + FMLLog.info("[EMT] Electro-Magic Tools : Removing Conflicting cinnabar macerating recipe(s)"); + } + } + } + ItemStack crushedAmberRecipe = new ItemStack(ItemRegistry.itemEMTItems, 1, 1); + crushedAmberRecipe.stackSize = 2; + Recipes.macerator.addRecipe(new RecipeInputItemStack(new ItemStack(ConfigBlocks.blockCustomOre, 1, 7)), null, crushedAmberRecipe); - NBTTagCompound waterAmount = new NBTTagCompound(); - waterAmount.setInteger("amount", 1000); + ItemStack crushedCinnabarRecipe = new ItemStack(ItemRegistry.itemEMTItems, 1, 3); + crushedCinnabarRecipe.stackSize = 2; + Recipes.macerator.addRecipe(new RecipeInputItemStack(new ItemStack(ConfigBlocks.blockCustomOre, 1, 0)), null, crushedCinnabarRecipe); - Recipes.oreWashing.addRecipe(new RecipeInputItemStack(new ItemStack(ItemRegistry.itemEMTItems, 1, 1)), waterAmount, new ItemStack[] { new ItemStack(ItemRegistry.itemEMTItems, 1, 2), StackUtil.copyWithSize(Ic2Items.smallCopperDust, 2), Ic2Items.stoneDust }); - Recipes.oreWashing.addRecipe(new RecipeInputItemStack(new ItemStack(ItemRegistry.itemEMTItems, 1, 3)), waterAmount, new ItemStack[] { new ItemStack(ItemRegistry.itemEMTItems, 1, 4), StackUtil.copyWithSize(Ic2Items.smallTinDust, 2), Ic2Items.stoneDust }); + NBTTagCompound waterAmount = new NBTTagCompound(); + waterAmount.setInteger("amount", 1000); - NBTTagCompound heatAmount = new NBTTagCompound(); - heatAmount.setInteger("minHeat", 1000); + Recipes.oreWashing.addRecipe(new RecipeInputItemStack(new ItemStack(ItemRegistry.itemEMTItems, 1, 1)), waterAmount, new ItemStack[]{new ItemStack(ItemRegistry.itemEMTItems, 1, 2), StackUtil.copyWithSize(Ic2Items.smallCopperDust, 2), Ic2Items.stoneDust}); + Recipes.oreWashing.addRecipe(new RecipeInputItemStack(new ItemStack(ItemRegistry.itemEMTItems, 1, 3)), waterAmount, new ItemStack[]{new ItemStack(ItemRegistry.itemEMTItems, 1, 4), StackUtil.copyWithSize(Ic2Items.smallTinDust, 2), Ic2Items.stoneDust}); - Recipes.centrifuge.addRecipe(new RecipeInputItemStack(new ItemStack(ItemRegistry.itemEMTItems, 1, 2)), heatAmount, new ItemStack[] { Ic2Items.smallCopperDust, new ItemStack(ConfigItems.itemResource, 1, 6) }); - Recipes.centrifuge.addRecipe(new RecipeInputItemStack(new ItemStack(ItemRegistry.itemEMTItems, 1, 4)), heatAmount, new ItemStack[] { Ic2Items.smallTinDust, new ItemStack(ConfigItems.itemResource, 1, 3) }); - } + NBTTagCompound heatAmount = new NBTTagCompound(); + heatAmount.setInteger("minHeat", 1000); - public static InfusionRecipe thaumiumDrill; - public static InfusionRecipe thaumiumChainsaw; - public static InfusionRecipe thaumicQuantumHelmet; - public static InfusionRecipe thaumiumOmnitool; - public static InfusionRecipe thaumicNanoHelmet; - public static InfusionRecipe explosionFocus; - public static InfusionRecipe shieldFocus; - public static InfusionRecipe potentiaGenerator; - public static InfusionRecipe streamChainsaw; - public static InfusionRecipe rockbreakerDrill; - public static InfusionRecipe thorHammer; - public static InfusionRecipe superchargedThorHammer; - public static InfusionRecipe wandRecharger; - public static InfusionRecipe solarHelmetRevealing; - public static InfusionRecipe electricBootsTravel; - public static InfusionRecipe nanoBootsTravel; - public static InfusionRecipe quantumBootsTravel; - public static InfusionRecipe diamondOmnitoolToThaumium; - public static InfusionRecipe etheralProcessor; - public static InfusionRecipe tripleCompressedSolar; - public static InfusionRecipe electricHoeGrowth; - public static InfusionRecipe chargeFocus; - public static InfusionRecipe wandChargeFocus; - public static InfusionRecipe inventoryChargingRing; - public static InfusionRecipe armorChargingRing; + Recipes.centrifuge.addRecipe(new RecipeInputItemStack(new ItemStack(ItemRegistry.itemEMTItems, 1, 2)), heatAmount, new ItemStack[]{Ic2Items.smallCopperDust, new ItemStack(ConfigItems.itemResource, 1, 6)}); + Recipes.centrifuge.addRecipe(new RecipeInputItemStack(new ItemStack(ItemRegistry.itemEMTItems, 1, 4)), heatAmount, new ItemStack[]{Ic2Items.smallTinDust, new ItemStack(ConfigItems.itemResource, 1, 3)}); + } - public static ShapelessArcaneRecipe diamondOmnitool; - public static ShapelessArcaneRecipe tinyUranium; - public static ShapedArcaneRecipe christmasFocus; - public static ShapedArcaneRecipe electricGoggles; - public static ShapedArcaneRecipe shieldBlock; - public static ShapedArcaneRecipe compressedSolar; - public static ShapedArcaneRecipe doubleCompressedSolar; - public static ShapedArcaneRecipe ironOmnitoolToDiamond; - public static ShapedArcaneRecipe electricScribingTools; + public static InfusionRecipe thaumiumDrill; + public static InfusionRecipe thaumiumChainsaw; + public static InfusionRecipe thaumicQuantumHelmet; + public static InfusionRecipe thaumiumOmnitool; + public static InfusionRecipe thaumicNanoHelmet; + public static InfusionRecipe explosionFocus; + public static InfusionRecipe shieldFocus; + public static InfusionRecipe potentiaGenerator; + public static InfusionRecipe streamChainsaw; + public static InfusionRecipe rockbreakerDrill; + public static InfusionRecipe thorHammer; + public static InfusionRecipe superchargedThorHammer; + public static InfusionRecipe wandRecharger; + public static InfusionRecipe solarHelmetRevealing; + public static InfusionRecipe electricBootsTravel; + public static InfusionRecipe nanoBootsTravel; + public static InfusionRecipe quantumBootsTravel; + public static InfusionRecipe diamondOmnitoolToThaumium; + public static InfusionRecipe etheralProcessor; + public static InfusionRecipe tripleCompressedSolar; + public static InfusionRecipe electricHoeGrowth; + public static InfusionRecipe chargeFocus; + public static InfusionRecipe wandChargeFocus; + public static InfusionRecipe inventoryChargingRing; + public static InfusionRecipe armorChargingRing; + public static InfusionRecipe nanoWings; + public static InfusionRecipe quantumWings; - public static CrucibleRecipe ignisGenerator; - public static CrucibleRecipe auramGenerator; - public static CrucibleRecipe arborGenerator; - public static CrucibleRecipe waterSolar; - public static CrucibleRecipe doubleWaterSolar; - public static CrucibleRecipe tripleWaterSolar; - public static CrucibleRecipe darkSolar; - public static CrucibleRecipe doubleDarkSolar; - public static CrucibleRecipe tripleDarkSolar; - public static CrucibleRecipe orderSolar; - public static CrucibleRecipe doubleOrderSolar; - public static CrucibleRecipe tripleOrderSolar; - public static CrucibleRecipe fireSolar; - public static CrucibleRecipe doubleFireSolar; - public static CrucibleRecipe tripleFireSolar; - public static CrucibleRecipe airSolar; - public static CrucibleRecipe doubleAirSolar; - public static CrucibleRecipe tripleAirSolar; - public static CrucibleRecipe earthSolar; - public static CrucibleRecipe doubleEarthSolar; - public static CrucibleRecipe tripleEarthSolar; - public static CrucibleRecipe portableNode; + public static ShapelessArcaneRecipe diamondOmnitool; + public static ShapelessArcaneRecipe tinyUranium; + public static ShapedArcaneRecipe christmasFocus; + public static ShapedArcaneRecipe electricGoggles; + public static ShapedArcaneRecipe shieldBlock; + public static ShapedArcaneRecipe compressedSolar; + public static ShapedArcaneRecipe doubleCompressedSolar; + public static ShapedArcaneRecipe ironOmnitoolToDiamond; + public static ShapedArcaneRecipe electricScribingTools; + public static ShapedArcaneRecipe thaumiumWing; + public static ShapedArcaneRecipe thaumiumWings; - public static IRecipe thaumiumPlate; + public static CrucibleRecipe ignisGenerator; + public static CrucibleRecipe auramGenerator; + public static CrucibleRecipe arborGenerator; + public static CrucibleRecipe waterSolar; + public static CrucibleRecipe doubleWaterSolar; + public static CrucibleRecipe tripleWaterSolar; + public static CrucibleRecipe darkSolar; + public static CrucibleRecipe doubleDarkSolar; + public static CrucibleRecipe tripleDarkSolar; + public static CrucibleRecipe orderSolar; + public static CrucibleRecipe doubleOrderSolar; + public static CrucibleRecipe tripleOrderSolar; + public static CrucibleRecipe fireSolar; + public static CrucibleRecipe doubleFireSolar; + public static CrucibleRecipe tripleFireSolar; + public static CrucibleRecipe airSolar; + public static CrucibleRecipe doubleAirSolar; + public static CrucibleRecipe tripleAirSolar; + public static CrucibleRecipe earthSolar; + public static CrucibleRecipe doubleEarthSolar; + public static CrucibleRecipe tripleEarthSolar; + public static CrucibleRecipe portableNode; + + public static IRecipe thaumiumPlate; } diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/recipes/UuMInfusionRecipes.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/recipes/UuMInfusionRecipes.java index 6818386..9a19ec6 100644 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/recipes/UuMInfusionRecipes.java +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/recipes/UuMInfusionRecipes.java @@ -1,16 +1,17 @@ /******************************************************************************* * Copyright (c) 2014 Tombenpotter. * All rights reserved. - * + * * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * + * * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ package electricMagicTools.tombenpotter.electricmagictools.common.recipes; +import electricMagicTools.tombenpotter.electricmagictools.common.lib.CraftingAspects; import ic2.api.item.IC2Items; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -20,92 +21,91 @@ import thaumcraft.api.ThaumcraftApi; import thaumcraft.api.crafting.InfusionRecipe; import thaumcraft.common.config.ConfigBlocks; import thaumcraft.common.config.ConfigItems; -import electricMagicTools.tombenpotter.electricmagictools.common.lib.CraftingAspects; public class UuMInfusionRecipes { - public static ItemStack uuMCell = IC2Items.getItem("UuMatterCell"); + public static ItemStack uuMCell = IC2Items.getItem("UuMatterCell"); - public static void add() { + public static void add() { - ItemStack iridium = IC2Items.getItem("iridiumOre").copy(); - iridium.stackSize = 2; - uraniumToIridium = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", iridium, 4, CraftingAspects.uuMatterInfusions, IC2Items.getItem("Uran238"), new ItemStack[] { uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell }); + ItemStack iridium = IC2Items.getItem("iridiumOre").copy(); + iridium.stackSize = 2; + uraniumToIridium = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", iridium, 4, CraftingAspects.uuMatterInfusions, IC2Items.getItem("Uran238"), new ItemStack[]{uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell}); - ItemStack uranium = IC2Items.getItem("Uran238").copy(); - uranium.stackSize = 2; - diamondToUranium = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", uranium, 4, CraftingAspects.lesserUUMInfusions, new ItemStack(Items.diamond), new ItemStack[] { uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell }); + ItemStack uranium = IC2Items.getItem("Uran238").copy(); + uranium.stackSize = 2; + diamondToUranium = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", uranium, 4, CraftingAspects.lesserUUMInfusions, new ItemStack(Items.diamond), new ItemStack[]{uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell}); - ItemStack diamond = new ItemStack(Items.diamond).copy(); - diamond.stackSize = 1; - goldToDiamond = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", diamond, 4, CraftingAspects.cheapUUMInfusions, new ItemStack(Items.gold_ingot), new ItemStack[] { uuMCell, uuMCell, uuMCell, uuMCell }); + ItemStack diamond = new ItemStack(Items.diamond).copy(); + diamond.stackSize = 1; + goldToDiamond = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", diamond, 4, CraftingAspects.cheapUUMInfusions, new ItemStack(Items.gold_ingot), new ItemStack[]{uuMCell, uuMCell, uuMCell, uuMCell}); - ItemStack gold = new ItemStack(Items.gold_ingot).copy(); - gold.stackSize = 2; - ironToGold = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", gold, 4, CraftingAspects.cheapestUUMInfusions, new ItemStack(Items.iron_ingot), new ItemStack[] { uuMCell, uuMCell, uuMCell }); + ItemStack gold = new ItemStack(Items.gold_ingot).copy(); + gold.stackSize = 2; + ironToGold = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", gold, 4, CraftingAspects.cheapestUUMInfusions, new ItemStack(Items.iron_ingot), new ItemStack[]{uuMCell, uuMCell, uuMCell}); - ItemStack ironOre = new ItemStack(Blocks.iron_ore).copy(); - ironOre.stackSize = 16; - stoneBricksToIronOre = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", ironOre, 4, CraftingAspects.cheapUUMInfusions, new ItemStack(Blocks.stonebrick), new ItemStack[] { uuMCell, uuMCell }); + ItemStack ironOre = new ItemStack(Blocks.iron_ore).copy(); + ironOre.stackSize = 16; + stoneBricksToIronOre = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", ironOre, 4, CraftingAspects.cheapUUMInfusions, new ItemStack(Blocks.stonebrick), new ItemStack[]{uuMCell, uuMCell}); - /** - * ItemStack copperOre = Items.getItem("copperOre").copy(); BUGGED IN 1.6 IF IC2 OREGEN IS DISABLED - **/ - ItemStack copperOre = IC2Items.getItem("crushedCopperOre").copy(); - copperOre.stackSize = 32; - arcaneStoneToCopperOre = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", copperOre, 4, CraftingAspects.cheapUUMInfusions, new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 6), new ItemStack[] { uuMCell, uuMCell }); + /** + * ItemStack copperOre = Items.getItem("copperOre").copy(); BUGGED IN 1.6 IF IC2 OREGEN IS DISABLED + **/ + ItemStack copperOre = IC2Items.getItem("crushedCopperOre").copy(); + copperOre.stackSize = 32; + arcaneStoneToCopperOre = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", copperOre, 4, CraftingAspects.cheapUUMInfusions, new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 6), new ItemStack[]{uuMCell, uuMCell}); - /** - * ItemStack tinOre = Items.getItem("tinOre").copy(); BUGGED IN 1.6 IF IC2 OREGEN IS DISABLED - **/ - ItemStack tinOre = IC2Items.getItem("crushedTinOre").copy(); - tinOre.stackSize = 32; - arcaneStoneBricksToTinOre = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", tinOre, 4, CraftingAspects.cheapUUMInfusions, new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 7), new ItemStack[] { uuMCell, uuMCell }); + /** + * ItemStack tinOre = Items.getItem("tinOre").copy(); BUGGED IN 1.6 IF IC2 OREGEN IS DISABLED + **/ + ItemStack tinOre = IC2Items.getItem("crushedTinOre").copy(); + tinOre.stackSize = 32; + arcaneStoneBricksToTinOre = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", tinOre, 4, CraftingAspects.cheapUUMInfusions, new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 7), new ItemStack[]{uuMCell, uuMCell}); - /** - * ItemStack leadOre = Items.getItem("leadOre").copy(); BUGGED IN 1.6 IF IC2 OREGEN IS DISABLED - **/ - ItemStack leadOre = IC2Items.getItem("crushedLeadOre").copy(); - leadOre.stackSize = 32; - amberBlockToLeadOre = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", leadOre, 4, CraftingAspects.cheapUUMInfusions, new ItemStack(ConfigBlocks.blockCosmeticOpaque, 1, 0), new ItemStack[] { uuMCell, uuMCell }); + /** + * ItemStack leadOre = Items.getItem("leadOre").copy(); BUGGED IN 1.6 IF IC2 OREGEN IS DISABLED + **/ + ItemStack leadOre = IC2Items.getItem("crushedLeadOre").copy(); + leadOre.stackSize = 32; + amberBlockToLeadOre = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", leadOre, 4, CraftingAspects.cheapUUMInfusions, new ItemStack(ConfigBlocks.blockCosmeticOpaque, 1, 0), new ItemStack[]{uuMCell, uuMCell}); - ItemStack uraniumOre = IC2Items.getItem("uraniumOre").copy(); - uraniumOre.stackSize = 8; - amberBricksToUraniumOre = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", uraniumOre, 4, CraftingAspects.lesserUUMInfusions, new ItemStack(ConfigBlocks.blockCosmeticOpaque, 1, 1), new ItemStack[] { uuMCell, uuMCell, uuMCell }); + ItemStack uraniumOre = IC2Items.getItem("uraniumOre").copy(); + uraniumOre.stackSize = 8; + amberBricksToUraniumOre = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", uraniumOre, 4, CraftingAspects.lesserUUMInfusions, new ItemStack(ConfigBlocks.blockCosmeticOpaque, 1, 1), new ItemStack[]{uuMCell, uuMCell, uuMCell}); - ItemStack coal = new ItemStack(Items.coal, 1, 0).copy(); - coal.stackSize = 16; - charcoalToCoal = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", coal, 4, CraftingAspects.cheapUUMInfusions, new ItemStack(Items.coal, 1, 1), new ItemStack[] { uuMCell, uuMCell }); + ItemStack coal = new ItemStack(Items.coal, 1, 0).copy(); + coal.stackSize = 16; + charcoalToCoal = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", coal, 4, CraftingAspects.cheapUUMInfusions, new ItemStack(Items.coal, 1, 1), new ItemStack[]{uuMCell, uuMCell}); - ItemStack stickyResin = IC2Items.getItem("resin").copy(); - stickyResin.stackSize = 21; - shardToResin = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", stickyResin, 4, CraftingAspects.cheapUUMInfusions, new ItemStack(ConfigItems.itemShard, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[] { uuMCell, uuMCell, uuMCell }); + ItemStack stickyResin = IC2Items.getItem("resin").copy(); + stickyResin.stackSize = 21; + shardToResin = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", stickyResin, 4, CraftingAspects.cheapUUMInfusions, new ItemStack(ConfigItems.itemShard, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{uuMCell, uuMCell, uuMCell}); - ItemStack redstone = new ItemStack(Items.redstone).copy(); - redstone.stackSize = 24; - shardToRedstone = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", redstone, 4, CraftingAspects.cheapUUMInfusions, new ItemStack(ConfigItems.itemShard, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[] { uuMCell, uuMCell, uuMCell }); + ItemStack redstone = new ItemStack(Items.redstone).copy(); + redstone.stackSize = 24; + shardToRedstone = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", redstone, 4, CraftingAspects.cheapUUMInfusions, new ItemStack(ConfigItems.itemShard, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{uuMCell, uuMCell, uuMCell}); - ItemStack lapisLazuli = new ItemStack(Items.dye, 1, 4).copy(); - lapisLazuli.stackSize = 8; - shardToLapis = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", lapisLazuli, 4, CraftingAspects.cheapUUMInfusions, new ItemStack(ConfigItems.itemShard, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[] { uuMCell, uuMCell, uuMCell }); + ItemStack lapisLazuli = new ItemStack(Items.dye, 1, 4).copy(); + lapisLazuli.stackSize = 8; + shardToLapis = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", lapisLazuli, 4, CraftingAspects.cheapUUMInfusions, new ItemStack(ConfigItems.itemShard, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{uuMCell, uuMCell, uuMCell}); - ItemStack glowstone = new ItemStack(Blocks.glowstone).copy(); - glowstone.stackSize = 1; - glowstoneDustToBlock = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", glowstone, 4, CraftingAspects.cheapestUUMInfusions, new ItemStack(Items.glowstone_dust), new ItemStack[] { uuMCell }); + ItemStack glowstone = new ItemStack(Blocks.glowstone).copy(); + glowstone.stackSize = 1; + glowstoneDustToBlock = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", glowstone, 4, CraftingAspects.cheapestUUMInfusions, new ItemStack(Items.glowstone_dust), new ItemStack[]{uuMCell}); - } + } - public static InfusionRecipe uraniumToIridium; - public static InfusionRecipe diamondToUranium; - public static InfusionRecipe goldToDiamond; - public static InfusionRecipe ironToGold; - public static InfusionRecipe stoneBricksToIronOre; - public static InfusionRecipe arcaneStoneToCopperOre; - public static InfusionRecipe arcaneStoneBricksToTinOre; - public static InfusionRecipe amberBlockToLeadOre; - public static InfusionRecipe amberBricksToUraniumOre; - public static InfusionRecipe charcoalToCoal; - public static InfusionRecipe shardToResin; - public static InfusionRecipe shardToRedstone; - public static InfusionRecipe shardToLapis; - public static InfusionRecipe glowstoneDustToBlock; + public static InfusionRecipe uraniumToIridium; + public static InfusionRecipe diamondToUranium; + public static InfusionRecipe goldToDiamond; + public static InfusionRecipe ironToGold; + public static InfusionRecipe stoneBricksToIronOre; + public static InfusionRecipe arcaneStoneToCopperOre; + public static InfusionRecipe arcaneStoneBricksToTinOre; + public static InfusionRecipe amberBlockToLeadOre; + public static InfusionRecipe amberBricksToUraniumOre; + public static InfusionRecipe charcoalToCoal; + public static InfusionRecipe shardToResin; + public static InfusionRecipe shardToRedstone; + public static InfusionRecipe shardToLapis; + public static InfusionRecipe glowstoneDustToBlock; } diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/TileEntityArborGenerator.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/TileEntityArborGenerator.java index 09434d0..b3f949e 100644 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/TileEntityArborGenerator.java +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/TileEntityArborGenerator.java @@ -1,63 +1,62 @@ /******************************************************************************* * Copyright (c) 2014 Tombenpotter. * All rights reserved. - * + * * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * + * * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ package electricMagicTools.tombenpotter.electricmagictools.common.tile; +import electricMagicTools.tombenpotter.electricmagictools.common.Config; import ic2.api.energy.prefab.BasicSource; -import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; import thaumcraft.api.aspects.Aspect; import thaumcraft.common.lib.events.EssentiaHandler; -import electricMagicTools.tombenpotter.electricmagictools.common.Config; -public class TileEntityArborGenerator extends TileEntity { - int x; - int y; - int z; - public ForgeDirection orientation; - public static int waitTime; +public class TileEntityArborGenerator extends TileEntityEMT { + int x; + int y; + int z; + public ForgeDirection orientation; + public static int waitTime; - public TileEntityArborGenerator() { - orientation = ForgeDirection.getOrientation(1); - waitTime = 30; - } + public TileEntityArborGenerator() { + orientation = ForgeDirection.getOrientation(1); + waitTime = 30; + } - private BasicSource energySource = new BasicSource(this, 1000000000, 3); + private BasicSource energySource = new BasicSource(this, 1000000000, 3); - @Override - public void updateEntity() { - energySource.updateEntity(); + @Override + public void updateEntity() { + energySource.updateEntity(); - if (waitTime > 0) { - waitTime--; - } + if (waitTime > 0) { + waitTime--; + } - if (waitTime <= 0) { - if ((!this.worldObj.isRemote) && (EssentiaHandler.drainEssentia(this, Aspect.TREE, ForgeDirection.UNKNOWN, 8))) { - energySource.addEnergy(Config.arborGenOutput); - } - waitTime = Config.essentiaGeneratorsDelay; + if (waitTime <= 0) { + if ((!this.worldObj.isRemote) && (EssentiaHandler.drainEssentia(this, Aspect.TREE, ForgeDirection.UNKNOWN, 8))) { + energySource.addEnergy(Config.arborGenOutput); + } + waitTime = Config.essentiaGeneratorsDelay; - } - } + } + } - @Override - public void onChunkUnload() { - energySource.onChunkUnload(); - } + @Override + public void onChunkUnload() { + energySource.onChunkUnload(); + } - @Override - public void invalidate() { - energySource.invalidate(); - super.invalidate(); - onChunkUnload(); - } + @Override + public void invalidate() { + energySource.invalidate(); + super.invalidate(); + onChunkUnload(); + } } diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/TileEntityAuramGenerator.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/TileEntityAuramGenerator.java index b09f311..487eadf 100644 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/TileEntityAuramGenerator.java +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/TileEntityAuramGenerator.java @@ -1,73 +1,72 @@ /******************************************************************************* * Copyright (c) 2014 Tombenpotter. * All rights reserved. - * + * * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * + * * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ package electricMagicTools.tombenpotter.electricmagictools.common.tile; +import electricMagicTools.tombenpotter.electricmagictools.common.Config; import ic2.api.energy.prefab.BasicSource; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; import thaumcraft.api.aspects.Aspect; import thaumcraft.common.lib.events.EssentiaHandler; -import electricMagicTools.tombenpotter.electricmagictools.common.Config; -public class TileEntityAuramGenerator extends TileEntity { - int x; - int y; - int z; - public ForgeDirection orientation; - public static int waitTime; - private BasicSource energySource = new BasicSource(this, 1000000000, 3); +public class TileEntityAuramGenerator extends TileEntityEMT { + int x; + int y; + int z; + public ForgeDirection orientation; + public static int waitTime; + private BasicSource energySource = new BasicSource(this, 1000000000, 3); - public TileEntityAuramGenerator() { - orientation = ForgeDirection.getOrientation(1); - waitTime = 30; - } + public TileEntityAuramGenerator() { + orientation = ForgeDirection.getOrientation(1); + waitTime = 30; + } - @Override - public void updateEntity() { - energySource.updateEntity(); + @Override + public void updateEntity() { + energySource.updateEntity(); - if (waitTime > 0) { - waitTime--; - } + if (waitTime > 0) { + waitTime--; + } - if (waitTime <= 0) { - if ((!this.worldObj.isRemote) && (EssentiaHandler.drainEssentia(this, Aspect.AURA, ForgeDirection.UNKNOWN, 8))) { - energySource.addEnergy(Config.auramGenOutput); - } - waitTime = Config.essentiaGeneratorsDelay; - } - } + if (waitTime <= 0) { + if ((!this.worldObj.isRemote) && (EssentiaHandler.drainEssentia(this, Aspect.AURA, ForgeDirection.UNKNOWN, 8))) { + energySource.addEnergy(Config.auramGenOutput); + } + waitTime = Config.essentiaGeneratorsDelay; + } + } - @Override - public void onChunkUnload() { - energySource.onChunkUnload(); - } + @Override + public void onChunkUnload() { + energySource.onChunkUnload(); + } - @Override - public void invalidate() { - energySource.invalidate(); - super.invalidate(); - } + @Override + public void invalidate() { + energySource.invalidate(); + super.invalidate(); + } - @Override - public void readFromNBT(NBTTagCompound tag) { - super.readFromNBT(tag); - energySource.readFromNBT(tag); - } + @Override + public void readFromNBT(NBTTagCompound tag) { + super.readFromNBT(tag); + energySource.readFromNBT(tag); + } - @Override - public void writeToNBT(NBTTagCompound tag) { - super.writeToNBT(tag); - energySource.writeToNBT(tag); - } + @Override + public void writeToNBT(NBTTagCompound tag) { + super.writeToNBT(tag); + energySource.writeToNBT(tag); + } } diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/TileEntityEMT.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/TileEntityEMT.java new file mode 100644 index 0000000..3119f99 --- /dev/null +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/TileEntityEMT.java @@ -0,0 +1,52 @@ +package electricMagicTools.tombenpotter.electricmagictools.common.tile; + +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.network.NetworkManager; +import net.minecraft.network.Packet; +import net.minecraft.network.play.server.S35PacketUpdateTileEntity; +import net.minecraft.tileentity.TileEntity; + +public abstract class TileEntityEMT extends TileEntity { + + public int facing; + public boolean isOn; + + @Override + public void readFromNBT(NBTTagCompound tagCompound) { + super.readFromNBT(tagCompound); + + facing = tagCompound.getInteger("facing"); + isOn = tagCompound.getBoolean("isOn"); + } + + @Override + public void writeToNBT(NBTTagCompound tagCompound) { + super.writeToNBT(tagCompound); + + tagCompound.setInteger("facing", facing); + tagCompound.setBoolean("isOn", isOn); + } + + @Override + public final Packet getDescriptionPacket() { + NBTTagCompound nbt = new NBTTagCompound(); + writeToNBT(nbt); + S35PacketUpdateTileEntity packet = new S35PacketUpdateTileEntity(xCoord, yCoord, zCoord, 0, nbt); + return packet; + } + + @Override + public void onDataPacket(NetworkManager net, S35PacketUpdateTileEntity pkt) { + NBTTagCompound nbt = pkt.func_148857_g(); + readFromNBT(nbt); + } + + @Override + public void markDirty() { + super.markDirty(); // Mark dirty for gamesave + if (worldObj.isRemote) { + return; + } + this.worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); // Update block + TE via Network + } +} diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/TileEntityEtherealMacerator.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/TileEntityEtherealMacerator.java index fd96dd1..c0e3173 100644 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/TileEntityEtherealMacerator.java +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/TileEntityEtherealMacerator.java @@ -1,16 +1,18 @@ /******************************************************************************* * Copyright (c) 2014 Tombenpotter. * All rights reserved. - * + * * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * + * * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ package electricMagicTools.tombenpotter.electricmagictools.common.tile; +import electricMagicTools.tombenpotter.electricmagictools.common.BlockRegistry; +import electricMagicTools.tombenpotter.electricmagictools.common.Config; import ic2.api.tile.IWrenchable; import ic2.core.Ic2Items; import net.minecraft.entity.player.EntityPlayer; @@ -22,294 +24,283 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import net.minecraft.tileentity.TileEntity; import net.minecraftforge.oredict.OreDictionary; import thaumcraft.common.config.ConfigItems; -import electricMagicTools.tombenpotter.electricmagictools.common.BlockRegistry; -import electricMagicTools.tombenpotter.electricmagictools.common.Config; -public class TileEntityEtherealMacerator extends TileEntity implements ISidedInventory, IWrenchable { - private static final int[] slots_top = new int[] { 0 }; - private static final int[] slots_bottom = new int[] { 2, 1 }; - private static final int[] slots_sides = new int[] { 1 }; +public class TileEntityEtherealMacerator extends TileEntityEMT implements ISidedInventory, IWrenchable { + private static final int[] slots_top = new int[]{0}; + private static final int[] slots_bottom = new int[]{2, 1}; + private static final int[] slots_sides = new int[]{1}; - /** - * The ItemStacks that hold the items currently being used in the furnace - */ - private ItemStack[] slots = new ItemStack[3]; + private ItemStack[] slots = new ItemStack[3]; + public int maceratingSpeed = Config.etherealProcessorBaseSpeed; + public int cookTime; - /** - * the speed of this furnace, 200 is normal / how many ticks it takes : 30 ticks = 1 second - */ - public int maceratingSpeed = Config.etherealProcessorBaseSpeed; + public int getSizeInventory() { + return this.slots.length; + } - /** The number of ticks that the current item has been cooking for */ - public int cookTime; + public ItemStack getStackInSlot(int par1) { + return this.slots[par1]; + } - /** - * Returns the number of slots in the inventory. - */ - public int getSizeInventory() { - return this.slots.length; - } + public ItemStack decrStackSize(int par1, int par2) { + if (this.slots[par1] != null) { + ItemStack itemstack; - /** - * Returns the stack in slot i - */ - public ItemStack getStackInSlot(int par1) { - return this.slots[par1]; - } + if (this.slots[par1].stackSize <= par2) { + itemstack = this.slots[par1]; + this.slots[par1] = null; + return itemstack; + } else { + itemstack = this.slots[par1].splitStack(par2); - /** - * Removes from an inventory slot (first arg) up to a specified number (second arg) of items and returns them in a new stack. - */ - public ItemStack decrStackSize(int par1, int par2) { - if (this.slots[par1] != null) { - ItemStack itemstack; + if (this.slots[par1].stackSize == 0) { + this.slots[par1] = null; + } - if (this.slots[par1].stackSize <= par2) { - itemstack = this.slots[par1]; - this.slots[par1] = null; - return itemstack; - } else { - itemstack = this.slots[par1].splitStack(par2); + return itemstack; + } + } else { + return null; + } + } - if (this.slots[par1].stackSize == 0) { - this.slots[par1] = null; - } + public ItemStack getStackInSlotOnClosing(int par1) { + if (this.slots[par1] != null) { + ItemStack itemstack = this.slots[par1]; + this.slots[par1] = null; + return itemstack; + } else { + return null; + } + } - return itemstack; - } - } else { - return null; - } - } + public void setInventorySlotContents(int par1, ItemStack par2ItemStack) { + this.slots[par1] = par2ItemStack; - /** - * When some containers are closed they call this on each slot, then drop whatever it returns as an EntityItem - like when you close a workbench GUI. - */ - public ItemStack getStackInSlotOnClosing(int par1) { - if (this.slots[par1] != null) { - ItemStack itemstack = this.slots[par1]; - this.slots[par1] = null; - return itemstack; - } else { - return null; - } - } + if (par2ItemStack != null && par2ItemStack.stackSize > this.getInventoryStackLimit()) { + par2ItemStack.stackSize = this.getInventoryStackLimit(); + } + } - /** - * Sets the given item stack to the specified slot in the inventory (can be crafting or armor sections). - */ - public void setInventorySlotContents(int par1, ItemStack par2ItemStack) { - this.slots[par1] = par2ItemStack; + public String getInvName() { + return "Ethereal Processor"; + } - if (par2ItemStack != null && par2ItemStack.stackSize > this.getInventoryStackLimit()) { - par2ItemStack.stackSize = this.getInventoryStackLimit(); - } - } + public boolean isInvNameLocalized() { + return false; + } - public String getInvName() { - return "Ethereal Processor"; - } + public void readFromNBT(NBTTagCompound tagCompound) { + super.readFromNBT(tagCompound); + NBTTagList nbttaglist = tagCompound.getTagList("Items", 10); + this.slots = new ItemStack[this.getSizeInventory()]; - public boolean isInvNameLocalized() { - return false; - } + for (int i = 0; i < nbttaglist.tagCount(); ++i) { + NBTTagCompound nbttagcompound1 = nbttaglist.getCompoundTagAt(i); + byte b0 = nbttagcompound1.getByte("Slot"); - public void readFromNBT(NBTTagCompound p_145839_1_) { - super.readFromNBT(p_145839_1_); - NBTTagList nbttaglist = p_145839_1_.getTagList("Items", 10); - this.slots = new ItemStack[this.getSizeInventory()]; + if (b0 >= 0 && b0 < this.slots.length) { + this.slots[b0] = ItemStack.loadItemStackFromNBT(nbttagcompound1); + } + } + this.cookTime = tagCompound.getShort("CookTime"); + } - for (int i = 0; i < nbttaglist.tagCount(); ++i) { - NBTTagCompound nbttagcompound1 = nbttaglist.getCompoundTagAt(i); - byte b0 = nbttagcompound1.getByte("Slot"); + public void writeToNBT(NBTTagCompound tagCompound) { + super.writeToNBT(tagCompound); + tagCompound.setShort("CookTime", (short) this.cookTime); + NBTTagList nbttaglist = new NBTTagList(); - if (b0 >= 0 && b0 < this.slots.length) { - this.slots[b0] = ItemStack.loadItemStackFromNBT(nbttagcompound1); - } - } - this.cookTime = p_145839_1_.getShort("CookTime"); - } + for (int i = 0; i < this.slots.length; ++i) { + if (this.slots[i] != null) { + NBTTagCompound nbttagcompound1 = new NBTTagCompound(); + nbttagcompound1.setByte("Slot", (byte) i); + this.slots[i].writeToNBT(nbttagcompound1); + nbttaglist.appendTag(nbttagcompound1); + } + } + tagCompound.setTag("Items", nbttaglist); + } - public void writeToNBT(NBTTagCompound p_145841_1_) { - super.writeToNBT(p_145841_1_); - p_145841_1_.setShort("CookTime", (short) this.cookTime); - NBTTagList nbttaglist = new NBTTagList(); + public int getInventoryStackLimit() { + return 64; + } - for (int i = 0; i < this.slots.length; ++i) { - if (this.slots[i] != null) { - NBTTagCompound nbttagcompound1 = new NBTTagCompound(); - nbttagcompound1.setByte("Slot", (byte) i); - this.slots[i].writeToNBT(nbttagcompound1); - nbttaglist.appendTag(nbttagcompound1); - } - } - p_145841_1_.setTag("Items", nbttaglist); - } + public void updateEntity() { + if (this.canSmelt() && isOverLimit(1) == false && isOverLimit(2) == false && isOP() == false) { + ++this.cookTime; + this.isOn = true; + worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); - public int getInventoryStackLimit() { - return 64; - } + if (this.cookTime == this.maceratingSpeed) { + this.cookTime = 0; + this.smeltItem(); + } + } else { + this.cookTime = 0; + this.isOn = false; + worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); + } + } - public void updateEntity() { - if (this.canSmelt() && isOverLimit(1) == false && isOverLimit(2) == false && isOP() == false) { - ++this.cookTime; + private boolean canSmelt() { + if (this.slots[0] == null) { + return false; + } else { + ItemStack itemstack = FurnaceRecipes.smelting().getSmeltingResult(this.slots[0]); + if (itemstack == null) + return false; + if (this.slots[2] == null) + return true; + if (!this.slots[2].isItemEqual(itemstack)) + return false; + int result = slots[2].stackSize + (itemstack.stackSize * 2); + return (result <= getInventoryStackLimit() && result <= itemstack.getMaxStackSize()); + } + } - if (this.cookTime == this.maceratingSpeed) { - this.cookTime = 0; - this.smeltItem(); - } - } else { - this.cookTime = 0; - } - } + public void smeltItem() { + if (this.canSmelt()) { + ItemStack itemstack = FurnaceRecipes.smelting().getSmeltingResult(this.slots[0]); - private boolean canSmelt() { - if (this.slots[0] == null) { - return false; - } else { - ItemStack itemstack = FurnaceRecipes.smelting().getSmeltingResult(this.slots[0]); - if (itemstack == null) - return false; - if (this.slots[2] == null) - return true; - if (!this.slots[2].isItemEqual(itemstack)) - return false; - int result = slots[2].stackSize + (itemstack.stackSize * 2); - return (result <= getInventoryStackLimit() && result <= itemstack.getMaxStackSize()); - } - } + if (this.slots[2] == null) { + this.slots[2] = itemstack.copy(); + this.slots[2].stackSize *= 2; + } else if (this.slots[2].isItemEqual(itemstack)) { + slots[2].stackSize += (itemstack.stackSize * 2); + } - public void smeltItem() { - if (this.canSmelt()) { - ItemStack itemstack = FurnaceRecipes.smelting().getSmeltingResult(this.slots[0]); + --this.slots[0].stackSize; - if (this.slots[2] == null) { - this.slots[2] = itemstack.copy(); - this.slots[2].stackSize *= 2; - } else if (this.slots[2].isItemEqual(itemstack)) { - slots[2].stackSize += (itemstack.stackSize * 2); - } + if (this.slots[0].stackSize <= 0) { + this.slots[0] = null; + } + this.addBonus(); + } + } - --this.slots[0].stackSize; + public void addBonus() { + if (this.canSmelt()) { + if (this.worldObj.rand.nextInt(Config.etherealProcessorBonus) == 0) { + if (this.slots[1] == null) { + this.setInventorySlotContents(1, new ItemStack(ConfigItems.itemNugget, 1, 6)); + } else if (this.slots[1].isItemEqual(new ItemStack(ConfigItems.itemNugget, 1, 6)) && this.isOverLimit(1) == false && this.isOverLimit(2) == false) { + slots[1] = new ItemStack(getStackInSlot(1).getItem(), slots[1].stackSize + 1, 2); + } + } + } + } - if (this.slots[0].stackSize <= 0) { - this.slots[0] = null; - } - this.addBonus(); - } - } + public boolean isUseableByPlayer(EntityPlayer par1EntityPlayer) { + return this.worldObj.getTileEntity(this.xCoord, this.yCoord, this.zCoord) != this ? false : par1EntityPlayer.getDistanceSq((double) this.xCoord + 0.5D, (double) this.yCoord + 0.5D, (double) this.zCoord + 0.5D) <= 64.0D; + } - public void addBonus() { - if (this.canSmelt()) { - if (this.worldObj.rand.nextInt(Config.etherealProcessorBonus) == 0) { - if (this.slots[1] == null) { - this.setInventorySlotContents(1, new ItemStack(ConfigItems.itemNugget, 1, 6)); - } else if (this.slots[1].isItemEqual(new ItemStack(ConfigItems.itemNugget, 1, 6)) && this.isOverLimit(1) == false && this.isOverLimit(2) == false) { - slots[1] = new ItemStack(getStackInSlot(1).getItem(), slots[1].stackSize + 1, 2); - } - } - } - } + public void openChest() { + } - public boolean isUseableByPlayer(EntityPlayer par1EntityPlayer) { - return this.worldObj.getTileEntity(this.xCoord, this.yCoord, this.zCoord) != this ? false : par1EntityPlayer.getDistanceSq((double) this.xCoord + 0.5D, (double) this.yCoord + 0.5D, (double) this.zCoord + 0.5D) <= 64.0D; - } + public void closeChest() { + } - public void openChest() { - } + @Override + public boolean isItemValidForSlot(int slot, ItemStack stack) { + if (slot != 0) return false; + if (FurnaceRecipes.smelting().getSmeltingResult(stack) != null) return true; + return false; + } - public void closeChest() { - } + public int[] getAccessibleSlotsFromSide(int par1) { + return par1 == 0 ? slots_bottom : (par1 == 1 ? slots_top : slots_sides); + } - public boolean isItemValidForSlot(int par1, ItemStack par2ItemStack) { - return true; - } + public boolean canInsertItem(int par1, ItemStack par2ItemStack, int par3) { + return this.isItemValidForSlot(par1, par2ItemStack); + } - public int[] getAccessibleSlotsFromSide(int par1) { - return par1 == 0 ? slots_bottom : (par1 == 1 ? slots_top : slots_sides); - } + public boolean canExtractItem(int par1, ItemStack par2ItemStack, int par3) { + return true; + } - public boolean canInsertItem(int par1, ItemStack par2ItemStack, int par3) { - return this.isItemValidForSlot(par1, par2ItemStack); - } + public boolean isOverLimit(int i) { + if (slots[i] != null) { + if (slots[i].stackSize >= 63) + return true; + else if (slots[i].stackSize < 63) + return false; + else + return false; + } else { + return false; + } + } - public boolean canExtractItem(int par1, ItemStack par2ItemStack, int par3) { - return true; - } + public boolean isOP() { + final int cobblestoneId = OreDictionary.getOreID("blockCobble"); - public boolean isOverLimit(int i) { - if (slots[i] != null) { - if (slots[i].stackSize >= 63) - return true; - else if (slots[i].stackSize < 63) - return false; - else - return false; - } else { - return false; - } - } + if (OreDictionary.getOreID(this.slots[0]) == cobblestoneId + || this.slots[0].getItem() == Item.getItemFromBlock(Blocks.sand) + || this.slots[0].getItem() == Items.potato + || this.slots[0].getItem() == Items.porkchop + || this.slots[0].getItem() == Items.beef + || this.slots[0].getItem() == Items.chicken + || this.slots[0].getItem() == Items.fish + || this.slots[0].getItem() == Ic2Items.hydratedCoalDust.getItem() + || (OreDictionary.getOreName(OreDictionary.getOreID(this.slots[0])).toLowerCase().contains("dust") || this.slots[0].getItem().getUnlocalizedName(this.slots[0]).toLowerCase().contains("armour") || this.slots[0].getItem().getUnlocalizedName(this.slots[0]).toLowerCase().contains("armor") || this.slots[0].getItem().getUnlocalizedName(this.slots[0]).toLowerCase().contains("helm") || this.slots[0].getItem().getUnlocalizedName(this.slots[0]).toLowerCase().contains("legging") || this.slots[0].getItem().getUnlocalizedName(this.slots[0]).toLowerCase().contains("boot") || this.slots[0].getItem().getUnlocalizedName(this.slots[0]).toLowerCase().contains("chestp") || this.slots[0].getItem().getUnlocalizedName(this.slots[0]).toLowerCase().contains("pick") + || this.slots[0].getItem().getUnlocalizedName(this.slots[0]).toLowerCase().contains("shovel") || this.slots[0].getItem().getUnlocalizedName(this.slots[0]).toLowerCase().contains("axe") || this.slots[0].getItem().getUnlocalizedName(this.slots[0]).toLowerCase().contains("pick"))) { + return true; + } else { + return false; + } + } - public boolean isOP() { - final int cobblestoneId = OreDictionary.getOreID("blockCobble"); + @Override + public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) { + return false; + } - if (OreDictionary.getOreID(this.slots[0]) == cobblestoneId || this.slots[0].getItem() == Item.getItemFromBlock(Blocks.sand) || this.slots[0].getItem() == Items.potato || this.slots[0].getItem() == Items.porkchop || this.slots[0].getItem() == Items.beef || this.slots[0].getItem() == Items.chicken || this.slots[0].getItem() == Items.fish || this.slots[0].getItem() == Ic2Items.hydratedCoalDust.getItem() || (OreDictionary.getOreName(OreDictionary.getOreID(this.slots[0])).contains("dust"))) { - return true; - } else { - return false; - } - } + @Override + public short getFacing() { + return 0; + } - @Override - public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) { - return false; - } + @Override + public void setFacing(short facing) { - @Override - public short getFacing() { - return 0; - } + } - @Override - public void setFacing(short facing) { + @Override + public boolean wrenchCanRemove(EntityPlayer entityPlayer) { + return true; + } - } + @Override + public float getWrenchDropRate() { + return 1; + } - @Override - public boolean wrenchCanRemove(EntityPlayer entityPlayer) { - return true; - } + @Override + public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { + return new ItemStack(BlockRegistry.emtMachines, 1, 1); + } - @Override - public float getWrenchDropRate() { - return 1; - } + @Override + public String getInventoryName() { + return "Ethereal Macerator"; + } - @Override - public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(BlockRegistry.emtMachines, 1, 1); - } + @Override + public boolean hasCustomInventoryName() { + return false; + } - @Override - public String getInventoryName() { - return "Ethereal Macerator"; - } + @Override + public void openInventory() { - @Override - public boolean hasCustomInventoryName() { - return false; - } + } - @Override - public void openInventory() { + @Override + public void closeInventory() { - } - - @Override - public void closeInventory() { - - } + } } diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/TileEntityIgnisGenerator.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/TileEntityIgnisGenerator.java index 8689ca8..ae38e06 100644 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/TileEntityIgnisGenerator.java +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/TileEntityIgnisGenerator.java @@ -1,73 +1,72 @@ /******************************************************************************* * Copyright (c) 2014 Tombenpotter. * All rights reserved. - * + * * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * + * * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ package electricMagicTools.tombenpotter.electricmagictools.common.tile; +import electricMagicTools.tombenpotter.electricmagictools.common.Config; import ic2.api.energy.prefab.BasicSource; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; import thaumcraft.api.aspects.Aspect; import thaumcraft.common.lib.events.EssentiaHandler; -import electricMagicTools.tombenpotter.electricmagictools.common.Config; -public class TileEntityIgnisGenerator extends TileEntity { - int x; - int y; - int z; - public ForgeDirection orientation; - public static int waitTime; - private BasicSource energySource = new BasicSource(this, 1000000000, 3); +public class TileEntityIgnisGenerator extends TileEntityEMT { + int x; + int y; + int z; + public ForgeDirection orientation; + public static int waitTime; + private BasicSource energySource = new BasicSource(this, 1000000000, 3); - public TileEntityIgnisGenerator() { - orientation = ForgeDirection.getOrientation(1); - waitTime = 30; - } + public TileEntityIgnisGenerator() { + orientation = ForgeDirection.getOrientation(1); + waitTime = 30; + } - @Override - public void updateEntity() { - energySource.updateEntity(); + @Override + public void updateEntity() { + energySource.updateEntity(); - if (waitTime > 0) { - waitTime--; - } + if (waitTime > 0) { + waitTime--; + } - if (waitTime <= 0) { - if ((!this.worldObj.isRemote) && (EssentiaHandler.drainEssentia(this, Aspect.FIRE, ForgeDirection.UNKNOWN, 8))) { - energySource.addEnergy(6000); - } - waitTime = Config.essentiaGeneratorsDelay; - } - } + if (waitTime <= 0) { + if ((!this.worldObj.isRemote) && (EssentiaHandler.drainEssentia(this, Aspect.FIRE, ForgeDirection.UNKNOWN, 8))) { + energySource.addEnergy(6000); + } + waitTime = Config.essentiaGeneratorsDelay; + } + } - @Override - public void onChunkUnload() { - energySource.onChunkUnload(); - } + @Override + public void onChunkUnload() { + energySource.onChunkUnload(); + } - @Override - public void invalidate() { - energySource.invalidate(); - super.invalidate(); - } + @Override + public void invalidate() { + energySource.invalidate(); + super.invalidate(); + } - @Override - public void readFromNBT(NBTTagCompound tag) { - super.readFromNBT(tag); - energySource.readFromNBT(tag); - } + @Override + public void readFromNBT(NBTTagCompound tag) { + super.readFromNBT(tag); + energySource.readFromNBT(tag); + } - @Override - public void writeToNBT(NBTTagCompound tag) { - super.writeToNBT(tag); - energySource.writeToNBT(tag); - } + @Override + public void writeToNBT(NBTTagCompound tag) { + super.writeToNBT(tag); + energySource.writeToNBT(tag); + } } diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/TileEntityIndustrialWandRecharge.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/TileEntityIndustrialWandRecharge.java index 95387f8..9f49448 100644 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/TileEntityIndustrialWandRecharge.java +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/TileEntityIndustrialWandRecharge.java @@ -1,188 +1,187 @@ /******************************************************************************* * Copyright (c) 2014 Tombenpotter. * All rights reserved. - * + * * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * + * * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ package electricMagicTools.tombenpotter.electricmagictools.common.tile; +import electricMagicTools.tombenpotter.electricmagictools.common.Config; import ic2.api.energy.prefab.BasicSink; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import net.minecraft.tileentity.TileEntity; import thaumcraft.api.aspects.Aspect; import thaumcraft.common.items.wands.ItemWandCasting; -import electricMagicTools.tombenpotter.electricmagictools.common.Config; -public class TileEntityIndustrialWandRecharge extends TileEntity implements IInventory { - private BasicSink ic2EnergySink = new BasicSink(this, 100000, 4); +public class TileEntityIndustrialWandRecharge extends TileEntityEMT implements IInventory { + private BasicSink ic2EnergySink = new BasicSink(this, 100000, 4); - ItemStack ItemStacks[]; + ItemStack ItemStacks[]; - public TileEntityIndustrialWandRecharge() { - ItemStacks = new ItemStack[1]; - } + public TileEntityIndustrialWandRecharge() { + ItemStacks = new ItemStack[1]; + } - @Override - public int getSizeInventory() { - return 1; - } + @Override + public int getSizeInventory() { + return 1; + } - @Override - public ItemStack getStackInSlot(int i) { - return ItemStacks[i]; - } + @Override + public ItemStack getStackInSlot(int i) { + return ItemStacks[i]; + } - @Override - public ItemStack decrStackSize(int i, int j) { - if (ItemStacks[i] != null) { + @Override + public ItemStack decrStackSize(int i, int j) { + if (ItemStacks[i] != null) { - if (ItemStacks[i].stackSize <= j) { - ItemStack itemstack = ItemStacks[i]; - ItemStacks[i] = null; - return itemstack; - } else { - ItemStack itemstack1 = ItemStacks[i].splitStack(j); + if (ItemStacks[i].stackSize <= j) { + ItemStack itemstack = ItemStacks[i]; + ItemStacks[i] = null; + return itemstack; + } else { + ItemStack itemstack1 = ItemStacks[i].splitStack(j); - if (ItemStacks[i].stackSize == 0) { - ItemStacks[i] = null; - } + if (ItemStacks[i].stackSize == 0) { + ItemStacks[i] = null; + } - return itemstack1; - } - } else { - return null; - } - } + return itemstack1; + } + } else { + return null; + } + } - @Override - public ItemStack getStackInSlotOnClosing(int i) { - if (ItemStacks[i] != null) { - ItemStack itemstack = ItemStacks[i]; - ItemStacks[i] = null; - return itemstack; - } else { - return null; - } - } + @Override + public ItemStack getStackInSlotOnClosing(int i) { + if (ItemStacks[i] != null) { + ItemStack itemstack = ItemStacks[i]; + ItemStacks[i] = null; + return itemstack; + } else { + return null; + } + } - @Override - public void updateEntity() { - ic2EnergySink.updateEntity(); - if (!this.worldObj.isRemote) { - if (getStackInSlot(0) != null) { + @Override + public void updateEntity() { + ic2EnergySink.updateEntity(); + if (!this.worldObj.isRemote) { + if (getStackInSlot(0) != null) { - ItemStack wand = getStackInSlot(0); + ItemStack wand = getStackInSlot(0); - if (ic2EnergySink.useEnergy(Config.wandChargerConsumption)) { - if (wand != null && wand.getItem() instanceof ItemWandCasting) { - ItemWandCasting wandItem = (ItemWandCasting) wand.getItem(); - wandItem.addVis(wand, Aspect.ORDER, 1, true); - wandItem.addVis(wand, Aspect.FIRE, 1, true); - wandItem.addVis(wand, Aspect.ENTROPY, 1, true); - wandItem.addVis(wand, Aspect.WATER, 1, true); - wandItem.addVis(wand, Aspect.EARTH, 1, true); - wandItem.addVis(wand, Aspect.AIR, 1, true); - } - } - worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); - } - } - } + if (ic2EnergySink.useEnergy(Config.wandChargerConsumption)) { + if (wand != null && wand.getItem() instanceof ItemWandCasting) { + ItemWandCasting wandItem = (ItemWandCasting) wand.getItem(); + wandItem.addVis(wand, Aspect.ORDER, 1, true); + wandItem.addVis(wand, Aspect.FIRE, 1, true); + wandItem.addVis(wand, Aspect.ENTROPY, 1, true); + wandItem.addVis(wand, Aspect.WATER, 1, true); + wandItem.addVis(wand, Aspect.EARTH, 1, true); + wandItem.addVis(wand, Aspect.AIR, 1, true); + } + } + worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); + } + } + } - @Override - public void setInventorySlotContents(int i, ItemStack itemstack) { - ItemStacks[i] = itemstack; + @Override + public void setInventorySlotContents(int i, ItemStack itemstack) { + ItemStacks[i] = itemstack; - if (itemstack != null && itemstack.stackSize > getInventoryStackLimit()) { - itemstack.stackSize = getInventoryStackLimit(); - } - } + if (itemstack != null && itemstack.stackSize > getInventoryStackLimit()) { + itemstack.stackSize = getInventoryStackLimit(); + } + } - public void readFromNBT(NBTTagCompound p_145839_1_) { - super.readFromNBT(p_145839_1_); - NBTTagList nbttaglist = p_145839_1_.getTagList("Items", 10); - this.ItemStacks = new ItemStack[this.getSizeInventory()]; + public void readFromNBT(NBTTagCompound p_145839_1_) { + super.readFromNBT(p_145839_1_); + NBTTagList nbttaglist = p_145839_1_.getTagList("Items", 10); + this.ItemStacks = new ItemStack[this.getSizeInventory()]; - for (int i = 0; i < nbttaglist.tagCount(); ++i) { - NBTTagCompound nbttagcompound1 = nbttaglist.getCompoundTagAt(i); - byte b0 = nbttagcompound1.getByte("Slot"); + for (int i = 0; i < nbttaglist.tagCount(); ++i) { + NBTTagCompound nbttagcompound1 = nbttaglist.getCompoundTagAt(i); + byte b0 = nbttagcompound1.getByte("Slot"); - if (b0 >= 0 && b0 < this.ItemStacks.length) { - this.ItemStacks[b0] = ItemStack.loadItemStackFromNBT(nbttagcompound1); - } - } - } + if (b0 >= 0 && b0 < this.ItemStacks.length) { + this.ItemStacks[b0] = ItemStack.loadItemStackFromNBT(nbttagcompound1); + } + } + } - public void writeToNBT(NBTTagCompound p_145841_1_) { - super.writeToNBT(p_145841_1_); - NBTTagList nbttaglist = new NBTTagList(); + public void writeToNBT(NBTTagCompound p_145841_1_) { + super.writeToNBT(p_145841_1_); + NBTTagList nbttaglist = new NBTTagList(); - for (int i = 0; i < this.ItemStacks.length; ++i) { - if (this.ItemStacks[i] != null) { - NBTTagCompound nbttagcompound1 = new NBTTagCompound(); - nbttagcompound1.setByte("Slot", (byte) i); - this.ItemStacks[i].writeToNBT(nbttagcompound1); - nbttaglist.appendTag(nbttagcompound1); - } - } + for (int i = 0; i < this.ItemStacks.length; ++i) { + if (this.ItemStacks[i] != null) { + NBTTagCompound nbttagcompound1 = new NBTTagCompound(); + nbttagcompound1.setByte("Slot", (byte) i); + this.ItemStacks[i].writeToNBT(nbttagcompound1); + nbttaglist.appendTag(nbttagcompound1); + } + } - p_145841_1_.setTag("Items", nbttaglist); - } + p_145841_1_.setTag("Items", nbttaglist); + } - @Override - public int getInventoryStackLimit() { - return 64; - } + @Override + public int getInventoryStackLimit() { + return 64; + } - @Override - public boolean isUseableByPlayer(EntityPlayer player) { - if (worldObj.getTileEntity(xCoord, yCoord, zCoord) != this) { - return false; - } + @Override + public boolean isUseableByPlayer(EntityPlayer player) { + if (worldObj.getTileEntity(xCoord, yCoord, zCoord) != this) { + return false; + } - return player.getDistanceSq((double) xCoord + 0.5D, (double) yCoord + 0.5D, (double) zCoord + 0.5D) <= 64D; - } + return player.getDistanceSq((double) xCoord + 0.5D, (double) yCoord + 0.5D, (double) zCoord + 0.5D) <= 64D; + } - @Override - public boolean isItemValidForSlot(int i, ItemStack itemstack) { - return true; - } + @Override + public boolean isItemValidForSlot(int i, ItemStack itemstack) { + return true; + } - @Override - public void invalidate() { - ic2EnergySink.invalidate(); - super.invalidate(); - } + @Override + public void invalidate() { + ic2EnergySink.invalidate(); + super.invalidate(); + } - @Override - public void onChunkUnload() { - ic2EnergySink.onChunkUnload(); - } + @Override + public void onChunkUnload() { + ic2EnergySink.onChunkUnload(); + } - @Override - public String getInventoryName() { - return "Industrial Wand Charging Station"; - } + @Override + public String getInventoryName() { + return "Industrial Wand Charging Station"; + } - @Override - public boolean hasCustomInventoryName() { - return false; - } + @Override + public boolean hasCustomInventoryName() { + return false; + } - @Override - public void openInventory() { - } + @Override + public void openInventory() { + } - @Override - public void closeInventory() { - } + @Override + public void closeInventory() { + } } diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/TileEntityPortableNode.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/TileEntityPortableNode.java index d583805..f7a83c3 100644 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/TileEntityPortableNode.java +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/TileEntityPortableNode.java @@ -1,10 +1,10 @@ /******************************************************************************* * Copyright (c) 2014 Tombenpotter. * All rights reserved. - * + * * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * + * * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. * http://www.minecraftforum.net/topic/1585216- @@ -17,17 +17,17 @@ import thaumcraft.common.tiles.TileNode; public class TileEntityPortableNode extends TileNode { - public TileEntityPortableNode() { - super(); - } + public TileEntityPortableNode() { + super(); + } - @Override - public NodeModifier getNodeModifier() { - return NodeModifier.FADING; - } + @Override + public NodeModifier getNodeModifier() { + return NodeModifier.FADING; + } - @Override - public NodeType getNodeType() { - return NodeType.UNSTABLE; - } + @Override + public NodeType getNodeType() { + return NodeType.UNSTABLE; + } } diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/TileEntityPotentiaGenerator.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/TileEntityPotentiaGenerator.java index 949b7d1..3aaa7b7 100644 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/TileEntityPotentiaGenerator.java +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/TileEntityPotentiaGenerator.java @@ -1,75 +1,74 @@ /******************************************************************************* * Copyright (c) 2014 Tombenpotter. * All rights reserved. - * + * * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * + * * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ package electricMagicTools.tombenpotter.electricmagictools.common.tile; +import electricMagicTools.tombenpotter.electricmagictools.common.Config; import ic2.api.energy.prefab.BasicSource; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; import thaumcraft.api.aspects.Aspect; import thaumcraft.common.lib.events.EssentiaHandler; -import electricMagicTools.tombenpotter.electricmagictools.common.Config; -public class TileEntityPotentiaGenerator extends TileEntity { - int x; - int y; - int z; - public ForgeDirection orientation; - public static int waitTime; +public class TileEntityPotentiaGenerator extends TileEntityEMT { + int x; + int y; + int z; + public ForgeDirection orientation; + public static int waitTime; - public TileEntityPotentiaGenerator() { - orientation = ForgeDirection.getOrientation(1); - waitTime = 30; - } + public TileEntityPotentiaGenerator() { + orientation = ForgeDirection.getOrientation(1); + waitTime = 30; + } - private BasicSource energySource = new BasicSource(this, 1000000000, 3); + private BasicSource energySource = new BasicSource(this, 1000000000, 3); - @Override - public void updateEntity() { - energySource.updateEntity(); + @Override + public void updateEntity() { + energySource.updateEntity(); - if (waitTime > 0) { - waitTime--; - } + if (waitTime > 0) { + waitTime--; + } - if (waitTime <= 0) { - if ((!this.worldObj.isRemote) && (EssentiaHandler.drainEssentia(this, Aspect.ENERGY, ForgeDirection.UNKNOWN, 8))) { - energySource.addEnergy(Config.potentiaGenOutput); - } - waitTime = Config.essentiaGeneratorsDelay; - } - } + if (waitTime <= 0) { + if ((!this.worldObj.isRemote) && (EssentiaHandler.drainEssentia(this, Aspect.ENERGY, ForgeDirection.UNKNOWN, 8))) { + energySource.addEnergy(Config.potentiaGenOutput); + } + waitTime = Config.essentiaGeneratorsDelay; + } + } - @Override - public void onChunkUnload() { - energySource.onChunkUnload(); - } + @Override + public void onChunkUnload() { + energySource.onChunkUnload(); + } - @Override - public void invalidate() { - energySource.invalidate(); - super.invalidate(); - onChunkUnload(); - } + @Override + public void invalidate() { + energySource.invalidate(); + super.invalidate(); + onChunkUnload(); + } - @Override - public void readFromNBT(NBTTagCompound tag) { - super.readFromNBT(tag); - energySource.readFromNBT(tag); - } + @Override + public void readFromNBT(NBTTagCompound tag) { + super.readFromNBT(tag); + energySource.readFromNBT(tag); + } - @Override - public void writeToNBT(NBTTagCompound tag) { - super.writeToNBT(tag); - energySource.writeToNBT(tag); - } + @Override + public void writeToNBT(NBTTagCompound tag) { + super.writeToNBT(tag); + energySource.writeToNBT(tag); + } } diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/container/ContainerEtheralMacerator.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/container/ContainerEtheralMacerator.java index 58c676a..b9e407f 100644 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/container/ContainerEtheralMacerator.java +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/container/ContainerEtheralMacerator.java @@ -1,22 +1,19 @@ /******************************************************************************* * Copyright (c) 2014 Tombenpotter. * All rights reserved. - * + * * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * + * * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ package electricMagicTools.tombenpotter.electricmagictools.common.tile.container; +import electricMagicTools.tombenpotter.electricmagictools.common.tile.TileEntityEtherealMacerator; import ic2.core.IC2; import ic2.core.slot.SlotInvSlot; - -import java.util.List; -import java.util.ListIterator; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; @@ -24,105 +21,107 @@ import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import thaumcraft.common.container.SlotOutput; -import electricMagicTools.tombenpotter.electricmagictools.common.tile.TileEntityEtherealMacerator; + +import java.util.List; +import java.util.ListIterator; public class ContainerEtheralMacerator extends Container { - TileEntityEtherealMacerator te; + TileEntityEtherealMacerator te; - public ContainerEtheralMacerator(InventoryPlayer inventory, TileEntity te) { - this.te = ((TileEntityEtherealMacerator) te); - addSlotToContainer(new Slot(this.te, 0, 56, 26)); - addSlotToContainer(new SlotOutput(this.te, 2, 116, 26)); - addSlotToContainer(new SlotOutput(this.te, 1, 116, 53)); - for (int i = 0; i < 3; i++) { - for (int j = 0; j < 9; j++) { - addSlotToContainer(new Slot(inventory, j + i * 9 + 9, 8 + j * 18, 84 + i * 18)); - } - } - for (int i = 0; i < 9; i++) { - addSlotToContainer(new Slot(inventory, i, 8 + i * 18, 142)); - } - } + public ContainerEtheralMacerator(InventoryPlayer inventory, TileEntity te) { + this.te = ((TileEntityEtherealMacerator) te); + addSlotToContainer(new Slot(this.te, 0, 56, 26)); + addSlotToContainer(new SlotOutput(this.te, 2, 116, 26)); + addSlotToContainer(new SlotOutput(this.te, 1, 116, 53)); + for (int i = 0; i < 3; i++) { + for (int j = 0; j < 9; j++) { + addSlotToContainer(new Slot(inventory, j + i * 9 + 9, 8 + j * 18, 84 + i * 18)); + } + } + for (int i = 0; i < 9; i++) { + addSlotToContainer(new Slot(inventory, i, 8 + i * 18, 142)); + } + } - @Override - public boolean canInteractWith(EntityPlayer player) { - return this.te.isUseableByPlayer(player); - } + @Override + public boolean canInteractWith(EntityPlayer player) { + return this.te.isUseableByPlayer(player); + } - @SuppressWarnings("unchecked") - @Override - public final ItemStack transferStackInSlot(EntityPlayer player, int sourceSlotIndex) { - Slot sourceSlot = (Slot) inventorySlots.get(sourceSlotIndex); + @SuppressWarnings("unchecked") + @Override + public final ItemStack transferStackInSlot(EntityPlayer player, int sourceSlotIndex) { + Slot sourceSlot = (Slot) inventorySlots.get(sourceSlotIndex); - if (sourceSlot != null && sourceSlot.getHasStack()) { - ItemStack sourceItemStack = sourceSlot.getStack(); - int oldSourceItemStackSize = sourceItemStack.stackSize; + if (sourceSlot != null && sourceSlot.getHasStack()) { + ItemStack sourceItemStack = sourceSlot.getStack(); + int oldSourceItemStackSize = sourceItemStack.stackSize; - if (sourceSlot.inventory == player.inventory) { // player inventory - // clicked - // 0: fill input existing stacks, 1: fill input empty stacks, 2: - // fill existing stacks, 3: fill empty stacks - for (int run = 0; run < 4 && sourceItemStack.stackSize > 0; run++) { - if (run < 2) { - for (Slot targetSlot : (List) inventorySlots) { - if (targetSlot instanceof SlotInvSlot && ((SlotInvSlot) targetSlot).invSlot.canInput() && targetSlot.isItemValid(sourceItemStack)) { - if (targetSlot.getStack() != null || run == 1) { - mergeItemStack(sourceItemStack, targetSlot.slotNumber, targetSlot.slotNumber + 1, false); + if (sourceSlot.inventory == player.inventory) { // player inventory + // clicked + // 0: fill input existing stacks, 1: fill input empty stacks, 2: + // fill existing stacks, 3: fill empty stacks + for (int run = 0; run < 4 && sourceItemStack.stackSize > 0; run++) { + if (run < 2) { + for (Slot targetSlot : (List) inventorySlots) { + if (targetSlot instanceof SlotInvSlot && ((SlotInvSlot) targetSlot).invSlot.canInput() && targetSlot.isItemValid(sourceItemStack)) { + if (targetSlot.getStack() != null || run == 1) { + mergeItemStack(sourceItemStack, targetSlot.slotNumber, targetSlot.slotNumber + 1, false); - if (sourceItemStack.stackSize == 0) - break; - } - } - } - } else { - for (Slot targetSlot : (List) inventorySlots) { - if (targetSlot.inventory != player.inventory && targetSlot.isItemValid(sourceItemStack)) { - if (targetSlot.getStack() != null || run == 3) { - mergeItemStack(sourceItemStack, targetSlot.slotNumber, targetSlot.slotNumber + 1, false); + if (sourceItemStack.stackSize == 0) + break; + } + } + } + } else { + for (Slot targetSlot : (List) inventorySlots) { + if (targetSlot.inventory != player.inventory && targetSlot.isItemValid(sourceItemStack)) { + if (targetSlot.getStack() != null || run == 3) { + mergeItemStack(sourceItemStack, targetSlot.slotNumber, targetSlot.slotNumber + 1, false); - if (sourceItemStack.stackSize == 0) - break; - } - } - } - } - } - } else { // Shift-Click on a GUIslot of the container - for (int run = 0; run < 2 && sourceItemStack.stackSize > 0; run++) { - for (ListIterator it = ((List) inventorySlots).listIterator(inventorySlots.size()); it.hasPrevious();) { - Slot targetSlot = it.previous(); + if (sourceItemStack.stackSize == 0) + break; + } + } + } + } + } + } else { // Shift-Click on a GUIslot of the container + for (int run = 0; run < 2 && sourceItemStack.stackSize > 0; run++) { + for (ListIterator it = ((List) inventorySlots).listIterator(inventorySlots.size()); it.hasPrevious(); ) { + Slot targetSlot = it.previous(); - if (targetSlot.inventory == player.inventory && targetSlot.isItemValid(sourceItemStack)) { - if (targetSlot.getStack() != null || run == 1) { - mergeItemStack(sourceItemStack, targetSlot.slotNumber, targetSlot.slotNumber + 1, false); + if (targetSlot.inventory == player.inventory && targetSlot.isItemValid(sourceItemStack)) { + if (targetSlot.getStack() != null || run == 1) { + mergeItemStack(sourceItemStack, targetSlot.slotNumber, targetSlot.slotNumber + 1, false); - if (sourceItemStack.stackSize == 0) - break; - } - } - } - } - } + if (sourceItemStack.stackSize == 0) + break; + } + } + } + } + } - if (sourceItemStack.stackSize != oldSourceItemStackSize) { - if (sourceItemStack.stackSize == 0) { - sourceSlot.putStack(null); - } else { - sourceSlot.onPickupFromSlot(player, sourceItemStack); - } + if (sourceItemStack.stackSize != oldSourceItemStackSize) { + if (sourceItemStack.stackSize == 0) { + sourceSlot.putStack(null); + } else { + sourceSlot.onPickupFromSlot(player, sourceItemStack); + } - // vanilla doesn't fully re-sync after processing the slot click - // packet, - // causing a race condition of the client received an old state - // through packet delay after the slot click - // this forces a proper sync - if (IC2.platform.isSimulating()) { - detectAndSendChanges(); - } - } - } + // vanilla doesn't fully re-sync after processing the slot click + // packet, + // causing a race condition of the client received an old state + // through packet delay after the slot click + // this forces a proper sync + if (IC2.platform.isSimulating()) { + detectAndSendChanges(); + } + } + } - return null; - } + return null; + } } diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/container/ContainerIndustrialWandRecharge.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/container/ContainerIndustrialWandRecharge.java index 2603004..23095f4 100644 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/container/ContainerIndustrialWandRecharge.java +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/container/ContainerIndustrialWandRecharge.java @@ -1,129 +1,126 @@ /******************************************************************************* * Copyright (c) 2014 Tombenpotter. * All rights reserved. - * + * * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * + * * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ package electricMagicTools.tombenpotter.electricmagictools.common.tile.container; +import electricMagicTools.tombenpotter.electricmagictools.common.tile.TileEntityIndustrialWandRecharge; import ic2.core.IC2; import ic2.core.slot.SlotInvSlot; - -import java.util.List; -import java.util.ListIterator; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import electricMagicTools.tombenpotter.electricmagictools.common.tile.TileEntityIndustrialWandRecharge; -import electricMagicTools.tombenpotter.electricmagictools.common.tile.slot.SlotWandOnly; + +import java.util.List; +import java.util.ListIterator; public class ContainerIndustrialWandRecharge extends Container { - TileEntityIndustrialWandRecharge charger; - SlotWandOnly wandSlot; + TileEntityIndustrialWandRecharge charger; - public ContainerIndustrialWandRecharge(InventoryPlayer invPlayer, TileEntityIndustrialWandRecharge entity) { - this.charger = entity; + public ContainerIndustrialWandRecharge(InventoryPlayer invPlayer, TileEntityIndustrialWandRecharge entity) { + this.charger = entity; - for (int x = 0; x < 9; x++) { - this.addSlotToContainer(new Slot(invPlayer, x, 8 + x * 18, 142)); - } + for (int x = 0; x < 9; x++) { + this.addSlotToContainer(new Slot(invPlayer, x, 8 + x * 18, 142)); + } - for (int y = 0; y < 3; y++) { - for (int x = 0; x < 9; x++) { - this.addSlotToContainer(new Slot(invPlayer, 9 + x + y * 9, 8 + x * 18, 84 + y * 18)); - } - } + for (int y = 0; y < 3; y++) { + for (int x = 0; x < 9; x++) { + this.addSlotToContainer(new Slot(invPlayer, 9 + x + y * 9, 8 + x * 18, 84 + y * 18)); + } + } - this.addSlotToContainer(this.wandSlot = new SlotWandOnly(this, entity, 0, 80, 35)); - } + this.addSlotToContainer(new Slot(charger, 0, 80, 35)); + } - @Override - public boolean canInteractWith(EntityPlayer player) { - return charger.isUseableByPlayer(player); - } + @Override + public boolean canInteractWith(EntityPlayer player) { + return charger.isUseableByPlayer(player); + } - @SuppressWarnings("unchecked") - @Override - public final ItemStack transferStackInSlot(EntityPlayer player, int sourceSlotIndex) { - Slot sourceSlot = (Slot) inventorySlots.get(sourceSlotIndex); + @SuppressWarnings("unchecked") + @Override + public final ItemStack transferStackInSlot(EntityPlayer player, int sourceSlotIndex) { + Slot sourceSlot = (Slot) inventorySlots.get(sourceSlotIndex); - if (sourceSlot != null && sourceSlot.getHasStack()) { - ItemStack sourceItemStack = sourceSlot.getStack(); - int oldSourceItemStackSize = sourceItemStack.stackSize; + if (sourceSlot != null && sourceSlot.getHasStack()) { + ItemStack sourceItemStack = sourceSlot.getStack(); + int oldSourceItemStackSize = sourceItemStack.stackSize; - if (sourceSlot.inventory == player.inventory) { // player inventory - // clicked - // 0: fill input existing stacks, 1: fill input empty stacks, 2: - // fill existing stacks, 3: fill empty stacks - for (int run = 0; run < 4 && sourceItemStack.stackSize > 0; run++) { - if (run < 2) { - for (Slot targetSlot : (List) inventorySlots) { - if (targetSlot instanceof SlotInvSlot && ((SlotInvSlot) targetSlot).invSlot.canInput() && targetSlot.isItemValid(sourceItemStack)) { - if (targetSlot.getStack() != null || run == 1) { - mergeItemStack(sourceItemStack, targetSlot.slotNumber, targetSlot.slotNumber + 1, false); + if (sourceSlot.inventory == player.inventory) { // player inventory + // clicked + // 0: fill input existing stacks, 1: fill input empty stacks, 2: + // fill existing stacks, 3: fill empty stacks + for (int run = 0; run < 4 && sourceItemStack.stackSize > 0; run++) { + if (run < 2) { + for (Slot targetSlot : (List) inventorySlots) { + if (targetSlot instanceof SlotInvSlot && ((SlotInvSlot) targetSlot).invSlot.canInput() && targetSlot.isItemValid(sourceItemStack)) { + if (targetSlot.getStack() != null || run == 1) { + mergeItemStack(sourceItemStack, targetSlot.slotNumber, targetSlot.slotNumber + 1, false); - if (sourceItemStack.stackSize == 0) - break; - } - } - } - } else { - for (Slot targetSlot : (List) inventorySlots) { - if (targetSlot.inventory != player.inventory && targetSlot.isItemValid(sourceItemStack)) { - if (targetSlot.getStack() != null || run == 3) { - mergeItemStack(sourceItemStack, targetSlot.slotNumber, targetSlot.slotNumber + 1, false); + if (sourceItemStack.stackSize == 0) + break; + } + } + } + } else { + for (Slot targetSlot : (List) inventorySlots) { + if (targetSlot.inventory != player.inventory && targetSlot.isItemValid(sourceItemStack)) { + if (targetSlot.getStack() != null || run == 3) { + mergeItemStack(sourceItemStack, targetSlot.slotNumber, targetSlot.slotNumber + 1, false); - if (sourceItemStack.stackSize == 0) - break; - } - } - } - } - } - } else { // Shift-Click on a GUIslot of the container - for (int run = 0; run < 2 && sourceItemStack.stackSize > 0; run++) { - for (ListIterator it = ((List) inventorySlots).listIterator(inventorySlots.size()); it.hasPrevious();) { - Slot targetSlot = it.previous(); + if (sourceItemStack.stackSize == 0) + break; + } + } + } + } + } + } else { // Shift-Click on a GUIslot of the container + for (int run = 0; run < 2 && sourceItemStack.stackSize > 0; run++) { + for (ListIterator it = ((List) inventorySlots).listIterator(inventorySlots.size()); it.hasPrevious(); ) { + Slot targetSlot = it.previous(); - if (targetSlot.inventory == player.inventory && targetSlot.isItemValid(sourceItemStack)) { - if (targetSlot.getStack() != null || run == 1) { - mergeItemStack(sourceItemStack, targetSlot.slotNumber, targetSlot.slotNumber + 1, false); + if (targetSlot.inventory == player.inventory && targetSlot.isItemValid(sourceItemStack)) { + if (targetSlot.getStack() != null || run == 1) { + mergeItemStack(sourceItemStack, targetSlot.slotNumber, targetSlot.slotNumber + 1, false); - if (sourceItemStack.stackSize == 0) - break; - } - } - } - } - } + if (sourceItemStack.stackSize == 0) + break; + } + } + } + } + } - if (sourceItemStack.stackSize != oldSourceItemStackSize) { - if (sourceItemStack.stackSize == 0) { - sourceSlot.putStack(null); - } else { - sourceSlot.onPickupFromSlot(player, sourceItemStack); - } + if (sourceItemStack.stackSize != oldSourceItemStackSize) { + if (sourceItemStack.stackSize == 0) { + sourceSlot.putStack(null); + } else { + sourceSlot.onPickupFromSlot(player, sourceItemStack); + } - // vanilla doesn't fully re-sync after processing the slot click - // packet, - // causing a race condition of the client received an old state - // through packet delay after the slot click - // this forces a proper sync - if (IC2.platform.isSimulating()) { - detectAndSendChanges(); - } - } - } + // vanilla doesn't fully re-sync after processing the slot click + // packet, + // causing a race condition of the client received an old state + // through packet delay after the slot click + // this forces a proper sync + if (IC2.platform.isSimulating()) { + detectAndSendChanges(); + } + } + } - return null; - } + return null; + } } diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/slot/SlotWandOnly.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/slot/SlotWandOnly.java index 6535687..0dd28d9 100644 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/slot/SlotWandOnly.java +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/slot/SlotWandOnly.java @@ -1,41 +1,41 @@ /******************************************************************************* * Copyright (c) 2014 Tombenpotter. * All rights reserved. - * + * * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * + * * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ package electricMagicTools.tombenpotter.electricmagictools.common.tile.slot; +import electricMagicTools.tombenpotter.electricmagictools.common.tile.container.ContainerIndustrialWandRecharge; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import thaumcraft.common.items.wands.ItemWandCasting; -import electricMagicTools.tombenpotter.electricmagictools.common.tile.container.ContainerIndustrialWandRecharge; public class SlotWandOnly extends Slot { - final ContainerIndustrialWandRecharge charger; + final ContainerIndustrialWandRecharge charger; - public SlotWandOnly(ContainerIndustrialWandRecharge indCharger, IInventory inv, int par3, int par4, int par5) { - super(inv, par3, par4, par5); - this.charger = indCharger; - } + public SlotWandOnly(ContainerIndustrialWandRecharge indCharger, IInventory inv, int par3, int par4, int par5) { + super(inv, par3, par4, par5); + this.charger = indCharger; + } - @Override - public boolean isItemValid(ItemStack par1ItemStack) { - if (!(par1ItemStack.getItem() instanceof ItemWandCasting)) - return false; + @Override + public boolean isItemValid(ItemStack par1ItemStack) { + if (!(par1ItemStack.getItem() instanceof ItemWandCasting)) + return false; - ItemWandCasting wand = (ItemWandCasting) par1ItemStack.getItem(); - return wand.getCap(par1ItemStack).getBaseCostModifier() <= 1F; - } + ItemWandCasting wand = (ItemWandCasting) par1ItemStack.getItem(); + return wand.getCap(par1ItemStack).getBaseCostModifier() <= 1F; + } - @Override - public int getSlotStackLimit() { - return 1; - } + @Override + public int getSlotStackLimit() { + return 1; + } } diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/solars/TileEntityAirSolar.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/solars/TileEntityAirSolar.java index d541626..86d2d17 100644 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/solars/TileEntityAirSolar.java +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/solars/TileEntityAirSolar.java @@ -1,123 +1,120 @@ /******************************************************************************* * Copyright (c) 2014 Tombenpotter. * All rights reserved. - * + * * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * + * * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ package electricMagicTools.tombenpotter.electricmagictools.common.tile.solars; +import electricMagicTools.tombenpotter.electricmagictools.common.BlockRegistry; +import electricMagicTools.tombenpotter.electricmagictools.common.Config; +import electricMagicTools.tombenpotter.electricmagictools.common.tile.TileEntityEMT; import ic2.api.energy.prefab.BasicSource; import ic2.api.tile.IWrenchable; - -import java.util.Random; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import electricMagicTools.tombenpotter.electricmagictools.common.BlockRegistry; -import electricMagicTools.tombenpotter.electricmagictools.common.Config; -public class TileEntityAirSolar extends TileEntity implements IWrenchable { +import java.util.Random; - private BasicSource energySource = new BasicSource(this, 10000, 1); - private static Random random = new Random(); - private boolean initialized; - public boolean theSunIsVisible; - private int tick; - private boolean canRain; - private boolean noSunlight; +public class TileEntityAirSolar extends TileEntityEMT implements IWrenchable { - public TileEntityAirSolar() { - super(); - this.tick = random.nextInt(64); - } + private BasicSource energySource = new BasicSource(this, 10000, 1); + private static Random random = new Random(); + private boolean initialized; + public boolean theSunIsVisible; + private int tick; + private boolean canRain; + private boolean noSunlight; - @Override - public void updateEntity() { - energySource.updateEntity(); - if (!initialized && worldObj != null) { - canRain = worldObj.getWorldChunkManager().getBiomeGenAt(xCoord, zCoord).getIntRainfall() > 0; - noSunlight = worldObj.provider.hasNoSky; - initialized = true; - } - if (noSunlight) { - return; - } - if (tick-- == 0) { - updateSunState(); - tick = 64; - } - int energyProduction = 0; + public TileEntityAirSolar() { + super(); + this.tick = random.nextInt(64); + } - if (theSunIsVisible && this.yCoord >= 160) { - energySource.addEnergy(Config.compressedSolarOutput * 2.5); - } else if (theSunIsVisible) { - energySource.addEnergy(Config.compressedSolarOutput); - } - energySource.addEnergy(energyProduction); - } + @Override + public void updateEntity() { + energySource.updateEntity(); + if (!initialized && worldObj != null) { + canRain = worldObj.getWorldChunkManager().getBiomeGenAt(xCoord, zCoord).getIntRainfall() > 0; + noSunlight = worldObj.provider.hasNoSky; + initialized = true; + } + if (noSunlight) { + return; + } + if (tick-- == 0) { + updateSunState(); + tick = 64; + } - private void updateSunState() { - boolean isRaining = canRain && (worldObj.isRaining() || worldObj.isThundering()); - theSunIsVisible = worldObj.isDaytime() && !isRaining && worldObj.canBlockSeeTheSky(xCoord, yCoord + 1, zCoord); - } + if (theSunIsVisible && this.yCoord >= 160) { + energySource.addEnergy(Config.compressedSolarOutput * 2.5); + } else if (theSunIsVisible) { + energySource.addEnergy(Config.compressedSolarOutput); + } + } - @Override - public void onChunkUnload() { - energySource.onChunkUnload(); - } + private void updateSunState() { + boolean isRaining = canRain && (worldObj.isRaining() || worldObj.isThundering()); + theSunIsVisible = worldObj.isDaytime() && !isRaining && worldObj.canBlockSeeTheSky(xCoord, yCoord + 1, zCoord); + } - @Override - public void invalidate() { - energySource.invalidate(); - super.invalidate(); - } + @Override + public void onChunkUnload() { + energySource.onChunkUnload(); + } - @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { - super.writeToNBT(nbttagcompound); - energySource.writeToNBT(nbttagcompound); - } + @Override + public void invalidate() { + energySource.invalidate(); + super.invalidate(); + } - @Override - public void readFromNBT(NBTTagCompound nbttagcompound) { - super.readFromNBT(nbttagcompound); - energySource.readFromNBT(nbttagcompound); - } + @Override + public void writeToNBT(NBTTagCompound nbttagcompound) { + super.writeToNBT(nbttagcompound); + energySource.writeToNBT(nbttagcompound); + } - @Override - public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) { - return false; - } + @Override + public void readFromNBT(NBTTagCompound nbttagcompound) { + super.readFromNBT(nbttagcompound); + energySource.readFromNBT(nbttagcompound); + } - @Override - public short getFacing() { - return 0; - } + @Override + public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) { + return false; + } - @Override - public void setFacing(short facing) { + @Override + public short getFacing() { + return 0; + } - } + @Override + public void setFacing(short facing) { - @Override - public boolean wrenchCanRemove(EntityPlayer entityPlayer) { - return true; - } + } - @Override - public float getWrenchDropRate() { - return 1; - } + @Override + public boolean wrenchCanRemove(EntityPlayer entityPlayer) { + return true; + } - @Override - public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(BlockRegistry.emtSolars, 1, 15); - } + @Override + public float getWrenchDropRate() { + return 1; + } + + @Override + public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { + return new ItemStack(BlockRegistry.emtSolars, 1, 15); + } } diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/solars/TileEntityCompressedSolar.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/solars/TileEntityCompressedSolar.java index eab1bf7..10ed374 100644 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/solars/TileEntityCompressedSolar.java +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/solars/TileEntityCompressedSolar.java @@ -1,121 +1,118 @@ /******************************************************************************* * Copyright (c) 2014 Tombenpotter. * All rights reserved. - * + * * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * + * * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ package electricMagicTools.tombenpotter.electricmagictools.common.tile.solars; +import electricMagicTools.tombenpotter.electricmagictools.common.BlockRegistry; +import electricMagicTools.tombenpotter.electricmagictools.common.Config; +import electricMagicTools.tombenpotter.electricmagictools.common.tile.TileEntityEMT; import ic2.api.energy.prefab.BasicSource; import ic2.api.tile.IWrenchable; - -import java.util.Random; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import electricMagicTools.tombenpotter.electricmagictools.common.BlockRegistry; -import electricMagicTools.tombenpotter.electricmagictools.common.Config; -public class TileEntityCompressedSolar extends TileEntity implements IWrenchable { +import java.util.Random; - private BasicSource energySource = new BasicSource(this, 10000, 1); - private static Random random = new Random(); - private boolean initialized; - public boolean theSunIsVisible; - private int tick; - private boolean canRain; - private boolean noSunlight; +public class TileEntityCompressedSolar extends TileEntityEMT implements IWrenchable { - public TileEntityCompressedSolar() { - super(); - this.tick = random.nextInt(64); - } + private BasicSource energySource = new BasicSource(this, 10000, 1); + private static Random random = new Random(); + private boolean initialized; + public boolean theSunIsVisible; + private int tick; + private boolean canRain; + private boolean noSunlight; - @Override - public void updateEntity() { - energySource.updateEntity(); - if (!initialized && worldObj != null) { - canRain = worldObj.getWorldChunkManager().getBiomeGenAt(xCoord, zCoord).getIntRainfall() > 0; - noSunlight = worldObj.provider.hasNoSky; - initialized = true; - } - if (noSunlight) { - return; - } - if (tick-- == 0) { - updateSunState(); - tick = 64; - } - int energyProduction = 0; + public TileEntityCompressedSolar() { + super(); + this.tick = random.nextInt(64); + } - if (theSunIsVisible) { - energySource.addEnergy(Config.compressedSolarOutput); - } - energySource.addEnergy(energyProduction); - } + @Override + public void updateEntity() { + energySource.updateEntity(); + if (!initialized && worldObj != null) { + canRain = worldObj.getWorldChunkManager().getBiomeGenAt(xCoord, zCoord).getIntRainfall() > 0; + noSunlight = worldObj.provider.hasNoSky; + initialized = true; + } + if (noSunlight) { + return; + } + if (tick-- == 0) { + updateSunState(); + tick = 64; + } - private void updateSunState() { - boolean isRaining = canRain && (worldObj.isRaining() || worldObj.isThundering()); - theSunIsVisible = worldObj.isDaytime() && !isRaining && worldObj.canBlockSeeTheSky(xCoord, yCoord + 1, zCoord); - } + if (theSunIsVisible) { + energySource.addEnergy(Config.compressedSolarOutput); + } + } - @Override - public void onChunkUnload() { - energySource.onChunkUnload(); - } + private void updateSunState() { + boolean isRaining = canRain && (worldObj.isRaining() || worldObj.isThundering()); + theSunIsVisible = worldObj.isDaytime() && !isRaining && worldObj.canBlockSeeTheSky(xCoord, yCoord + 1, zCoord); + } - @Override - public void invalidate() { - energySource.invalidate(); - super.invalidate(); - } + @Override + public void onChunkUnload() { + energySource.onChunkUnload(); + } - @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { - super.writeToNBT(nbttagcompound); - energySource.writeToNBT(nbttagcompound); - } + @Override + public void invalidate() { + energySource.invalidate(); + super.invalidate(); + } - @Override - public void readFromNBT(NBTTagCompound nbttagcompound) { - super.readFromNBT(nbttagcompound); - energySource.readFromNBT(nbttagcompound); - } + @Override + public void writeToNBT(NBTTagCompound nbttagcompound) { + super.writeToNBT(nbttagcompound); + energySource.writeToNBT(nbttagcompound); + } - @Override - public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) { - return false; - } + @Override + public void readFromNBT(NBTTagCompound nbttagcompound) { + super.readFromNBT(nbttagcompound); + energySource.readFromNBT(nbttagcompound); + } - @Override - public short getFacing() { - return 0; - } + @Override + public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) { + return false; + } - @Override - public void setFacing(short facing) { + @Override + public short getFacing() { + return 0; + } - } + @Override + public void setFacing(short facing) { - @Override - public boolean wrenchCanRemove(EntityPlayer entityPlayer) { - return true; - } + } - @Override - public float getWrenchDropRate() { - return 1; - } + @Override + public boolean wrenchCanRemove(EntityPlayer entityPlayer) { + return true; + } - @Override - public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(BlockRegistry.emtSolars, 1, 0); - } + @Override + public float getWrenchDropRate() { + return 1; + } + + @Override + public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { + return new ItemStack(BlockRegistry.emtSolars, 1, 0); + } } diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/solars/TileEntityDarkSolar.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/solars/TileEntityDarkSolar.java index 054d877..940c436 100644 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/solars/TileEntityDarkSolar.java +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/solars/TileEntityDarkSolar.java @@ -1,120 +1,117 @@ /******************************************************************************* * Copyright (c) 2014 Tombenpotter. * All rights reserved. - * + * * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * + * * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ package electricMagicTools.tombenpotter.electricmagictools.common.tile.solars; +import electricMagicTools.tombenpotter.electricmagictools.common.BlockRegistry; +import electricMagicTools.tombenpotter.electricmagictools.common.Config; +import electricMagicTools.tombenpotter.electricmagictools.common.tile.TileEntityEMT; import ic2.api.energy.prefab.BasicSource; import ic2.api.tile.IWrenchable; - -import java.util.Random; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import electricMagicTools.tombenpotter.electricmagictools.common.BlockRegistry; -import electricMagicTools.tombenpotter.electricmagictools.common.Config; -public class TileEntityDarkSolar extends TileEntity implements IWrenchable { +import java.util.Random; - private BasicSource energySource = new BasicSource(this, 10000, 1); - private static Random random = new Random(); - private boolean initialized; - public boolean theSunIsVisible; - private int tick; - private boolean canRain; - private boolean noSunlight; +public class TileEntityDarkSolar extends TileEntityEMT implements IWrenchable { - public TileEntityDarkSolar() { - super(); - this.tick = random.nextInt(64); - } + private BasicSource energySource = new BasicSource(this, 10000, 1); + private static Random random = new Random(); + private boolean initialized; + public boolean theSunIsVisible; + private int tick; + private boolean canRain; + private boolean noSunlight; - @Override - public void updateEntity() { - energySource.updateEntity(); - if (!initialized && worldObj != null) { - canRain = worldObj.getWorldChunkManager().getBiomeGenAt(xCoord, zCoord).getIntRainfall() > 0; - noSunlight = worldObj.provider.hasNoSky; - initialized = true; - } - if (noSunlight) { - return; - } - if (tick-- == 0) { - updateSunState(); - tick = 64; - } - int energyProduction = 0; - if (worldObj.canBlockSeeTheSky(xCoord, yCoord + 1, zCoord) && worldObj.isDaytime() == false && worldObj.isRaining() == false && worldObj.isThundering() == false) { - energySource.addEnergy(Config.compressedSolarOutput); - } - energySource.addEnergy(energyProduction); - } + public TileEntityDarkSolar() { + super(); + this.tick = random.nextInt(64); + } - private void updateSunState() { - boolean isRaining = canRain && (worldObj.isRaining() || worldObj.isThundering()); - theSunIsVisible = worldObj.isDaytime() && !isRaining && worldObj.canBlockSeeTheSky(xCoord, yCoord + 1, zCoord); - } + @Override + public void updateEntity() { + energySource.updateEntity(); + if (!initialized && worldObj != null) { + canRain = worldObj.getWorldChunkManager().getBiomeGenAt(xCoord, zCoord).getIntRainfall() > 0; + noSunlight = worldObj.provider.hasNoSky; + initialized = true; + } + if (noSunlight) { + return; + } + if (tick-- == 0) { + updateSunState(); + tick = 64; + } + if (worldObj.canBlockSeeTheSky(xCoord, yCoord + 1, zCoord) && worldObj.isDaytime() == false && worldObj.isRaining() == false && worldObj.isThundering() == false) { + energySource.addEnergy(Config.compressedSolarOutput); + } + } - @Override - public void onChunkUnload() { - energySource.onChunkUnload(); - } + private void updateSunState() { + boolean isRaining = canRain && (worldObj.isRaining() || worldObj.isThundering()); + theSunIsVisible = worldObj.isDaytime() && !isRaining && worldObj.canBlockSeeTheSky(xCoord, yCoord + 1, zCoord); + } - @Override - public void invalidate() { - energySource.invalidate(); - super.invalidate(); - } + @Override + public void onChunkUnload() { + energySource.onChunkUnload(); + } - @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { - super.writeToNBT(nbttagcompound); - energySource.writeToNBT(nbttagcompound); - } + @Override + public void invalidate() { + energySource.invalidate(); + super.invalidate(); + } - @Override - public void readFromNBT(NBTTagCompound nbttagcompound) { - super.readFromNBT(nbttagcompound); - energySource.readFromNBT(nbttagcompound); - } + @Override + public void writeToNBT(NBTTagCompound nbttagcompound) { + super.writeToNBT(nbttagcompound); + energySource.writeToNBT(nbttagcompound); + } - @Override - public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) { - return false; - } + @Override + public void readFromNBT(NBTTagCompound nbttagcompound) { + super.readFromNBT(nbttagcompound); + energySource.readFromNBT(nbttagcompound); + } - @Override - public short getFacing() { - return 0; - } + @Override + public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) { + return false; + } - @Override - public void setFacing(short facing) { + @Override + public short getFacing() { + return 0; + } - } + @Override + public void setFacing(short facing) { - @Override - public boolean wrenchCanRemove(EntityPlayer entityPlayer) { - return true; - } + } - @Override - public float getWrenchDropRate() { - return 1; - } + @Override + public boolean wrenchCanRemove(EntityPlayer entityPlayer) { + return true; + } - @Override - public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(BlockRegistry.emtSolars, 1, 6); - } + @Override + public float getWrenchDropRate() { + return 1; + } + + @Override + public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { + return new ItemStack(BlockRegistry.emtSolars, 1, 6); + } } diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/solars/TileEntityDoubleAirSolar.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/solars/TileEntityDoubleAirSolar.java index 7af1242..ec493bf 100644 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/solars/TileEntityDoubleAirSolar.java +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/solars/TileEntityDoubleAirSolar.java @@ -1,123 +1,120 @@ /******************************************************************************* * Copyright (c) 2014 Tombenpotter. * All rights reserved. - * + * * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * + * * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ package electricMagicTools.tombenpotter.electricmagictools.common.tile.solars; +import electricMagicTools.tombenpotter.electricmagictools.common.BlockRegistry; +import electricMagicTools.tombenpotter.electricmagictools.common.Config; +import electricMagicTools.tombenpotter.electricmagictools.common.tile.TileEntityEMT; import ic2.api.energy.prefab.BasicSource; import ic2.api.tile.IWrenchable; - -import java.util.Random; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import electricMagicTools.tombenpotter.electricmagictools.common.BlockRegistry; -import electricMagicTools.tombenpotter.electricmagictools.common.Config; -public class TileEntityDoubleAirSolar extends TileEntity implements IWrenchable { +import java.util.Random; - private BasicSource energySource = new BasicSource(this, 10000, 2); - private static Random random = new Random(); - private boolean initialized; - public boolean theSunIsVisible; - private int tick; - private boolean canRain; - private boolean noSunlight; +public class TileEntityDoubleAirSolar extends TileEntityEMT implements IWrenchable { - public TileEntityDoubleAirSolar() { - super(); - this.tick = random.nextInt(64); - } + private BasicSource energySource = new BasicSource(this, 10000, 2); + private static Random random = new Random(); + private boolean initialized; + public boolean theSunIsVisible; + private int tick; + private boolean canRain; + private boolean noSunlight; - @Override - public void updateEntity() { - energySource.updateEntity(); - if (!initialized && worldObj != null) { - canRain = worldObj.getWorldChunkManager().getBiomeGenAt(xCoord, zCoord).getIntRainfall() > 0; - noSunlight = worldObj.provider.hasNoSky; - initialized = true; - } - if (noSunlight) { - return; - } - if (tick-- == 0) { - updateSunState(); - tick = 64; - } - int energyProduction = 0; + public TileEntityDoubleAirSolar() { + super(); + this.tick = random.nextInt(64); + } - if (theSunIsVisible && this.yCoord >= 160) { - energySource.addEnergy(Config.doubleCompressedSolarOutput * 2.5); - } else if (theSunIsVisible) { - energySource.addEnergy(Config.doubleCompressedSolarOutput); - } - energySource.addEnergy(energyProduction); - } + @Override + public void updateEntity() { + energySource.updateEntity(); + if (!initialized && worldObj != null) { + canRain = worldObj.getWorldChunkManager().getBiomeGenAt(xCoord, zCoord).getIntRainfall() > 0; + noSunlight = worldObj.provider.hasNoSky; + initialized = true; + } + if (noSunlight) { + return; + } + if (tick-- == 0) { + updateSunState(); + tick = 64; + } - private void updateSunState() { - boolean isRaining = canRain && (worldObj.isRaining() || worldObj.isThundering()); - theSunIsVisible = worldObj.isDaytime() && !isRaining && worldObj.canBlockSeeTheSky(xCoord, yCoord + 1, zCoord); - } + if (theSunIsVisible && this.yCoord >= 160) { + energySource.addEnergy(Config.doubleCompressedSolarOutput * 2.5); + } else if (theSunIsVisible) { + energySource.addEnergy(Config.doubleCompressedSolarOutput); + } + } - @Override - public void onChunkUnload() { - energySource.onChunkUnload(); - } + private void updateSunState() { + boolean isRaining = canRain && (worldObj.isRaining() || worldObj.isThundering()); + theSunIsVisible = worldObj.isDaytime() && !isRaining && worldObj.canBlockSeeTheSky(xCoord, yCoord + 1, zCoord); + } - @Override - public void invalidate() { - energySource.invalidate(); - super.invalidate(); - } + @Override + public void onChunkUnload() { + energySource.onChunkUnload(); + } - @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { - super.writeToNBT(nbttagcompound); - energySource.writeToNBT(nbttagcompound); - } + @Override + public void invalidate() { + energySource.invalidate(); + super.invalidate(); + } - @Override - public void readFromNBT(NBTTagCompound nbttagcompound) { - super.readFromNBT(nbttagcompound); - energySource.readFromNBT(nbttagcompound); - } + @Override + public void writeToNBT(NBTTagCompound nbttagcompound) { + super.writeToNBT(nbttagcompound); + energySource.writeToNBT(nbttagcompound); + } - @Override - public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) { - return false; - } + @Override + public void readFromNBT(NBTTagCompound nbttagcompound) { + super.readFromNBT(nbttagcompound); + energySource.readFromNBT(nbttagcompound); + } - @Override - public short getFacing() { - return 0; - } + @Override + public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) { + return false; + } - @Override - public void setFacing(short facing) { + @Override + public short getFacing() { + return 0; + } - } + @Override + public void setFacing(short facing) { - @Override - public boolean wrenchCanRemove(EntityPlayer entityPlayer) { - return true; - } + } - @Override - public float getWrenchDropRate() { - return 1; - } + @Override + public boolean wrenchCanRemove(EntityPlayer entityPlayer) { + return true; + } - @Override - public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(BlockRegistry.emtSolars2, 1, 0); - } + @Override + public float getWrenchDropRate() { + return 1; + } + + @Override + public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { + return new ItemStack(BlockRegistry.emtSolars2, 1, 0); + } } diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/solars/TileEntityDoubleCompressedSolar.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/solars/TileEntityDoubleCompressedSolar.java index e69d210..a6f1312 100644 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/solars/TileEntityDoubleCompressedSolar.java +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/solars/TileEntityDoubleCompressedSolar.java @@ -1,121 +1,118 @@ /******************************************************************************* * Copyright (c) 2014 Tombenpotter. * All rights reserved. - * + * * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * + * * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ package electricMagicTools.tombenpotter.electricmagictools.common.tile.solars; +import electricMagicTools.tombenpotter.electricmagictools.common.BlockRegistry; +import electricMagicTools.tombenpotter.electricmagictools.common.Config; +import electricMagicTools.tombenpotter.electricmagictools.common.tile.TileEntityEMT; import ic2.api.energy.prefab.BasicSource; import ic2.api.tile.IWrenchable; - -import java.util.Random; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import electricMagicTools.tombenpotter.electricmagictools.common.BlockRegistry; -import electricMagicTools.tombenpotter.electricmagictools.common.Config; -public class TileEntityDoubleCompressedSolar extends TileEntity implements IWrenchable { +import java.util.Random; - private BasicSource energySource = new BasicSource(this, 10000, 2); - private static Random random = new Random(); - private boolean initialized; - public boolean theSunIsVisible; - private int tick; - private boolean canRain; - private boolean noSunlight; +public class TileEntityDoubleCompressedSolar extends TileEntityEMT implements IWrenchable { - public TileEntityDoubleCompressedSolar() { - super(); - this.tick = random.nextInt(64); - } + private BasicSource energySource = new BasicSource(this, 10000, 2); + private static Random random = new Random(); + private boolean initialized; + public boolean theSunIsVisible; + private int tick; + private boolean canRain; + private boolean noSunlight; - @Override - public void updateEntity() { - energySource.updateEntity(); - if (!initialized && worldObj != null) { - canRain = worldObj.getWorldChunkManager().getBiomeGenAt(xCoord, zCoord).getIntRainfall() > 0; - noSunlight = worldObj.provider.hasNoSky; - initialized = true; - } - if (noSunlight) { - return; - } - if (tick-- == 0) { - updateSunState(); - tick = 64; - } - int energyProduction = 0; + public TileEntityDoubleCompressedSolar() { + super(); + this.tick = random.nextInt(64); + } - if (theSunIsVisible) { - energySource.addEnergy(Config.doubleCompressedSolarOutput); - } - energySource.addEnergy(energyProduction); - } + @Override + public void updateEntity() { + energySource.updateEntity(); + if (!initialized && worldObj != null) { + canRain = worldObj.getWorldChunkManager().getBiomeGenAt(xCoord, zCoord).getIntRainfall() > 0; + noSunlight = worldObj.provider.hasNoSky; + initialized = true; + } + if (noSunlight) { + return; + } + if (tick-- == 0) { + updateSunState(); + tick = 64; + } - private void updateSunState() { - boolean isRaining = canRain && (worldObj.isRaining() || worldObj.isThundering()); - theSunIsVisible = worldObj.isDaytime() && !isRaining && worldObj.canBlockSeeTheSky(xCoord, yCoord + 1, zCoord); - } + if (theSunIsVisible) { + energySource.addEnergy(Config.doubleCompressedSolarOutput); + } + } - @Override - public void onChunkUnload() { - energySource.onChunkUnload(); - } + private void updateSunState() { + boolean isRaining = canRain && (worldObj.isRaining() || worldObj.isThundering()); + theSunIsVisible = worldObj.isDaytime() && !isRaining && worldObj.canBlockSeeTheSky(xCoord, yCoord + 1, zCoord); + } - @Override - public void invalidate() { - energySource.invalidate(); - super.invalidate(); - } + @Override + public void onChunkUnload() { + energySource.onChunkUnload(); + } - @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { - super.writeToNBT(nbttagcompound); - energySource.writeToNBT(nbttagcompound); - } + @Override + public void invalidate() { + energySource.invalidate(); + super.invalidate(); + } - @Override - public void readFromNBT(NBTTagCompound nbttagcompound) { - super.readFromNBT(nbttagcompound); - energySource.readFromNBT(nbttagcompound); - } + @Override + public void writeToNBT(NBTTagCompound nbttagcompound) { + super.writeToNBT(nbttagcompound); + energySource.writeToNBT(nbttagcompound); + } - @Override - public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) { - return false; - } + @Override + public void readFromNBT(NBTTagCompound nbttagcompound) { + super.readFromNBT(nbttagcompound); + energySource.readFromNBT(nbttagcompound); + } - @Override - public short getFacing() { - return 0; - } + @Override + public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) { + return false; + } - @Override - public void setFacing(short facing) { + @Override + public short getFacing() { + return 0; + } - } + @Override + public void setFacing(short facing) { - @Override - public boolean wrenchCanRemove(EntityPlayer entityPlayer) { - return true; - } + } - @Override - public float getWrenchDropRate() { - return 1; - } + @Override + public boolean wrenchCanRemove(EntityPlayer entityPlayer) { + return true; + } - @Override - public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(BlockRegistry.emtSolars, 1, 1); - } + @Override + public float getWrenchDropRate() { + return 1; + } + + @Override + public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { + return new ItemStack(BlockRegistry.emtSolars, 1, 1); + } } diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/solars/TileEntityDoubleDarkSolar.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/solars/TileEntityDoubleDarkSolar.java index a2403b4..ddf5c57 100644 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/solars/TileEntityDoubleDarkSolar.java +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/solars/TileEntityDoubleDarkSolar.java @@ -1,120 +1,117 @@ /******************************************************************************* * Copyright (c) 2014 Tombenpotter. * All rights reserved. - * + * * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * + * * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ package electricMagicTools.tombenpotter.electricmagictools.common.tile.solars; +import electricMagicTools.tombenpotter.electricmagictools.common.BlockRegistry; +import electricMagicTools.tombenpotter.electricmagictools.common.Config; +import electricMagicTools.tombenpotter.electricmagictools.common.tile.TileEntityEMT; import ic2.api.energy.prefab.BasicSource; import ic2.api.tile.IWrenchable; - -import java.util.Random; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import electricMagicTools.tombenpotter.electricmagictools.common.BlockRegistry; -import electricMagicTools.tombenpotter.electricmagictools.common.Config; -public class TileEntityDoubleDarkSolar extends TileEntity implements IWrenchable { +import java.util.Random; - private BasicSource energySource = new BasicSource(this, 10000, 2); - private static Random random = new Random(); - private boolean initialized; - public boolean theSunIsVisible; - private int tick; - private boolean canRain; - private boolean noSunlight; +public class TileEntityDoubleDarkSolar extends TileEntityEMT implements IWrenchable { - public TileEntityDoubleDarkSolar() { - super(); - this.tick = random.nextInt(64); - } + private BasicSource energySource = new BasicSource(this, 10000, 2); + private static Random random = new Random(); + private boolean initialized; + public boolean theSunIsVisible; + private int tick; + private boolean canRain; + private boolean noSunlight; - @Override - public void updateEntity() { - energySource.updateEntity(); - if (!initialized && worldObj != null) { - canRain = worldObj.getWorldChunkManager().getBiomeGenAt(xCoord, zCoord).getIntRainfall() > 0; - noSunlight = worldObj.provider.hasNoSky; - initialized = true; - } - if (noSunlight) { - return; - } - if (tick-- == 0) { - updateSunState(); - tick = 64; - } - int energyProduction = 0; - if (worldObj.canBlockSeeTheSky(xCoord, yCoord + 1, zCoord) && worldObj.isDaytime() == false && worldObj.isRaining() == false && worldObj.isThundering() == false) { - energySource.addEnergy(Config.doubleCompressedSolarOutput); - } - energySource.addEnergy(energyProduction); - } + public TileEntityDoubleDarkSolar() { + super(); + this.tick = random.nextInt(64); + } - private void updateSunState() { - boolean isRaining = canRain && (worldObj.isRaining() || worldObj.isThundering()); - theSunIsVisible = worldObj.isDaytime() && !isRaining && worldObj.canBlockSeeTheSky(xCoord, yCoord + 1, zCoord); - } + @Override + public void updateEntity() { + energySource.updateEntity(); + if (!initialized && worldObj != null) { + canRain = worldObj.getWorldChunkManager().getBiomeGenAt(xCoord, zCoord).getIntRainfall() > 0; + noSunlight = worldObj.provider.hasNoSky; + initialized = true; + } + if (noSunlight) { + return; + } + if (tick-- == 0) { + updateSunState(); + tick = 64; + } + if (worldObj.canBlockSeeTheSky(xCoord, yCoord + 1, zCoord) && worldObj.isDaytime() == false && worldObj.isRaining() == false && worldObj.isThundering() == false) { + energySource.addEnergy(Config.doubleCompressedSolarOutput); + } + } - @Override - public void onChunkUnload() { - energySource.onChunkUnload(); - } + private void updateSunState() { + boolean isRaining = canRain && (worldObj.isRaining() || worldObj.isThundering()); + theSunIsVisible = worldObj.isDaytime() && !isRaining && worldObj.canBlockSeeTheSky(xCoord, yCoord + 1, zCoord); + } - @Override - public void invalidate() { - energySource.invalidate(); - super.invalidate(); - } + @Override + public void onChunkUnload() { + energySource.onChunkUnload(); + } - @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { - super.writeToNBT(nbttagcompound); - energySource.writeToNBT(nbttagcompound); - } + @Override + public void invalidate() { + energySource.invalidate(); + super.invalidate(); + } - @Override - public void readFromNBT(NBTTagCompound nbttagcompound) { - super.readFromNBT(nbttagcompound); - energySource.readFromNBT(nbttagcompound); - } + @Override + public void writeToNBT(NBTTagCompound nbttagcompound) { + super.writeToNBT(nbttagcompound); + energySource.writeToNBT(nbttagcompound); + } - @Override - public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) { - return false; - } + @Override + public void readFromNBT(NBTTagCompound nbttagcompound) { + super.readFromNBT(nbttagcompound); + energySource.readFromNBT(nbttagcompound); + } - @Override - public short getFacing() { - return 0; - } + @Override + public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) { + return false; + } - @Override - public void setFacing(short facing) { + @Override + public short getFacing() { + return 0; + } - } + @Override + public void setFacing(short facing) { - @Override - public boolean wrenchCanRemove(EntityPlayer entityPlayer) { - return true; - } + } - @Override - public float getWrenchDropRate() { - return 1; - } + @Override + public boolean wrenchCanRemove(EntityPlayer entityPlayer) { + return true; + } - @Override - public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(BlockRegistry.emtSolars, 1, 7); - } + @Override + public float getWrenchDropRate() { + return 1; + } + + @Override + public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { + return new ItemStack(BlockRegistry.emtSolars, 1, 7); + } } diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/solars/TileEntityDoubleEarthSolar.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/solars/TileEntityDoubleEarthSolar.java index 76d7444..904664d 100644 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/solars/TileEntityDoubleEarthSolar.java +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/solars/TileEntityDoubleEarthSolar.java @@ -1,123 +1,120 @@ /******************************************************************************* * Copyright (c) 2014 Tombenpotter. * All rights reserved. - * + * * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * + * * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ package electricMagicTools.tombenpotter.electricmagictools.common.tile.solars; +import electricMagicTools.tombenpotter.electricmagictools.common.BlockRegistry; +import electricMagicTools.tombenpotter.electricmagictools.common.Config; +import electricMagicTools.tombenpotter.electricmagictools.common.tile.TileEntityEMT; import ic2.api.energy.prefab.BasicSource; import ic2.api.tile.IWrenchable; - -import java.util.Random; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import electricMagicTools.tombenpotter.electricmagictools.common.BlockRegistry; -import electricMagicTools.tombenpotter.electricmagictools.common.Config; -public class TileEntityDoubleEarthSolar extends TileEntity implements IWrenchable { +import java.util.Random; - private BasicSource energySource = new BasicSource(this, 10000, 2); - private static Random random = new Random(); - private boolean initialized; - public boolean theSunIsVisible; - private int tick; - private boolean canRain; - private boolean noSunlight; +public class TileEntityDoubleEarthSolar extends TileEntityEMT implements IWrenchable { - public TileEntityDoubleEarthSolar() { - super(); - this.tick = random.nextInt(64); - } + private BasicSource energySource = new BasicSource(this, 10000, 2); + private static Random random = new Random(); + private boolean initialized; + public boolean theSunIsVisible; + private int tick; + private boolean canRain; + private boolean noSunlight; - @Override - public void updateEntity() { - energySource.updateEntity(); - if (!initialized && worldObj != null) { - canRain = worldObj.getWorldChunkManager().getBiomeGenAt(xCoord, zCoord).getIntRainfall() > 0; - noSunlight = worldObj.provider.hasNoSky; - initialized = true; - } - if (noSunlight) { - return; - } - if (tick-- == 0) { - updateSunState(); - tick = 64; - } - int energyProduction = 0; + public TileEntityDoubleEarthSolar() { + super(); + this.tick = random.nextInt(64); + } - if (theSunIsVisible && this.yCoord <= 10) { - energySource.addEnergy(Config.doubleCompressedSolarOutput * 2.5); - } else if (theSunIsVisible) { - energySource.addEnergy(Config.doubleCompressedSolarOutput); - } - energySource.addEnergy(energyProduction); - } + @Override + public void updateEntity() { + energySource.updateEntity(); + if (!initialized && worldObj != null) { + canRain = worldObj.getWorldChunkManager().getBiomeGenAt(xCoord, zCoord).getIntRainfall() > 0; + noSunlight = worldObj.provider.hasNoSky; + initialized = true; + } + if (noSunlight) { + return; + } + if (tick-- == 0) { + updateSunState(); + tick = 64; + } - private void updateSunState() { - boolean isRaining = canRain && (worldObj.isRaining() || worldObj.isThundering()); - theSunIsVisible = worldObj.isDaytime() && !isRaining && worldObj.canBlockSeeTheSky(xCoord, yCoord + 1, zCoord); - } + if (theSunIsVisible && this.yCoord <= 10) { + energySource.addEnergy(Config.doubleCompressedSolarOutput * 2.5); + } else if (theSunIsVisible) { + energySource.addEnergy(Config.doubleCompressedSolarOutput); + } + } - @Override - public void onChunkUnload() { - energySource.onChunkUnload(); - } + private void updateSunState() { + boolean isRaining = canRain && (worldObj.isRaining() || worldObj.isThundering()); + theSunIsVisible = worldObj.isDaytime() && !isRaining && worldObj.canBlockSeeTheSky(xCoord, yCoord + 1, zCoord); + } - @Override - public void invalidate() { - energySource.invalidate(); - super.invalidate(); - } + @Override + public void onChunkUnload() { + energySource.onChunkUnload(); + } - @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { - super.writeToNBT(nbttagcompound); - energySource.writeToNBT(nbttagcompound); - } + @Override + public void invalidate() { + energySource.invalidate(); + super.invalidate(); + } - @Override - public void readFromNBT(NBTTagCompound nbttagcompound) { - super.readFromNBT(nbttagcompound); - energySource.readFromNBT(nbttagcompound); - } + @Override + public void writeToNBT(NBTTagCompound nbttagcompound) { + super.writeToNBT(nbttagcompound); + energySource.writeToNBT(nbttagcompound); + } - @Override - public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) { - return false; - } + @Override + public void readFromNBT(NBTTagCompound nbttagcompound) { + super.readFromNBT(nbttagcompound); + energySource.readFromNBT(nbttagcompound); + } - @Override - public short getFacing() { - return 0; - } + @Override + public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) { + return false; + } - @Override - public void setFacing(short facing) { + @Override + public short getFacing() { + return 0; + } - } + @Override + public void setFacing(short facing) { - @Override - public boolean wrenchCanRemove(EntityPlayer entityPlayer) { - return true; - } + } - @Override - public float getWrenchDropRate() { - return 1; - } + @Override + public boolean wrenchCanRemove(EntityPlayer entityPlayer) { + return true; + } - @Override - public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(BlockRegistry.emtSolars2, 1, 3); - } + @Override + public float getWrenchDropRate() { + return 1; + } + + @Override + public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { + return new ItemStack(BlockRegistry.emtSolars2, 1, 3); + } } diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/solars/TileEntityDoubleFireSolar.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/solars/TileEntityDoubleFireSolar.java index fece14d..cb37253 100644 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/solars/TileEntityDoubleFireSolar.java +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/solars/TileEntityDoubleFireSolar.java @@ -1,124 +1,119 @@ /******************************************************************************* * Copyright (c) 2014 Tombenpotter. * All rights reserved. - * + * * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * + * * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ package electricMagicTools.tombenpotter.electricmagictools.common.tile.solars; +import electricMagicTools.tombenpotter.electricmagictools.common.BlockRegistry; +import electricMagicTools.tombenpotter.electricmagictools.common.Config; +import electricMagicTools.tombenpotter.electricmagictools.common.tile.TileEntityEMT; import ic2.api.energy.prefab.BasicSource; import ic2.api.tile.IWrenchable; - -import java.util.Random; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import electricMagicTools.tombenpotter.electricmagictools.common.BlockRegistry; -import electricMagicTools.tombenpotter.electricmagictools.common.Config; -public class TileEntityDoubleFireSolar extends TileEntity implements IWrenchable { +import java.util.Random; - private BasicSource energySource = new BasicSource(this, 10000, 3); - private static Random random = new Random(); - private boolean initialized; - public boolean theSunIsVisible; - private int tick; - private boolean canRain; - private boolean noSunlight; +public class TileEntityDoubleFireSolar extends TileEntityEMT implements IWrenchable { - public TileEntityDoubleFireSolar() { - super(); - this.tick = random.nextInt(64); - } + private BasicSource energySource = new BasicSource(this, 10000, 3); + private static Random random = new Random(); + private boolean initialized; + public boolean theSunIsVisible; + private int tick; + private boolean canRain; - @Override - public void updateEntity() { - energySource.updateEntity(); - if (!initialized && worldObj != null) { - canRain = worldObj.getWorldChunkManager().getBiomeGenAt(xCoord, zCoord).getIntRainfall() > 0; - noSunlight = worldObj.provider.hasNoSky; - initialized = true; - } - if (noSunlight) { - return; - } - if (tick-- == 0) { - updateSunState(); - tick = 64; - } - int energyProduction = 0; + public TileEntityDoubleFireSolar() { + super(); + this.tick = random.nextInt(64); + } - if (theSunIsVisible) { - energySource.addEnergy(Config.doubleCompressedSolarOutput); - } - if (worldObj.provider.dimensionId == -1) { - energySource.addEnergy(Config.doubleCompressedSolarOutput * 2); - } - energySource.addEnergy(energyProduction); - } + @Override + public void updateEntity() { + energySource.updateEntity(); - private void updateSunState() { - boolean isRaining = canRain && (worldObj.isRaining() || worldObj.isThundering()); - theSunIsVisible = worldObj.isDaytime() && !isRaining && worldObj.canBlockSeeTheSky(xCoord, yCoord + 1, zCoord); - } + if (!initialized && worldObj != null) { + canRain = worldObj.getWorldChunkManager().getBiomeGenAt(xCoord, zCoord).getIntRainfall() > 0; + initialized = true; + } - @Override - public void onChunkUnload() { - energySource.onChunkUnload(); - } + if (worldObj.provider.dimensionId == -1) { + energySource.addEnergy(Config.doubleCompressedSolarOutput * 2); + } else { + if (tick-- == 0) { + updateSunState(); + tick = 64; + } - @Override - public void invalidate() { - energySource.invalidate(); - super.invalidate(); - } + if (theSunIsVisible) { + energySource.addEnergy(Config.doubleCompressedSolarOutput); + } + } + } - @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { - super.writeToNBT(nbttagcompound); - energySource.writeToNBT(nbttagcompound); - } + private void updateSunState() { + boolean isRaining = canRain && (worldObj.isRaining() || worldObj.isThundering()); + theSunIsVisible = worldObj.isDaytime() && !isRaining && worldObj.canBlockSeeTheSky(xCoord, yCoord + 1, zCoord); + } - @Override - public void readFromNBT(NBTTagCompound nbttagcompound) { - super.readFromNBT(nbttagcompound); - energySource.readFromNBT(nbttagcompound); - } + @Override + public void onChunkUnload() { + energySource.onChunkUnload(); + } - @Override - public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) { - return false; - } + @Override + public void invalidate() { + energySource.invalidate(); + super.invalidate(); + } - @Override - public short getFacing() { - return 0; - } + @Override + public void writeToNBT(NBTTagCompound nbttagcompound) { + super.writeToNBT(nbttagcompound); + energySource.writeToNBT(nbttagcompound); + } - @Override - public void setFacing(short facing) { + @Override + public void readFromNBT(NBTTagCompound nbttagcompound) { + super.readFromNBT(nbttagcompound); + energySource.readFromNBT(nbttagcompound); + } - } + @Override + public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) { + return false; + } - @Override - public boolean wrenchCanRemove(EntityPlayer entityPlayer) { - return true; - } + @Override + public short getFacing() { + return 0; + } - @Override - public float getWrenchDropRate() { - return 1; - } + @Override + public void setFacing(short facing) { - @Override - public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(BlockRegistry.emtSolars, 1, 13); - } + } + + @Override + public boolean wrenchCanRemove(EntityPlayer entityPlayer) { + return true; + } + + @Override + public float getWrenchDropRate() { + return 1; + } + + @Override + public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { + return new ItemStack(BlockRegistry.emtSolars, 1, 13); + } } diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/solars/TileEntityDoubleOrderSolar.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/solars/TileEntityDoubleOrderSolar.java index 1fd406c..160b93e 100644 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/solars/TileEntityDoubleOrderSolar.java +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/solars/TileEntityDoubleOrderSolar.java @@ -1,121 +1,117 @@ /******************************************************************************* * Copyright (c) 2014 Tombenpotter. * All rights reserved. - * + * * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * + * * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ package electricMagicTools.tombenpotter.electricmagictools.common.tile.solars; +import electricMagicTools.tombenpotter.electricmagictools.common.BlockRegistry; +import electricMagicTools.tombenpotter.electricmagictools.common.Config; +import electricMagicTools.tombenpotter.electricmagictools.common.tile.TileEntityEMT; import ic2.api.energy.prefab.BasicSource; import ic2.api.tile.IWrenchable; - -import java.util.Random; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import electricMagicTools.tombenpotter.electricmagictools.common.BlockRegistry; -import electricMagicTools.tombenpotter.electricmagictools.common.Config; -public class TileEntityDoubleOrderSolar extends TileEntity implements IWrenchable { +import java.util.Random; - private BasicSource energySource = new BasicSource(this, 10000, 3); - private static Random random = new Random(); - private boolean initialized; - public boolean theSunIsVisible; - private int tick; - private boolean canRain; - private boolean noSunlight; +public class TileEntityDoubleOrderSolar extends TileEntityEMT implements IWrenchable { - public TileEntityDoubleOrderSolar() { - super(); - this.tick = random.nextInt(64); - } + private BasicSource energySource = new BasicSource(this, 10000, 3); + private static Random random = new Random(); + private boolean initialized; + public boolean theSunIsVisible; + private int tick; + private boolean canRain; + private boolean noSunlight; - @Override - public void updateEntity() { - energySource.updateEntity(); - if (!initialized && worldObj != null) { - canRain = worldObj.getWorldChunkManager().getBiomeGenAt(xCoord, zCoord).getIntRainfall() > 0; - noSunlight = worldObj.provider.hasNoSky; - initialized = true; - } - if (noSunlight) { - return; - } - if (tick-- == 0) { - updateSunState(); - tick = 64; - } - int energyProduction = 0; + public TileEntityDoubleOrderSolar() { + super(); + this.tick = random.nextInt(64); + } - if (theSunIsVisible) { - energySource.addEnergy(Config.doubleCompressedSolarOutput * 3); - } - energySource.addEnergy(energyProduction); - } + @Override + public void updateEntity() { + energySource.updateEntity(); + if (!initialized && worldObj != null) { + canRain = worldObj.getWorldChunkManager().getBiomeGenAt(xCoord, zCoord).getIntRainfall() > 0; + noSunlight = worldObj.provider.hasNoSky; + initialized = true; + } + if (noSunlight) { + return; + } + if (tick-- == 0) { + updateSunState(); + tick = 64; + } + if (theSunIsVisible) { + energySource.addEnergy(Config.doubleCompressedSolarOutput * 3); + } + } - private void updateSunState() { - boolean isRaining = canRain && (worldObj.isRaining() || worldObj.isThundering()); - theSunIsVisible = worldObj.isDaytime() && !isRaining && worldObj.canBlockSeeTheSky(xCoord, yCoord + 1, zCoord); - } + private void updateSunState() { + boolean isRaining = canRain && (worldObj.isRaining() || worldObj.isThundering()); + theSunIsVisible = worldObj.isDaytime() && !isRaining && worldObj.canBlockSeeTheSky(xCoord, yCoord + 1, zCoord); + } - @Override - public void onChunkUnload() { - energySource.onChunkUnload(); - } + @Override + public void onChunkUnload() { + energySource.onChunkUnload(); + } - @Override - public void invalidate() { - energySource.invalidate(); - super.invalidate(); - } + @Override + public void invalidate() { + energySource.invalidate(); + super.invalidate(); + } - @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { - super.writeToNBT(nbttagcompound); - energySource.writeToNBT(nbttagcompound); - } + @Override + public void writeToNBT(NBTTagCompound nbttagcompound) { + super.writeToNBT(nbttagcompound); + energySource.writeToNBT(nbttagcompound); + } - @Override - public void readFromNBT(NBTTagCompound nbttagcompound) { - super.readFromNBT(nbttagcompound); - energySource.readFromNBT(nbttagcompound); - } + @Override + public void readFromNBT(NBTTagCompound nbttagcompound) { + super.readFromNBT(nbttagcompound); + energySource.readFromNBT(nbttagcompound); + } - @Override - public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) { - return false; - } + @Override + public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) { + return false; + } - @Override - public short getFacing() { - return 0; - } + @Override + public short getFacing() { + return 0; + } - @Override - public void setFacing(short facing) { + @Override + public void setFacing(short facing) { - } + } - @Override - public boolean wrenchCanRemove(EntityPlayer entityPlayer) { - return true; - } + @Override + public boolean wrenchCanRemove(EntityPlayer entityPlayer) { + return true; + } - @Override - public float getWrenchDropRate() { - return 1; - } + @Override + public float getWrenchDropRate() { + return 1; + } - @Override - public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(BlockRegistry.emtSolars, 1, 10); - } + @Override + public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { + return new ItemStack(BlockRegistry.emtSolars, 1, 10); + } } diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/solars/TileEntityDoubleWaterSolar.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/solars/TileEntityDoubleWaterSolar.java index e4dad71..2ea705b 100644 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/solars/TileEntityDoubleWaterSolar.java +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/solars/TileEntityDoubleWaterSolar.java @@ -1,121 +1,118 @@ /******************************************************************************* * Copyright (c) 2014 Tombenpotter. * All rights reserved. - * + * * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * + * * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ package electricMagicTools.tombenpotter.electricmagictools.common.tile.solars; +import electricMagicTools.tombenpotter.electricmagictools.common.BlockRegistry; +import electricMagicTools.tombenpotter.electricmagictools.common.Config; +import electricMagicTools.tombenpotter.electricmagictools.common.tile.TileEntityEMT; import ic2.api.energy.prefab.BasicSource; import ic2.api.tile.IWrenchable; - -import java.util.Random; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import electricMagicTools.tombenpotter.electricmagictools.common.BlockRegistry; -import electricMagicTools.tombenpotter.electricmagictools.common.Config; -public class TileEntityDoubleWaterSolar extends TileEntity implements IWrenchable { +import java.util.Random; - private BasicSource energySource = new BasicSource(this, 10000, 2); - private static Random random = new Random(); - private boolean initialized; - public boolean theSunIsVisible; - private int tick; - private boolean canRain; - private boolean noSunlight; +public class TileEntityDoubleWaterSolar extends TileEntityEMT implements IWrenchable { - public TileEntityDoubleWaterSolar() { - super(); - this.tick = random.nextInt(64); - } + private BasicSource energySource = new BasicSource(this, 10000, 2); + private static Random random = new Random(); + private boolean initialized; + public boolean theSunIsVisible; + private int tick; + private boolean canRain; + private boolean noSunlight; - @Override - public void updateEntity() { - energySource.updateEntity(); - if (!initialized && worldObj != null) { - canRain = worldObj.getWorldChunkManager().getBiomeGenAt(xCoord, zCoord).getIntRainfall() > 0; - noSunlight = worldObj.provider.hasNoSky; - initialized = true; - } - if (noSunlight) { - return; - } - if (tick-- == 0) { - updateSunState(); - tick = 64; - } - int energyProduction = 0; + public TileEntityDoubleWaterSolar() { + super(); + this.tick = random.nextInt(64); + } - if (worldObj.isRaining() && worldObj.canBlockSeeTheSky(xCoord, yCoord + 1, zCoord) || worldObj.isThundering() && worldObj.canBlockSeeTheSky(xCoord, yCoord + 1, zCoord)) { - energySource.addEnergy(Config.doubleCompressedSolarOutput); - } - energySource.addEnergy(energyProduction); - } + @Override + public void updateEntity() { + energySource.updateEntity(); + if (!initialized && worldObj != null) { + canRain = worldObj.getWorldChunkManager().getBiomeGenAt(xCoord, zCoord).getIntRainfall() > 0; + noSunlight = worldObj.provider.hasNoSky; + initialized = true; + } + if (noSunlight) { + return; + } + if (tick-- == 0) { + updateSunState(); + tick = 64; + } - private void updateSunState() { - boolean isRaining = canRain && (worldObj.isRaining() || worldObj.isThundering()); - theSunIsVisible = worldObj.isDaytime() && !isRaining && worldObj.canBlockSeeTheSky(xCoord, yCoord + 1, zCoord); - } + if (worldObj.isRaining() && worldObj.canBlockSeeTheSky(xCoord, yCoord + 1, zCoord) || worldObj.isThundering() && worldObj.canBlockSeeTheSky(xCoord, yCoord + 1, zCoord)) { + energySource.addEnergy(Config.doubleCompressedSolarOutput); + } + } - @Override - public void onChunkUnload() { - energySource.onChunkUnload(); - } + private void updateSunState() { + boolean isRaining = canRain && (worldObj.isRaining() || worldObj.isThundering()); + theSunIsVisible = worldObj.isDaytime() && !isRaining && worldObj.canBlockSeeTheSky(xCoord, yCoord + 1, zCoord); + } - @Override - public void invalidate() { - energySource.invalidate(); - super.invalidate(); - } + @Override + public void onChunkUnload() { + energySource.onChunkUnload(); + } - @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { - super.writeToNBT(nbttagcompound); - energySource.writeToNBT(nbttagcompound); - } + @Override + public void invalidate() { + energySource.invalidate(); + super.invalidate(); + } - @Override - public void readFromNBT(NBTTagCompound nbttagcompound) { - super.readFromNBT(nbttagcompound); - energySource.readFromNBT(nbttagcompound); - } + @Override + public void writeToNBT(NBTTagCompound nbttagcompound) { + super.writeToNBT(nbttagcompound); + energySource.writeToNBT(nbttagcompound); + } - @Override - public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) { - return false; - } + @Override + public void readFromNBT(NBTTagCompound nbttagcompound) { + super.readFromNBT(nbttagcompound); + energySource.readFromNBT(nbttagcompound); + } - @Override - public short getFacing() { - return 0; - } + @Override + public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) { + return false; + } - @Override - public void setFacing(short facing) { + @Override + public short getFacing() { + return 0; + } - } + @Override + public void setFacing(short facing) { - @Override - public boolean wrenchCanRemove(EntityPlayer entityPlayer) { - return true; - } + } - @Override - public float getWrenchDropRate() { - return 1; - } + @Override + public boolean wrenchCanRemove(EntityPlayer entityPlayer) { + return true; + } - @Override - public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(BlockRegistry.emtSolars, 1, 4); - } + @Override + public float getWrenchDropRate() { + return 1; + } + + @Override + public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { + return new ItemStack(BlockRegistry.emtSolars, 1, 4); + } } diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/solars/TileEntityEarthSolar.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/solars/TileEntityEarthSolar.java index b71e35b..897d0aa 100644 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/solars/TileEntityEarthSolar.java +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/solars/TileEntityEarthSolar.java @@ -1,123 +1,120 @@ /******************************************************************************* * Copyright (c) 2014 Tombenpotter. * All rights reserved. - * + * * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * + * * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ package electricMagicTools.tombenpotter.electricmagictools.common.tile.solars; +import electricMagicTools.tombenpotter.electricmagictools.common.BlockRegistry; +import electricMagicTools.tombenpotter.electricmagictools.common.Config; +import electricMagicTools.tombenpotter.electricmagictools.common.tile.TileEntityEMT; import ic2.api.energy.prefab.BasicSource; import ic2.api.tile.IWrenchable; - -import java.util.Random; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import electricMagicTools.tombenpotter.electricmagictools.common.BlockRegistry; -import electricMagicTools.tombenpotter.electricmagictools.common.Config; -public class TileEntityEarthSolar extends TileEntity implements IWrenchable { +import java.util.Random; - private BasicSource energySource = new BasicSource(this, 10000, 1); - private static Random random = new Random(); - private boolean initialized; - public boolean theSunIsVisible; - private int tick; - private boolean canRain; - private boolean noSunlight; +public class TileEntityEarthSolar extends TileEntityEMT implements IWrenchable { - public TileEntityEarthSolar() { - super(); - this.tick = random.nextInt(64); - } + private BasicSource energySource = new BasicSource(this, 10000, 1); + private static Random random = new Random(); + private boolean initialized; + public boolean theSunIsVisible; + private int tick; + private boolean canRain; + private boolean noSunlight; - @Override - public void updateEntity() { - energySource.updateEntity(); - if (!initialized && worldObj != null) { - canRain = worldObj.getWorldChunkManager().getBiomeGenAt(xCoord, zCoord).getIntRainfall() > 0; - noSunlight = worldObj.provider.hasNoSky; - initialized = true; - } - if (noSunlight) { - return; - } - if (tick-- == 0) { - updateSunState(); - tick = 64; - } - int energyProduction = 0; + public TileEntityEarthSolar() { + super(); + this.tick = random.nextInt(64); + } - if (theSunIsVisible && this.yCoord <= 10) { - energySource.addEnergy(Config.compressedSolarOutput * 2.5); - } else if (theSunIsVisible) { - energySource.addEnergy(Config.compressedSolarOutput); - } - energySource.addEnergy(energyProduction); - } + @Override + public void updateEntity() { + energySource.updateEntity(); + if (!initialized && worldObj != null) { + canRain = worldObj.getWorldChunkManager().getBiomeGenAt(xCoord, zCoord).getIntRainfall() > 0; + noSunlight = worldObj.provider.hasNoSky; + initialized = true; + } + if (noSunlight) { + return; + } + if (tick-- == 0) { + updateSunState(); + tick = 64; + } - private void updateSunState() { - boolean isRaining = canRain && (worldObj.isRaining() || worldObj.isThundering()); - theSunIsVisible = worldObj.isDaytime() && !isRaining && worldObj.canBlockSeeTheSky(xCoord, yCoord + 1, zCoord); - } + if (theSunIsVisible && this.yCoord <= 10) { + energySource.addEnergy(Config.compressedSolarOutput * 2.5); + } else if (theSunIsVisible) { + energySource.addEnergy(Config.compressedSolarOutput); + } + } - @Override - public void onChunkUnload() { - energySource.onChunkUnload(); - } + private void updateSunState() { + boolean isRaining = canRain && (worldObj.isRaining() || worldObj.isThundering()); + theSunIsVisible = worldObj.isDaytime() && !isRaining && worldObj.canBlockSeeTheSky(xCoord, yCoord + 1, zCoord); + } - @Override - public void invalidate() { - energySource.invalidate(); - super.invalidate(); - } + @Override + public void onChunkUnload() { + energySource.onChunkUnload(); + } - @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { - super.writeToNBT(nbttagcompound); - energySource.writeToNBT(nbttagcompound); - } + @Override + public void invalidate() { + energySource.invalidate(); + super.invalidate(); + } - @Override - public void readFromNBT(NBTTagCompound nbttagcompound) { - super.readFromNBT(nbttagcompound); - energySource.readFromNBT(nbttagcompound); - } + @Override + public void writeToNBT(NBTTagCompound nbttagcompound) { + super.writeToNBT(nbttagcompound); + energySource.writeToNBT(nbttagcompound); + } - @Override - public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) { - return false; - } + @Override + public void readFromNBT(NBTTagCompound nbttagcompound) { + super.readFromNBT(nbttagcompound); + energySource.readFromNBT(nbttagcompound); + } - @Override - public short getFacing() { - return 0; - } + @Override + public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) { + return false; + } - @Override - public void setFacing(short facing) { + @Override + public short getFacing() { + return 0; + } - } + @Override + public void setFacing(short facing) { - @Override - public boolean wrenchCanRemove(EntityPlayer entityPlayer) { - return true; - } + } - @Override - public float getWrenchDropRate() { - return 1; - } + @Override + public boolean wrenchCanRemove(EntityPlayer entityPlayer) { + return true; + } - @Override - public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(BlockRegistry.emtSolars2, 1, 2); - } + @Override + public float getWrenchDropRate() { + return 1; + } + + @Override + public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { + return new ItemStack(BlockRegistry.emtSolars2, 1, 2); + } } diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/solars/TileEntityFireSolar.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/solars/TileEntityFireSolar.java index bb528d4..88255d4 100644 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/solars/TileEntityFireSolar.java +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/solars/TileEntityFireSolar.java @@ -1,124 +1,119 @@ /******************************************************************************* * Copyright (c) 2014 Tombenpotter. * All rights reserved. - * + * * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * + * * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ package electricMagicTools.tombenpotter.electricmagictools.common.tile.solars; +import electricMagicTools.tombenpotter.electricmagictools.common.BlockRegistry; +import electricMagicTools.tombenpotter.electricmagictools.common.Config; +import electricMagicTools.tombenpotter.electricmagictools.common.tile.TileEntityEMT; import ic2.api.energy.prefab.BasicSource; import ic2.api.tile.IWrenchable; - -import java.util.Random; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import electricMagicTools.tombenpotter.electricmagictools.common.BlockRegistry; -import electricMagicTools.tombenpotter.electricmagictools.common.Config; -public class TileEntityFireSolar extends TileEntity implements IWrenchable { +import java.util.Random; - private BasicSource energySource = new BasicSource(this, 10000, 1); - private static Random random = new Random(); - private boolean initialized; - public boolean theSunIsVisible; - private int tick; - private boolean canRain; - private boolean noSunlight; +public class TileEntityFireSolar extends TileEntityEMT implements IWrenchable { - public TileEntityFireSolar() { - super(); - this.tick = random.nextInt(64); - } + private BasicSource energySource = new BasicSource(this, 10000, 1); + private static Random random = new Random(); + private boolean initialized; + public boolean theSunIsVisible; + private int tick; + private boolean canRain; - @Override - public void updateEntity() { - energySource.updateEntity(); - if (!initialized && worldObj != null) { - canRain = worldObj.getWorldChunkManager().getBiomeGenAt(xCoord, zCoord).getIntRainfall() > 0; - noSunlight = worldObj.provider.hasNoSky; - initialized = true; - } - if (noSunlight) { - return; - } - if (tick-- == 0) { - updateSunState(); - tick = 64; - } - int energyProduction = 0; + public TileEntityFireSolar() { + super(); + this.tick = random.nextInt(64); + } - if (theSunIsVisible) { - energySource.addEnergy(Config.compressedSolarOutput); - } - if (worldObj.provider.dimensionId == -1) { - energySource.addEnergy(Config.compressedSolarOutput * 2); - } - energySource.addEnergy(energyProduction); - } + @Override + public void updateEntity() { + energySource.updateEntity(); - private void updateSunState() { - boolean isRaining = canRain && (worldObj.isRaining() || worldObj.isThundering()); - theSunIsVisible = worldObj.isDaytime() && !isRaining && worldObj.canBlockSeeTheSky(xCoord, yCoord + 1, zCoord); - } + if (!initialized && worldObj != null) { + canRain = worldObj.getWorldChunkManager().getBiomeGenAt(xCoord, zCoord).getIntRainfall() > 0; + initialized = true; + } - @Override - public void onChunkUnload() { - energySource.onChunkUnload(); - } + if (worldObj.provider.dimensionId == -1) { + energySource.addEnergy(Config.compressedSolarOutput * 2); + } else { + if (tick-- == 0) { + updateSunState(); + tick = 64; + } - @Override - public void invalidate() { - energySource.invalidate(); - super.invalidate(); - } + if (theSunIsVisible) { + energySource.addEnergy(Config.compressedSolarOutput); + } + } + } - @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { - super.writeToNBT(nbttagcompound); - energySource.writeToNBT(nbttagcompound); - } + private void updateSunState() { + boolean isRaining = canRain && (worldObj.isRaining() || worldObj.isThundering()); + theSunIsVisible = worldObj.isDaytime() && !isRaining && worldObj.canBlockSeeTheSky(xCoord, yCoord + 1, zCoord); + } - @Override - public void readFromNBT(NBTTagCompound nbttagcompound) { - super.readFromNBT(nbttagcompound); - energySource.readFromNBT(nbttagcompound); - } + @Override + public void onChunkUnload() { + energySource.onChunkUnload(); + } - @Override - public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) { - return false; - } + @Override + public void invalidate() { + energySource.invalidate(); + super.invalidate(); + } - @Override - public short getFacing() { - return 0; - } + @Override + public void writeToNBT(NBTTagCompound nbttagcompound) { + super.writeToNBT(nbttagcompound); + energySource.writeToNBT(nbttagcompound); + } - @Override - public void setFacing(short facing) { + @Override + public void readFromNBT(NBTTagCompound nbttagcompound) { + super.readFromNBT(nbttagcompound); + energySource.readFromNBT(nbttagcompound); + } - } + @Override + public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) { + return false; + } - @Override - public boolean wrenchCanRemove(EntityPlayer entityPlayer) { - return true; - } + @Override + public short getFacing() { + return 0; + } - @Override - public float getWrenchDropRate() { - return 1; - } + @Override + public void setFacing(short facing) { - @Override - public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(BlockRegistry.emtSolars, 1, 12); - } + } + + @Override + public boolean wrenchCanRemove(EntityPlayer entityPlayer) { + return true; + } + + @Override + public float getWrenchDropRate() { + return 1; + } + + @Override + public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { + return new ItemStack(BlockRegistry.emtSolars, 1, 12); + } } diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/solars/TileEntityOrderSolar.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/solars/TileEntityOrderSolar.java index 8700413..730e95c 100644 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/solars/TileEntityOrderSolar.java +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/solars/TileEntityOrderSolar.java @@ -1,121 +1,118 @@ /******************************************************************************* * Copyright (c) 2014 Tombenpotter. * All rights reserved. - * + * * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * + * * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ package electricMagicTools.tombenpotter.electricmagictools.common.tile.solars; +import electricMagicTools.tombenpotter.electricmagictools.common.BlockRegistry; +import electricMagicTools.tombenpotter.electricmagictools.common.Config; +import electricMagicTools.tombenpotter.electricmagictools.common.tile.TileEntityEMT; import ic2.api.energy.prefab.BasicSource; import ic2.api.tile.IWrenchable; - -import java.util.Random; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import electricMagicTools.tombenpotter.electricmagictools.common.BlockRegistry; -import electricMagicTools.tombenpotter.electricmagictools.common.Config; -public class TileEntityOrderSolar extends TileEntity implements IWrenchable { +import java.util.Random; - private BasicSource energySource = new BasicSource(this, 10000, 2); - private static Random random = new Random(); - private boolean initialized; - public boolean theSunIsVisible; - private int tick; - private boolean canRain; - private boolean noSunlight; +public class TileEntityOrderSolar extends TileEntityEMT implements IWrenchable { - public TileEntityOrderSolar() { - super(); - this.tick = random.nextInt(64); - } + private BasicSource energySource = new BasicSource(this, 10000, 2); + private static Random random = new Random(); + private boolean initialized; + public boolean theSunIsVisible; + private int tick; + private boolean canRain; + private boolean noSunlight; - @Override - public void updateEntity() { - energySource.updateEntity(); - if (!initialized && worldObj != null) { - canRain = worldObj.getWorldChunkManager().getBiomeGenAt(xCoord, zCoord).getIntRainfall() > 0; - noSunlight = worldObj.provider.hasNoSky; - initialized = true; - } - if (noSunlight) { - return; - } - if (tick-- == 0) { - updateSunState(); - tick = 64; - } - int energyProduction = 0; + public TileEntityOrderSolar() { + super(); + this.tick = random.nextInt(64); + } - if (theSunIsVisible) { - energySource.addEnergy(Config.compressedSolarOutput * 3); - } - energySource.addEnergy(energyProduction); - } + @Override + public void updateEntity() { + energySource.updateEntity(); + if (!initialized && worldObj != null) { + canRain = worldObj.getWorldChunkManager().getBiomeGenAt(xCoord, zCoord).getIntRainfall() > 0; + noSunlight = worldObj.provider.hasNoSky; + initialized = true; + } + if (noSunlight) { + return; + } + if (tick-- == 0) { + updateSunState(); + tick = 64; + } - private void updateSunState() { - boolean isRaining = canRain && (worldObj.isRaining() || worldObj.isThundering()); - theSunIsVisible = worldObj.isDaytime() && !isRaining && worldObj.canBlockSeeTheSky(xCoord, yCoord + 1, zCoord); - } + if (theSunIsVisible) { + energySource.addEnergy(Config.compressedSolarOutput * 3); + } + } - @Override - public void onChunkUnload() { - energySource.onChunkUnload(); - } + private void updateSunState() { + boolean isRaining = canRain && (worldObj.isRaining() || worldObj.isThundering()); + theSunIsVisible = worldObj.isDaytime() && !isRaining && worldObj.canBlockSeeTheSky(xCoord, yCoord + 1, zCoord); + } - @Override - public void invalidate() { - energySource.invalidate(); - super.invalidate(); - } + @Override + public void onChunkUnload() { + energySource.onChunkUnload(); + } - @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { - super.writeToNBT(nbttagcompound); - energySource.writeToNBT(nbttagcompound); - } + @Override + public void invalidate() { + energySource.invalidate(); + super.invalidate(); + } - @Override - public void readFromNBT(NBTTagCompound nbttagcompound) { - super.readFromNBT(nbttagcompound); - energySource.readFromNBT(nbttagcompound); - } + @Override + public void writeToNBT(NBTTagCompound nbttagcompound) { + super.writeToNBT(nbttagcompound); + energySource.writeToNBT(nbttagcompound); + } - @Override - public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) { - return false; - } + @Override + public void readFromNBT(NBTTagCompound nbttagcompound) { + super.readFromNBT(nbttagcompound); + energySource.readFromNBT(nbttagcompound); + } - @Override - public short getFacing() { - return 0; - } + @Override + public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) { + return false; + } - @Override - public void setFacing(short facing) { + @Override + public short getFacing() { + return 0; + } - } + @Override + public void setFacing(short facing) { - @Override - public boolean wrenchCanRemove(EntityPlayer entityPlayer) { - return true; - } + } - @Override - public float getWrenchDropRate() { - return 1; - } + @Override + public boolean wrenchCanRemove(EntityPlayer entityPlayer) { + return true; + } - @Override - public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(BlockRegistry.emtSolars, 1, 9); - } + @Override + public float getWrenchDropRate() { + return 1; + } + + @Override + public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { + return new ItemStack(BlockRegistry.emtSolars, 1, 9); + } } diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/solars/TileEntityTripleAirSolar.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/solars/TileEntityTripleAirSolar.java index 2606dbf..6ae2066 100644 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/solars/TileEntityTripleAirSolar.java +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/solars/TileEntityTripleAirSolar.java @@ -1,123 +1,120 @@ /******************************************************************************* * Copyright (c) 2014 Tombenpotter. * All rights reserved. - * + * * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * + * * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ package electricMagicTools.tombenpotter.electricmagictools.common.tile.solars; +import electricMagicTools.tombenpotter.electricmagictools.common.BlockRegistry; +import electricMagicTools.tombenpotter.electricmagictools.common.Config; +import electricMagicTools.tombenpotter.electricmagictools.common.tile.TileEntityEMT; import ic2.api.energy.prefab.BasicSource; import ic2.api.tile.IWrenchable; - -import java.util.Random; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import electricMagicTools.tombenpotter.electricmagictools.common.BlockRegistry; -import electricMagicTools.tombenpotter.electricmagictools.common.Config; -public class TileEntityTripleAirSolar extends TileEntity implements IWrenchable { +import java.util.Random; - private BasicSource energySource = new BasicSource(this, 1000000, 5); - private static Random random = new Random(); - private boolean initialized; - public boolean theSunIsVisible; - private int tick; - private boolean canRain; - private boolean noSunlight; +public class TileEntityTripleAirSolar extends TileEntityEMT implements IWrenchable { - public TileEntityTripleAirSolar() { - super(); - this.tick = random.nextInt(64); - } + private BasicSource energySource = new BasicSource(this, 1000000, 5); + private static Random random = new Random(); + private boolean initialized; + public boolean theSunIsVisible; + private int tick; + private boolean canRain; + private boolean noSunlight; - @Override - public void updateEntity() { - energySource.updateEntity(); - if (!initialized && worldObj != null) { - canRain = worldObj.getWorldChunkManager().getBiomeGenAt(xCoord, zCoord).getIntRainfall() > 0; - noSunlight = worldObj.provider.hasNoSky; - initialized = true; - } - if (noSunlight) { - return; - } - if (tick-- == 0) { - updateSunState(); - tick = 64; - } - int energyProduction = 0; + public TileEntityTripleAirSolar() { + super(); + this.tick = random.nextInt(64); + } - if (theSunIsVisible && this.yCoord >= 160) { - energySource.addEnergy(Config.tripleCompressedSolarOutput * 2.5); - } else if (theSunIsVisible) { - energySource.addEnergy(Config.tripleCompressedSolarOutput); - } - energySource.addEnergy(energyProduction); - } + @Override + public void updateEntity() { + energySource.updateEntity(); + if (!initialized && worldObj != null) { + canRain = worldObj.getWorldChunkManager().getBiomeGenAt(xCoord, zCoord).getIntRainfall() > 0; + noSunlight = worldObj.provider.hasNoSky; + initialized = true; + } + if (noSunlight) { + return; + } + if (tick-- == 0) { + updateSunState(); + tick = 64; + } - private void updateSunState() { - boolean isRaining = canRain && (worldObj.isRaining() || worldObj.isThundering()); - theSunIsVisible = worldObj.isDaytime() && !isRaining && worldObj.canBlockSeeTheSky(xCoord, yCoord + 1, zCoord); - } + if (theSunIsVisible && this.yCoord >= 160) { + energySource.addEnergy(Config.tripleCompressedSolarOutput * 2.5); + } else if (theSunIsVisible) { + energySource.addEnergy(Config.tripleCompressedSolarOutput); + } + } - @Override - public void onChunkUnload() { - energySource.onChunkUnload(); - } + private void updateSunState() { + boolean isRaining = canRain && (worldObj.isRaining() || worldObj.isThundering()); + theSunIsVisible = worldObj.isDaytime() && !isRaining && worldObj.canBlockSeeTheSky(xCoord, yCoord + 1, zCoord); + } - @Override - public void invalidate() { - energySource.invalidate(); - super.invalidate(); - } + @Override + public void onChunkUnload() { + energySource.onChunkUnload(); + } - @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { - super.writeToNBT(nbttagcompound); - energySource.writeToNBT(nbttagcompound); - } + @Override + public void invalidate() { + energySource.invalidate(); + super.invalidate(); + } - @Override - public void readFromNBT(NBTTagCompound nbttagcompound) { - super.readFromNBT(nbttagcompound); - energySource.readFromNBT(nbttagcompound); - } + @Override + public void writeToNBT(NBTTagCompound nbttagcompound) { + super.writeToNBT(nbttagcompound); + energySource.writeToNBT(nbttagcompound); + } - @Override - public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) { - return false; - } + @Override + public void readFromNBT(NBTTagCompound nbttagcompound) { + super.readFromNBT(nbttagcompound); + energySource.readFromNBT(nbttagcompound); + } - @Override - public short getFacing() { - return 0; - } + @Override + public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) { + return false; + } - @Override - public void setFacing(short facing) { + @Override + public short getFacing() { + return 0; + } - } + @Override + public void setFacing(short facing) { - @Override - public boolean wrenchCanRemove(EntityPlayer entityPlayer) { - return true; - } + } - @Override - public float getWrenchDropRate() { - return 1; - } + @Override + public boolean wrenchCanRemove(EntityPlayer entityPlayer) { + return true; + } - @Override - public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(BlockRegistry.emtSolars2, 1, 1); - } + @Override + public float getWrenchDropRate() { + return 1; + } + + @Override + public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { + return new ItemStack(BlockRegistry.emtSolars2, 1, 1); + } } diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/solars/TileEntityTripleCompressedSolar.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/solars/TileEntityTripleCompressedSolar.java index 0e5fe26..19fe8c8 100644 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/solars/TileEntityTripleCompressedSolar.java +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/solars/TileEntityTripleCompressedSolar.java @@ -1,121 +1,118 @@ /******************************************************************************* * Copyright (c) 2014 Tombenpotter. * All rights reserved. - * + * * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * + * * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ package electricMagicTools.tombenpotter.electricmagictools.common.tile.solars; +import electricMagicTools.tombenpotter.electricmagictools.common.BlockRegistry; +import electricMagicTools.tombenpotter.electricmagictools.common.Config; +import electricMagicTools.tombenpotter.electricmagictools.common.tile.TileEntityEMT; import ic2.api.energy.prefab.BasicSource; import ic2.api.tile.IWrenchable; - -import java.util.Random; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import electricMagicTools.tombenpotter.electricmagictools.common.BlockRegistry; -import electricMagicTools.tombenpotter.electricmagictools.common.Config; -public class TileEntityTripleCompressedSolar extends TileEntity implements IWrenchable { +import java.util.Random; - private BasicSource energySource = new BasicSource(this, 1000000, 3); - private static Random random = new Random(); - private boolean initialized; - public boolean theSunIsVisible; - private int tick; - private boolean canRain; - private boolean noSunlight; +public class TileEntityTripleCompressedSolar extends TileEntityEMT implements IWrenchable { - public TileEntityTripleCompressedSolar() { - super(); - this.tick = random.nextInt(64); - } + private BasicSource energySource = new BasicSource(this, 1000000, 3); + private static Random random = new Random(); + private boolean initialized; + public boolean theSunIsVisible; + private int tick; + private boolean canRain; + private boolean noSunlight; - @Override - public void updateEntity() { - energySource.updateEntity(); - if (!initialized && worldObj != null) { - canRain = worldObj.getWorldChunkManager().getBiomeGenAt(xCoord, zCoord).getIntRainfall() > 0; - noSunlight = worldObj.provider.hasNoSky; - initialized = true; - } - if (noSunlight) { - return; - } - if (tick-- == 0) { - updateSunState(); - tick = 64; - } - int energyProduction = 0; + public TileEntityTripleCompressedSolar() { + super(); + this.tick = random.nextInt(64); + } - if (theSunIsVisible) { - energySource.addEnergy(Config.tripleCompressedSolarOutput); - } - energySource.addEnergy(energyProduction); - } + @Override + public void updateEntity() { + energySource.updateEntity(); + if (!initialized && worldObj != null) { + canRain = worldObj.getWorldChunkManager().getBiomeGenAt(xCoord, zCoord).getIntRainfall() > 0; + noSunlight = worldObj.provider.hasNoSky; + initialized = true; + } + if (noSunlight) { + return; + } + if (tick-- == 0) { + updateSunState(); + tick = 64; + } - private void updateSunState() { - boolean isRaining = canRain && (worldObj.isRaining() || worldObj.isThundering()); - theSunIsVisible = worldObj.isDaytime() && !isRaining && worldObj.canBlockSeeTheSky(xCoord, yCoord + 1, zCoord); - } + if (theSunIsVisible) { + energySource.addEnergy(Config.tripleCompressedSolarOutput); + } + } - @Override - public void onChunkUnload() { - energySource.onChunkUnload(); - } + private void updateSunState() { + boolean isRaining = canRain && (worldObj.isRaining() || worldObj.isThundering()); + theSunIsVisible = worldObj.isDaytime() && !isRaining && worldObj.canBlockSeeTheSky(xCoord, yCoord + 1, zCoord); + } - @Override - public void invalidate() { - energySource.invalidate(); - super.invalidate(); - } + @Override + public void onChunkUnload() { + energySource.onChunkUnload(); + } - @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { - super.writeToNBT(nbttagcompound); - energySource.writeToNBT(nbttagcompound); - } + @Override + public void invalidate() { + energySource.invalidate(); + super.invalidate(); + } - @Override - public void readFromNBT(NBTTagCompound nbttagcompound) { - super.readFromNBT(nbttagcompound); - energySource.readFromNBT(nbttagcompound); - } + @Override + public void writeToNBT(NBTTagCompound nbttagcompound) { + super.writeToNBT(nbttagcompound); + energySource.writeToNBT(nbttagcompound); + } - @Override - public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) { - return false; - } + @Override + public void readFromNBT(NBTTagCompound nbttagcompound) { + super.readFromNBT(nbttagcompound); + energySource.readFromNBT(nbttagcompound); + } - @Override - public short getFacing() { - return 0; - } + @Override + public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) { + return false; + } - @Override - public void setFacing(short facing) { + @Override + public short getFacing() { + return 0; + } - } + @Override + public void setFacing(short facing) { - @Override - public boolean wrenchCanRemove(EntityPlayer entityPlayer) { - return true; - } + } - @Override - public float getWrenchDropRate() { - return 1; - } + @Override + public boolean wrenchCanRemove(EntityPlayer entityPlayer) { + return true; + } - @Override - public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(BlockRegistry.emtSolars, 1, 2); - } + @Override + public float getWrenchDropRate() { + return 1; + } + + @Override + public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { + return new ItemStack(BlockRegistry.emtSolars, 1, 2); + } } diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/solars/TileEntityTripleDarkSolar.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/solars/TileEntityTripleDarkSolar.java index 38efda0..150fb18 100644 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/solars/TileEntityTripleDarkSolar.java +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/solars/TileEntityTripleDarkSolar.java @@ -1,120 +1,117 @@ /******************************************************************************* * Copyright (c) 2014 Tombenpotter. * All rights reserved. - * + * * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * + * * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ package electricMagicTools.tombenpotter.electricmagictools.common.tile.solars; +import electricMagicTools.tombenpotter.electricmagictools.common.BlockRegistry; +import electricMagicTools.tombenpotter.electricmagictools.common.Config; +import electricMagicTools.tombenpotter.electricmagictools.common.tile.TileEntityEMT; import ic2.api.energy.prefab.BasicSource; import ic2.api.tile.IWrenchable; - -import java.util.Random; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import electricMagicTools.tombenpotter.electricmagictools.common.BlockRegistry; -import electricMagicTools.tombenpotter.electricmagictools.common.Config; -public class TileEntityTripleDarkSolar extends TileEntity implements IWrenchable { +import java.util.Random; - private BasicSource energySource = new BasicSource(this, 1000000, 3); - private static Random random = new Random(); - private boolean initialized; - public boolean theSunIsVisible; - private int tick; - private boolean canRain; - private boolean noSunlight; +public class TileEntityTripleDarkSolar extends TileEntityEMT implements IWrenchable { - public TileEntityTripleDarkSolar() { - super(); - this.tick = random.nextInt(64); - } + private BasicSource energySource = new BasicSource(this, 1000000, 3); + private static Random random = new Random(); + private boolean initialized; + public boolean theSunIsVisible; + private int tick; + private boolean canRain; + private boolean noSunlight; - @Override - public void updateEntity() { - energySource.updateEntity(); - if (!initialized && worldObj != null) { - canRain = worldObj.getWorldChunkManager().getBiomeGenAt(xCoord, zCoord).getIntRainfall() > 0; - noSunlight = worldObj.provider.hasNoSky; - initialized = true; - } - if (noSunlight) { - return; - } - if (tick-- == 0) { - updateSunState(); - tick = 64; - } - int energyProduction = 0; - if (worldObj.canBlockSeeTheSky(xCoord, yCoord + 1, zCoord) && worldObj.isDaytime() == false && worldObj.isRaining() == false && worldObj.isThundering() == false) { - energySource.addEnergy(Config.tripleCompressedSolarOutput); - } - energySource.addEnergy(energyProduction); - } + public TileEntityTripleDarkSolar() { + super(); + this.tick = random.nextInt(64); + } - private void updateSunState() { - boolean isRaining = canRain && (worldObj.isRaining() || worldObj.isThundering()); - theSunIsVisible = worldObj.isDaytime() && !isRaining && worldObj.canBlockSeeTheSky(xCoord, yCoord + 1, zCoord); - } + @Override + public void updateEntity() { + energySource.updateEntity(); + if (!initialized && worldObj != null) { + canRain = worldObj.getWorldChunkManager().getBiomeGenAt(xCoord, zCoord).getIntRainfall() > 0; + noSunlight = worldObj.provider.hasNoSky; + initialized = true; + } + if (noSunlight) { + return; + } + if (tick-- == 0) { + updateSunState(); + tick = 64; + } + if (worldObj.canBlockSeeTheSky(xCoord, yCoord + 1, zCoord) && worldObj.isDaytime() == false && worldObj.isRaining() == false && worldObj.isThundering() == false) { + energySource.addEnergy(Config.tripleCompressedSolarOutput); + } + } - @Override - public void onChunkUnload() { - energySource.onChunkUnload(); - } + private void updateSunState() { + boolean isRaining = canRain && (worldObj.isRaining() || worldObj.isThundering()); + theSunIsVisible = worldObj.isDaytime() && !isRaining && worldObj.canBlockSeeTheSky(xCoord, yCoord + 1, zCoord); + } - @Override - public void invalidate() { - energySource.invalidate(); - super.invalidate(); - } + @Override + public void onChunkUnload() { + energySource.onChunkUnload(); + } - @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { - super.writeToNBT(nbttagcompound); - energySource.writeToNBT(nbttagcompound); - } + @Override + public void invalidate() { + energySource.invalidate(); + super.invalidate(); + } - @Override - public void readFromNBT(NBTTagCompound nbttagcompound) { - super.readFromNBT(nbttagcompound); - energySource.readFromNBT(nbttagcompound); - } + @Override + public void writeToNBT(NBTTagCompound nbttagcompound) { + super.writeToNBT(nbttagcompound); + energySource.writeToNBT(nbttagcompound); + } - @Override - public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) { - return false; - } + @Override + public void readFromNBT(NBTTagCompound nbttagcompound) { + super.readFromNBT(nbttagcompound); + energySource.readFromNBT(nbttagcompound); + } - @Override - public short getFacing() { - return 0; - } + @Override + public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) { + return false; + } - @Override - public void setFacing(short facing) { + @Override + public short getFacing() { + return 0; + } - } + @Override + public void setFacing(short facing) { - @Override - public boolean wrenchCanRemove(EntityPlayer entityPlayer) { - return true; - } + } - @Override - public float getWrenchDropRate() { - return 1; - } + @Override + public boolean wrenchCanRemove(EntityPlayer entityPlayer) { + return true; + } - @Override - public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(BlockRegistry.emtSolars, 1, 8); - } + @Override + public float getWrenchDropRate() { + return 1; + } + + @Override + public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { + return new ItemStack(BlockRegistry.emtSolars, 1, 8); + } } diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/solars/TileEntityTripleEarthSolar.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/solars/TileEntityTripleEarthSolar.java index 63c9c50..d144022 100644 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/solars/TileEntityTripleEarthSolar.java +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/solars/TileEntityTripleEarthSolar.java @@ -1,123 +1,120 @@ /******************************************************************************* * Copyright (c) 2014 Tombenpotter. * All rights reserved. - * + * * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * + * * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ package electricMagicTools.tombenpotter.electricmagictools.common.tile.solars; +import electricMagicTools.tombenpotter.electricmagictools.common.BlockRegistry; +import electricMagicTools.tombenpotter.electricmagictools.common.Config; +import electricMagicTools.tombenpotter.electricmagictools.common.tile.TileEntityEMT; import ic2.api.energy.prefab.BasicSource; import ic2.api.tile.IWrenchable; - -import java.util.Random; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import electricMagicTools.tombenpotter.electricmagictools.common.BlockRegistry; -import electricMagicTools.tombenpotter.electricmagictools.common.Config; -public class TileEntityTripleEarthSolar extends TileEntity implements IWrenchable { +import java.util.Random; - private BasicSource energySource = new BasicSource(this, 1000000, 5); - private static Random random = new Random(); - private boolean initialized; - public boolean theSunIsVisible; - private int tick; - private boolean canRain; - private boolean noSunlight; +public class TileEntityTripleEarthSolar extends TileEntityEMT implements IWrenchable { - public TileEntityTripleEarthSolar() { - super(); - this.tick = random.nextInt(64); - } + private BasicSource energySource = new BasicSource(this, 1000000, 5); + private static Random random = new Random(); + private boolean initialized; + public boolean theSunIsVisible; + private int tick; + private boolean canRain; + private boolean noSunlight; - @Override - public void updateEntity() { - energySource.updateEntity(); - if (!initialized && worldObj != null) { - canRain = worldObj.getWorldChunkManager().getBiomeGenAt(xCoord, zCoord).getIntRainfall() > 0; - noSunlight = worldObj.provider.hasNoSky; - initialized = true; - } - if (noSunlight) { - return; - } - if (tick-- == 0) { - updateSunState(); - tick = 64; - } - int energyProduction = 0; + public TileEntityTripleEarthSolar() { + super(); + this.tick = random.nextInt(64); + } - if (theSunIsVisible && this.yCoord <= 10) { - energySource.addEnergy(Config.tripleCompressedSolarOutput * 2.5); - } else if (theSunIsVisible) { - energySource.addEnergy(Config.tripleCompressedSolarOutput); - } - energySource.addEnergy(energyProduction); - } + @Override + public void updateEntity() { + energySource.updateEntity(); + if (!initialized && worldObj != null) { + canRain = worldObj.getWorldChunkManager().getBiomeGenAt(xCoord, zCoord).getIntRainfall() > 0; + noSunlight = worldObj.provider.hasNoSky; + initialized = true; + } + if (noSunlight) { + return; + } + if (tick-- == 0) { + updateSunState(); + tick = 64; + } - private void updateSunState() { - boolean isRaining = canRain && (worldObj.isRaining() || worldObj.isThundering()); - theSunIsVisible = worldObj.isDaytime() && !isRaining && worldObj.canBlockSeeTheSky(xCoord, yCoord + 1, zCoord); - } + if (theSunIsVisible && this.yCoord <= 10) { + energySource.addEnergy(Config.tripleCompressedSolarOutput * 2.5); + } else if (theSunIsVisible) { + energySource.addEnergy(Config.tripleCompressedSolarOutput); + } + } - @Override - public void onChunkUnload() { - energySource.onChunkUnload(); - } + private void updateSunState() { + boolean isRaining = canRain && (worldObj.isRaining() || worldObj.isThundering()); + theSunIsVisible = worldObj.isDaytime() && !isRaining && worldObj.canBlockSeeTheSky(xCoord, yCoord + 1, zCoord); + } - @Override - public void invalidate() { - energySource.invalidate(); - super.invalidate(); - } + @Override + public void onChunkUnload() { + energySource.onChunkUnload(); + } - @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { - super.writeToNBT(nbttagcompound); - energySource.writeToNBT(nbttagcompound); - } + @Override + public void invalidate() { + energySource.invalidate(); + super.invalidate(); + } - @Override - public void readFromNBT(NBTTagCompound nbttagcompound) { - super.readFromNBT(nbttagcompound); - energySource.readFromNBT(nbttagcompound); - } + @Override + public void writeToNBT(NBTTagCompound nbttagcompound) { + super.writeToNBT(nbttagcompound); + energySource.writeToNBT(nbttagcompound); + } - @Override - public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) { - return false; - } + @Override + public void readFromNBT(NBTTagCompound nbttagcompound) { + super.readFromNBT(nbttagcompound); + energySource.readFromNBT(nbttagcompound); + } - @Override - public short getFacing() { - return 0; - } + @Override + public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) { + return false; + } - @Override - public void setFacing(short facing) { + @Override + public short getFacing() { + return 0; + } - } + @Override + public void setFacing(short facing) { - @Override - public boolean wrenchCanRemove(EntityPlayer entityPlayer) { - return true; - } + } - @Override - public float getWrenchDropRate() { - return 1; - } + @Override + public boolean wrenchCanRemove(EntityPlayer entityPlayer) { + return true; + } - @Override - public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(BlockRegistry.emtSolars2, 1, 4); - } + @Override + public float getWrenchDropRate() { + return 1; + } + + @Override + public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { + return new ItemStack(BlockRegistry.emtSolars2, 1, 4); + } } diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/solars/TileEntityTripleFireSolar.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/solars/TileEntityTripleFireSolar.java index 8d5cdbb..51db66e 100644 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/solars/TileEntityTripleFireSolar.java +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/solars/TileEntityTripleFireSolar.java @@ -1,124 +1,119 @@ /******************************************************************************* * Copyright (c) 2014 Tombenpotter. * All rights reserved. - * + * * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * + * * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ package electricMagicTools.tombenpotter.electricmagictools.common.tile.solars; +import electricMagicTools.tombenpotter.electricmagictools.common.BlockRegistry; +import electricMagicTools.tombenpotter.electricmagictools.common.Config; +import electricMagicTools.tombenpotter.electricmagictools.common.tile.TileEntityEMT; import ic2.api.energy.prefab.BasicSource; import ic2.api.tile.IWrenchable; - -import java.util.Random; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import electricMagicTools.tombenpotter.electricmagictools.common.BlockRegistry; -import electricMagicTools.tombenpotter.electricmagictools.common.Config; -public class TileEntityTripleFireSolar extends TileEntity implements IWrenchable { +import java.util.Random; - private BasicSource energySource = new BasicSource(this, 1000000, 5); - private static Random random = new Random(); - private boolean initialized; - public boolean theSunIsVisible; - private int tick; - private boolean canRain; - private boolean noSunlight; +public class TileEntityTripleFireSolar extends TileEntityEMT implements IWrenchable { - public TileEntityTripleFireSolar() { - super(); - this.tick = random.nextInt(64); - } + private BasicSource energySource = new BasicSource(this, 1000000, 5); + private static Random random = new Random(); + private boolean initialized; + public boolean theSunIsVisible; + private int tick; + private boolean canRain; - @Override - public void updateEntity() { - energySource.updateEntity(); - if (!initialized && worldObj != null) { - canRain = worldObj.getWorldChunkManager().getBiomeGenAt(xCoord, zCoord).getIntRainfall() > 0; - noSunlight = worldObj.provider.hasNoSky; - initialized = true; - } - if (noSunlight) { - return; - } - if (tick-- == 0) { - updateSunState(); - tick = 64; - } - int energyProduction = 0; + public TileEntityTripleFireSolar() { + super(); + this.tick = random.nextInt(64); + } - if (theSunIsVisible) { - energySource.addEnergy(Config.tripleCompressedSolarOutput); - } - if (worldObj.provider.dimensionId == -1) { - energySource.addEnergy(Config.tripleCompressedSolarOutput * 2); - } - energySource.addEnergy(energyProduction); - } + @Override + public void updateEntity() { + energySource.updateEntity(); - private void updateSunState() { - boolean isRaining = canRain && (worldObj.isRaining() || worldObj.isThundering()); - theSunIsVisible = worldObj.isDaytime() && !isRaining && worldObj.canBlockSeeTheSky(xCoord, yCoord + 1, zCoord); - } + if (!initialized && worldObj != null) { + canRain = worldObj.getWorldChunkManager().getBiomeGenAt(xCoord, zCoord).getIntRainfall() > 0; + initialized = true; + } - @Override - public void onChunkUnload() { - energySource.onChunkUnload(); - } + if (worldObj.provider.dimensionId == -1) { + energySource.addEnergy(Config.tripleCompressedSolarOutput * 2); + } else { + if (tick-- == 0) { + updateSunState(); + tick = 64; + } - @Override - public void invalidate() { - energySource.invalidate(); - super.invalidate(); - } + if (theSunIsVisible) { + energySource.addEnergy(Config.tripleCompressedSolarOutput); + } + } + } - @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { - super.writeToNBT(nbttagcompound); - energySource.writeToNBT(nbttagcompound); - } + private void updateSunState() { + boolean isRaining = canRain && (worldObj.isRaining() || worldObj.isThundering()); + theSunIsVisible = worldObj.isDaytime() && !isRaining && worldObj.canBlockSeeTheSky(xCoord, yCoord + 1, zCoord); + } - @Override - public void readFromNBT(NBTTagCompound nbttagcompound) { - super.readFromNBT(nbttagcompound); - energySource.readFromNBT(nbttagcompound); - } + @Override + public void onChunkUnload() { + energySource.onChunkUnload(); + } - @Override - public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) { - return false; - } + @Override + public void invalidate() { + energySource.invalidate(); + super.invalidate(); + } - @Override - public short getFacing() { - return 0; - } + @Override + public void writeToNBT(NBTTagCompound nbttagcompound) { + super.writeToNBT(nbttagcompound); + energySource.writeToNBT(nbttagcompound); + } - @Override - public void setFacing(short facing) { + @Override + public void readFromNBT(NBTTagCompound nbttagcompound) { + super.readFromNBT(nbttagcompound); + energySource.readFromNBT(nbttagcompound); + } - } + @Override + public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) { + return false; + } - @Override - public boolean wrenchCanRemove(EntityPlayer entityPlayer) { - return true; - } + @Override + public short getFacing() { + return 0; + } - @Override - public float getWrenchDropRate() { - return 1; - } + @Override + public void setFacing(short facing) { - @Override - public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(BlockRegistry.emtSolars, 1, 14); - } + } + + @Override + public boolean wrenchCanRemove(EntityPlayer entityPlayer) { + return true; + } + + @Override + public float getWrenchDropRate() { + return 1; + } + + @Override + public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { + return new ItemStack(BlockRegistry.emtSolars, 1, 14); + } } diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/solars/TileEntityTripleOrderSolar.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/solars/TileEntityTripleOrderSolar.java index b1d7fad..d805045 100644 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/solars/TileEntityTripleOrderSolar.java +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/solars/TileEntityTripleOrderSolar.java @@ -1,121 +1,117 @@ /******************************************************************************* * Copyright (c) 2014 Tombenpotter. * All rights reserved. - * + * * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * + * * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ package electricMagicTools.tombenpotter.electricmagictools.common.tile.solars; +import electricMagicTools.tombenpotter.electricmagictools.common.BlockRegistry; +import electricMagicTools.tombenpotter.electricmagictools.common.Config; +import electricMagicTools.tombenpotter.electricmagictools.common.tile.TileEntityEMT; import ic2.api.energy.prefab.BasicSource; import ic2.api.tile.IWrenchable; - -import java.util.Random; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import electricMagicTools.tombenpotter.electricmagictools.common.BlockRegistry; -import electricMagicTools.tombenpotter.electricmagictools.common.Config; -public class TileEntityTripleOrderSolar extends TileEntity implements IWrenchable { +import java.util.Random; - private BasicSource energySource = new BasicSource(this, 1000000, 5); - private static Random random = new Random(); - private boolean initialized; - public boolean theSunIsVisible; - private int tick; - private boolean canRain; - private boolean noSunlight; +public class TileEntityTripleOrderSolar extends TileEntityEMT implements IWrenchable { - public TileEntityTripleOrderSolar() { - super(); - this.tick = random.nextInt(64); - } + private BasicSource energySource = new BasicSource(this, 1000000, 5); + private static Random random = new Random(); + private boolean initialized; + public boolean theSunIsVisible; + private int tick; + private boolean canRain; + private boolean noSunlight; - @Override - public void updateEntity() { - energySource.updateEntity(); - if (!initialized && worldObj != null) { - canRain = worldObj.getWorldChunkManager().getBiomeGenAt(xCoord, zCoord).getIntRainfall() > 0; - noSunlight = worldObj.provider.hasNoSky; - initialized = true; - } - if (noSunlight) { - return; - } - if (tick-- == 0) { - updateSunState(); - tick = 64; - } - int energyProduction = 0; + public TileEntityTripleOrderSolar() { + super(); + this.tick = random.nextInt(64); + } - if (theSunIsVisible) { - energySource.addEnergy(Config.tripleCompressedSolarOutput * 3); - } - energySource.addEnergy(energyProduction); - } + @Override + public void updateEntity() { + energySource.updateEntity(); + if (!initialized && worldObj != null) { + canRain = worldObj.getWorldChunkManager().getBiomeGenAt(xCoord, zCoord).getIntRainfall() > 0; + noSunlight = worldObj.provider.hasNoSky; + initialized = true; + } + if (noSunlight) { + return; + } + if (tick-- == 0) { + updateSunState(); + tick = 64; + } + if (theSunIsVisible) { + energySource.addEnergy(Config.tripleCompressedSolarOutput * 3); + } + } - private void updateSunState() { - boolean isRaining = canRain && (worldObj.isRaining() || worldObj.isThundering()); - theSunIsVisible = worldObj.isDaytime() && !isRaining && worldObj.canBlockSeeTheSky(xCoord, yCoord + 1, zCoord); - } + private void updateSunState() { + boolean isRaining = canRain && (worldObj.isRaining() || worldObj.isThundering()); + theSunIsVisible = worldObj.isDaytime() && !isRaining && worldObj.canBlockSeeTheSky(xCoord, yCoord + 1, zCoord); + } - @Override - public void onChunkUnload() { - energySource.onChunkUnload(); - } + @Override + public void onChunkUnload() { + energySource.onChunkUnload(); + } - @Override - public void invalidate() { - energySource.invalidate(); - super.invalidate(); - } + @Override + public void invalidate() { + energySource.invalidate(); + super.invalidate(); + } - @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { - super.writeToNBT(nbttagcompound); - energySource.writeToNBT(nbttagcompound); - } + @Override + public void writeToNBT(NBTTagCompound nbttagcompound) { + super.writeToNBT(nbttagcompound); + energySource.writeToNBT(nbttagcompound); + } - @Override - public void readFromNBT(NBTTagCompound nbttagcompound) { - super.readFromNBT(nbttagcompound); - energySource.readFromNBT(nbttagcompound); - } + @Override + public void readFromNBT(NBTTagCompound nbttagcompound) { + super.readFromNBT(nbttagcompound); + energySource.readFromNBT(nbttagcompound); + } - @Override - public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) { - return false; - } + @Override + public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) { + return false; + } - @Override - public short getFacing() { - return 0; - } + @Override + public short getFacing() { + return 0; + } - @Override - public void setFacing(short facing) { + @Override + public void setFacing(short facing) { - } + } - @Override - public boolean wrenchCanRemove(EntityPlayer entityPlayer) { - return true; - } + @Override + public boolean wrenchCanRemove(EntityPlayer entityPlayer) { + return true; + } - @Override - public float getWrenchDropRate() { - return 1; - } + @Override + public float getWrenchDropRate() { + return 1; + } - @Override - public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(BlockRegistry.emtSolars, 1, 11); - } + @Override + public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { + return new ItemStack(BlockRegistry.emtSolars, 1, 11); + } } diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/solars/TileEntityTripleWaterSolar.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/solars/TileEntityTripleWaterSolar.java index bee858b..8c0f498 100644 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/solars/TileEntityTripleWaterSolar.java +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/solars/TileEntityTripleWaterSolar.java @@ -1,121 +1,118 @@ /******************************************************************************* * Copyright (c) 2014 Tombenpotter. * All rights reserved. - * + * * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * + * * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ package electricMagicTools.tombenpotter.electricmagictools.common.tile.solars; +import electricMagicTools.tombenpotter.electricmagictools.common.BlockRegistry; +import electricMagicTools.tombenpotter.electricmagictools.common.Config; +import electricMagicTools.tombenpotter.electricmagictools.common.tile.TileEntityEMT; import ic2.api.energy.prefab.BasicSource; import ic2.api.tile.IWrenchable; - -import java.util.Random; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import electricMagicTools.tombenpotter.electricmagictools.common.BlockRegistry; -import electricMagicTools.tombenpotter.electricmagictools.common.Config; -public class TileEntityTripleWaterSolar extends TileEntity implements IWrenchable { +import java.util.Random; - private BasicSource energySource = new BasicSource(this, 1000000, 3); - private static Random random = new Random(); - private boolean initialized; - public boolean theSunIsVisible; - private int tick; - private boolean canRain; - private boolean noSunlight; +public class TileEntityTripleWaterSolar extends TileEntityEMT implements IWrenchable { - public TileEntityTripleWaterSolar() { - super(); - this.tick = random.nextInt(64); - } + private BasicSource energySource = new BasicSource(this, 1000000, 3); + private static Random random = new Random(); + private boolean initialized; + public boolean theSunIsVisible; + private int tick; + private boolean canRain; + private boolean noSunlight; - @Override - public void updateEntity() { - energySource.updateEntity(); - if (!initialized && worldObj != null) { - canRain = worldObj.getWorldChunkManager().getBiomeGenAt(xCoord, zCoord).getIntRainfall() > 0; - noSunlight = worldObj.provider.hasNoSky; - initialized = true; - } - if (noSunlight) { - return; - } - if (tick-- == 0) { - updateSunState(); - tick = 64; - } - int energyProduction = 0; + public TileEntityTripleWaterSolar() { + super(); + this.tick = random.nextInt(64); + } - if (worldObj.isRaining() && worldObj.canBlockSeeTheSky(xCoord, yCoord + 1, zCoord) || worldObj.isThundering() && worldObj.canBlockSeeTheSky(xCoord, yCoord + 1, zCoord)) { - energySource.addEnergy(Config.tripleCompressedSolarOutput); - } - energySource.addEnergy(energyProduction); - } + @Override + public void updateEntity() { + energySource.updateEntity(); + if (!initialized && worldObj != null) { + canRain = worldObj.getWorldChunkManager().getBiomeGenAt(xCoord, zCoord).getIntRainfall() > 0; + noSunlight = worldObj.provider.hasNoSky; + initialized = true; + } + if (noSunlight) { + return; + } + if (tick-- == 0) { + updateSunState(); + tick = 64; + } - private void updateSunState() { - boolean isRaining = canRain && (worldObj.isRaining() || worldObj.isThundering()); - theSunIsVisible = worldObj.isDaytime() && !isRaining && worldObj.canBlockSeeTheSky(xCoord, yCoord + 1, zCoord); - } + if (worldObj.isRaining() && worldObj.canBlockSeeTheSky(xCoord, yCoord + 1, zCoord) || worldObj.isThundering() && worldObj.canBlockSeeTheSky(xCoord, yCoord + 1, zCoord)) { + energySource.addEnergy(Config.tripleCompressedSolarOutput); + } + } - @Override - public void onChunkUnload() { - energySource.onChunkUnload(); - } + private void updateSunState() { + boolean isRaining = canRain && (worldObj.isRaining() || worldObj.isThundering()); + theSunIsVisible = worldObj.isDaytime() && !isRaining && worldObj.canBlockSeeTheSky(xCoord, yCoord + 1, zCoord); + } - @Override - public void invalidate() { - energySource.invalidate(); - super.invalidate(); - } + @Override + public void onChunkUnload() { + energySource.onChunkUnload(); + } - @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { - super.writeToNBT(nbttagcompound); - energySource.writeToNBT(nbttagcompound); - } + @Override + public void invalidate() { + energySource.invalidate(); + super.invalidate(); + } - @Override - public void readFromNBT(NBTTagCompound nbttagcompound) { - super.readFromNBT(nbttagcompound); - energySource.readFromNBT(nbttagcompound); - } + @Override + public void writeToNBT(NBTTagCompound nbttagcompound) { + super.writeToNBT(nbttagcompound); + energySource.writeToNBT(nbttagcompound); + } - @Override - public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) { - return false; - } + @Override + public void readFromNBT(NBTTagCompound nbttagcompound) { + super.readFromNBT(nbttagcompound); + energySource.readFromNBT(nbttagcompound); + } - @Override - public short getFacing() { - return 0; - } + @Override + public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) { + return false; + } - @Override - public void setFacing(short facing) { + @Override + public short getFacing() { + return 0; + } - } + @Override + public void setFacing(short facing) { - @Override - public boolean wrenchCanRemove(EntityPlayer entityPlayer) { - return true; - } + } - @Override - public float getWrenchDropRate() { - return 1; - } + @Override + public boolean wrenchCanRemove(EntityPlayer entityPlayer) { + return true; + } - @Override - public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(BlockRegistry.emtSolars, 1, 5); - } + @Override + public float getWrenchDropRate() { + return 1; + } + + @Override + public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { + return new ItemStack(BlockRegistry.emtSolars, 1, 5); + } } diff --git a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/solars/TileEntityWaterSolar.java b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/solars/TileEntityWaterSolar.java index 10625e5..8c7c2dc 100644 --- a/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/solars/TileEntityWaterSolar.java +++ b/src/main/java/electricMagicTools/tombenpotter/electricmagictools/common/tile/solars/TileEntityWaterSolar.java @@ -1,121 +1,118 @@ /******************************************************************************* * Copyright (c) 2014 Tombenpotter. * All rights reserved. - * + * * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * + * * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ package electricMagicTools.tombenpotter.electricmagictools.common.tile.solars; +import electricMagicTools.tombenpotter.electricmagictools.common.BlockRegistry; +import electricMagicTools.tombenpotter.electricmagictools.common.Config; +import electricMagicTools.tombenpotter.electricmagictools.common.tile.TileEntityEMT; import ic2.api.energy.prefab.BasicSource; import ic2.api.tile.IWrenchable; - -import java.util.Random; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import electricMagicTools.tombenpotter.electricmagictools.common.BlockRegistry; -import electricMagicTools.tombenpotter.electricmagictools.common.Config; -public class TileEntityWaterSolar extends TileEntity implements IWrenchable { +import java.util.Random; - private BasicSource energySource = new BasicSource(this, 10000, 1); - private static Random random = new Random(); - private boolean initialized; - public boolean theSunIsVisible; - private int tick; - private boolean canRain; - private boolean noSunlight; +public class TileEntityWaterSolar extends TileEntityEMT implements IWrenchable { - public TileEntityWaterSolar() { - super(); - this.tick = random.nextInt(64); - } + private BasicSource energySource = new BasicSource(this, 10000, 1); + private static Random random = new Random(); + private boolean initialized; + public boolean theSunIsVisible; + private int tick; + private boolean canRain; + private boolean noSunlight; - @Override - public void updateEntity() { - energySource.updateEntity(); - if (!initialized && worldObj != null) { - canRain = worldObj.getWorldChunkManager().getBiomeGenAt(xCoord, zCoord).getIntRainfall() > 0; - noSunlight = worldObj.provider.hasNoSky; - initialized = true; - } - if (noSunlight) { - return; - } - if (tick-- == 0) { - updateSunState(); - tick = 64; - } - int energyProduction = 0; + public TileEntityWaterSolar() { + super(); + this.tick = random.nextInt(64); + } - if (worldObj.isRaining() && worldObj.canBlockSeeTheSky(xCoord, yCoord + 1, zCoord) || worldObj.isThundering() && worldObj.canBlockSeeTheSky(xCoord, yCoord + 1, zCoord)) { - energySource.addEnergy(Config.compressedSolarOutput); - } - energySource.addEnergy(energyProduction); - } + @Override + public void updateEntity() { + energySource.updateEntity(); + if (!initialized && worldObj != null) { + canRain = worldObj.getWorldChunkManager().getBiomeGenAt(xCoord, zCoord).getIntRainfall() > 0; + noSunlight = worldObj.provider.hasNoSky; + initialized = true; + } + if (noSunlight) { + return; + } + if (tick-- == 0) { + updateSunState(); + tick = 64; + } - private void updateSunState() { - boolean isRaining = canRain && (worldObj.isRaining() || worldObj.isThundering()); - theSunIsVisible = worldObj.isDaytime() && !isRaining && worldObj.canBlockSeeTheSky(xCoord, yCoord + 1, zCoord); - } + if (worldObj.isRaining() && worldObj.canBlockSeeTheSky(xCoord, yCoord + 1, zCoord) || worldObj.isThundering() && worldObj.canBlockSeeTheSky(xCoord, yCoord + 1, zCoord)) { + energySource.addEnergy(Config.compressedSolarOutput); + } + } - @Override - public void onChunkUnload() { - energySource.onChunkUnload(); - } + private void updateSunState() { + boolean isRaining = canRain && (worldObj.isRaining() || worldObj.isThundering()); + theSunIsVisible = worldObj.isDaytime() && !isRaining && worldObj.canBlockSeeTheSky(xCoord, yCoord + 1, zCoord); + } - @Override - public void invalidate() { - energySource.invalidate(); - super.invalidate(); - } + @Override + public void onChunkUnload() { + energySource.onChunkUnload(); + } - @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { - super.writeToNBT(nbttagcompound); - energySource.writeToNBT(nbttagcompound); - } + @Override + public void invalidate() { + energySource.invalidate(); + super.invalidate(); + } - @Override - public void readFromNBT(NBTTagCompound nbttagcompound) { - super.readFromNBT(nbttagcompound); - energySource.readFromNBT(nbttagcompound); - } + @Override + public void writeToNBT(NBTTagCompound nbttagcompound) { + super.writeToNBT(nbttagcompound); + energySource.writeToNBT(nbttagcompound); + } - @Override - public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) { - return false; - } + @Override + public void readFromNBT(NBTTagCompound nbttagcompound) { + super.readFromNBT(nbttagcompound); + energySource.readFromNBT(nbttagcompound); + } - @Override - public short getFacing() { - return 0; - } + @Override + public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) { + return false; + } - @Override - public void setFacing(short facing) { + @Override + public short getFacing() { + return 0; + } - } + @Override + public void setFacing(short facing) { - @Override - public boolean wrenchCanRemove(EntityPlayer entityPlayer) { - return true; - } + } - @Override - public float getWrenchDropRate() { - return 1; - } + @Override + public boolean wrenchCanRemove(EntityPlayer entityPlayer) { + return true; + } - @Override - public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(BlockRegistry.emtSolars, 1, 3); - } + @Override + public float getWrenchDropRate() { + return 1; + } + + @Override + public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { + return new ItemStack(BlockRegistry.emtSolars, 1, 3); + } } diff --git a/src/main/resources/assets/electricmagictools/lang/en_US.lang b/src/main/resources/assets/electricmagictools/lang/en_US.lang index 3b59267..c2e04b1 100644 --- a/src/main/resources/assets/electricmagictools/lang/en_US.lang +++ b/src/main/resources/assets/electricmagictools/lang/en_US.lang @@ -23,11 +23,9 @@ item.shieldfocus.name=Wand Focus: Shield item.electricgoggles.name=Electric Goggles of Revealing item.streamchainsaw.name=Chainsaw of the Stream item.rockbreakerdrill.name=Drill of the Rockbreaker -item.thaumiumplate.name=Thaumium Plate item.solarhelmetrevealing.name=Quantum Solar Helmet of Revealing item.hammerthor.name=Mjolnir item.taintedthorhammer.name=Broken Relic of Mjolnir -item.lightningsummoner.name=Lightning Summoner item.electricthorhammer.name=Supercharged Mjolnir item.electricboots.name=Electric Boots of the Traveller item.nanobootstraveller.name=Nanosuit Boots of the Traveller @@ -40,10 +38,25 @@ item.itememtitems.crushedOreAmber.name=Crushed Amber Ore item.itememtitems.purifiedOreAmber.name=Purified Amber Ore item.itememtitems.crushedOreCinnabar.name=Crushed Cinnabar Ore item.itememtitems.purifiedOreCinnabar.name=Purified Cinnabar Ore +item.itememtitems.thaumiumPlate.name=Thaumium Plate +item.itememtitems.lightningSummoner.name=Lightning Summoner +item.itememtitems.featherMesh.name=Feather Mesh +item.itememtitems.glue.name=Glue +item.itememtitems.ductTape.name=Duct Tape +item.itememtitems.rubberBall.name=Rubber Ball +item.itememtitems.cardboard.name=Cardboard Sheet +item.itememtitems.featherGluedCardboardWing.name=Feather Glued Carboard Wing +item.itememtitems.denseIronSheet.name=Dense Iron Sheet +item.itememtitems.taintedFeather.name=Tainted Feather +item.itememtitems.thaumiumWing.name=Thaumium Reinforced Wing item.emtbauble.euMaker.armor.name=Armor Charging Ring item.emtbauble.euMaker.inventory.name=Inventory Charging Ring item.emtbauble.oneRing.name=The One Ring item.wandchargefocus.name=Wand Focus: Wand Charging +item.featherwing.name=Feather Duct-Taped Wings +item.thaumiumwing.name=Thaumium Reinforced Wings +item.nanowing.name=Nanosuit Wings +item.quantumwing.name=Quantum Wings =============Block Names============= tile.shield.name=Shield Block @@ -127,6 +140,10 @@ emt.tag.Wand Focus: Wand Charging=From electricity to vis emt.tag.Inventory Charging Ring=Passive charger emt.tag.Armor Charging Ring=Passive life-saver emt.tag.The One Ring=Forged inside the pit of the volcanic Mount Doom... +emt.tag.Feather Wings=It only works in anime... +emt.tag.Thaumium Reinforced Wings=Already much better +emt.tag.Nanosuit Wings=Nanotechnologies to the rescue! +emt.tag.Quantum Wings=The last step is here... =============Thaumonomicon Texts============= emt.text.Electric Magic Tools=Who says magic can't work with technology? Our researchers have collaborated with the top mages of the school of Thaumaturgy to bring you the effectiveness of magic coupled with the convenience of electric tools. @@ -138,7 +155,7 @@ emt.text.Quantum Goggles of Revealing=It took a lot of trial and error, but you emt.text.Iron Omnitool=While tinkering with the inner workings of some of your tools to see if magical integration is a possibility, you have discovered a way to combine the Mining Drill and the Chainsaw, resulting in a tool capable of both mining, cutting down trees and attacking enemies! As you are working with mundane metals, magic influence is not needed to merge these tools together. emt.text.Diamond Omnitool=Your discovery of an Iron Omnitool has driven you to try to accomplish the same with some more powerful devices. You have discovered a way to combine the Diamond Drill and the Diamond Chainsaw, resulting in a tool capable of both mining, cutting down trees and attacking enemies, while maintaining the speed and capacity bonuses of the diamond tools. As diamonds are incredibly tough and nearly impossible to reshape once the raw diamonds have been fashioned into tools such as drills and chainsaws, you will require a little bit of magic to coax them to merge. emt.text.Thaumium Omnitool=After creating the Diamond and Iron Omnitools, the next logical step was to do the same with Thaumium. Unfortunately, this isn't as easy. You have discovered a way to combine the Thaumium Drill and the Thaumium Chainsaw, resulting in a tool capable of mining and chopping trees at great speed with a high energy capacity. These tools have already once been infused with magic. You are not sure what will happen if they were to be infused again. -emt.text.Explosion Focus=You have found a way to modify the Nine Hells focus by exposing the bats to the rather explosive properties of a Mining Laser. This focus acts similarily to a Mining Laser but uses vis instead of EU. This explosive foci has the downside of being incredibly unstable, so you make a note to be careful. +emt.text.Explosion Focus=You have found a way to improve the Nine Hells focus. By exposing the bats to the explosive properties of a Mining Laser, you have built a focus that acts similarly to the Laser but uses vis instead of EU. However, its effects are incredibly unstable, so you make a note to be careful. emt.text.Kris-tmas Focus=Merry Christmas!

You have found a novel use for the frost focus. By exposing it to the magic of Christmas, you can summon your snowy friends at will to fire snowballs at your Festivus celebrating neighbours! emt.text.Shield Focus=With some experimentation with the Portable Hole, you have found out more about the transportation of objects to alternate dimensions. You believe you can reverse these effects to summon a swath of blocks from a dimension full of matter to shield you from any oncoming disaster. Caution is to be taken when using this focus, as when bringing these blocks into our dimension, it will transpose any blocks in the way into the dimension it came from, never to return again. You will also be unable to move while this shield is in existance. emt.text.Potentia Generator=After much studying and research, you have finally discovered how to create electricity from your leftover essentia.

This generator will produce between 3000 and 3500 EU per unit of Potentia, making it very efficient. Simply place a Warded Jar containing Potentia in a 8 blocks radius of the machine and it will draw it in to create EU.

While Potentia seems like the most logical choice for producing essentia with EU, you believe you will be able to generate electricity from different essentia in the near future with a bit of tinkering. @@ -175,7 +192,11 @@ emt.text.UU-Matter Infusion=You have always found the powers possessed by UU-Mat emt.text.Portable Node=After studying in an in-depth manner of the wonders of Node Jarring, you have managed to create an item capable of spawning a random node. However, due to some parts of node magic which you cannot understand, this Portable Node will always be Fading and Unstable.

You can only get rid of it by a shift-right click, and you think that you should dispose of it as soon as possible, for unstable nodes are... rather unpredictable. emt.text.Electric Hoe of Growth=You have managed to upgrade your Hoe of Growth. It now delivers little shocks to the land and plants around it, much like your regular Hoe of Growth would do.

However, the magic contained within this tool is too powerful for you to convert it fully to using mundane electricity, for the tool still has a limited number of uses before it breaks, but is rechargeable. emt.text.Wand Focus: Charging=You realized you always carry a wand with you, along with your electric stuff. But sometimes, you have ran out of juice in your electric tools. That's why you created this wand focus. It is very simple, yet very useful, for it drains vis from your wand storage, and charges the items using mundane electricity. -emt.text.Wand Focus: Wand Charging=After studying in a more in-depth manner your Charging Focus, you have found a way to reverse its effects. Instead of consuming vis from your wand and giving off electricity, it rather consumes electricity to create vis. -emt.text.Inventory Charging Ring=During your research, you discovered some new acessories, baubles. But an idea popped into your mind! You have finally, after hours of test, fails, and research, managed to transform a mundane ring into an item creating 32 EU/T for the sole purpose of recharging electric items in your inventory slots. But you feel like this wouldn't really save your life.. -emt.text.Armor Charging Ring=This item is going further than the previous one, and aims to be able to save your life. It will provide a way to charge electric items in your armor slots, and your armor slots only at a rate of 32 EU/T in any and every conditions. +emt.text.Wand Focus: Wand Charging=You've discovered a way to take the benefits of the Industrial Recharge station and house them inside of a Charging Focus, reversing its polarity. Now it will drain electricity from your items in order to recharge your wand, albeit at a rather high cost. Furthermore, you have realized than you need a full set of Electric Armor to be able to start the wand charging process. +emt.text.Inventory Charging Ring=While other thaumaturgists use rings to charge their runic shields, you feel that there are better applications for them. By fusing power sources into a mundane ring, you have learned how to funnel its charging effects into electric items in your inventory instead. It doesn't generate much at only 32 EU per tick, but that just means there's room for improvement. +emt.text.Armor Charging Ring=You have found the low but constant recharge rate of your new ring to be more useful than anticipated, but it would be nice if it charged your armor when there wasn't a tool in need of power. By infusing a few more power sources and a piece of armor, you have found a way to have it do just that. Sadly, the new power sources do not increase the recharge rate, but progress is progress. emt.text.The One Ring=Three Rings for the Elven-kings under the sky, Seven for the Dwarf-lords in their halls of stone, Nine for Mortal Men doomed to die, One for the Dark Lord on his dark throne in the Land of Mordor where the Shadows lie. One Ring to rule them all, One Ring to find them, One Ring to bring them all and in the darkness bind them in the Land of Mordor where the Shadows lie. -J.R.R. Tolkien's epigraph to The Lord of The Rings.
You dream of being able to disappear from sight , therefore becoming invulnerable to any attack. You have heard that this Ring lays somewhere in ruins, unaltered by time... +emt.text.Feather Wings=Duct-taping feathers to cardboard sheets, formed in the shape of wings sounded like a good idea. At least, you can thrust yourself in the air when the spacebar is hit. Not much, but it'll work. Using any wings underwater or during the rain sounds like a very bad idea. Included: fall damage reduction, 25%. +emt.text.Thaumium Reinforced Wings=The magic infusing thaumium is well known. Therefore, reinforcing your cardboard wings with thaumium sounded like a good idea. You can thrust yourself much higher on spacebar hit, and slow your fall down when spacebar is held. Sneak to go down at a steady pace. Included: fall damage reduction, 50%. +emt.text.Nanosuit Wings=Combining the magic harnessed by thaumium with the nanotechnologies in your wings.. seemed like the logical way to go. You can thrust yourself way higher than before, and fall even slower when holding spacebar. Included: fall damage reduction, 75%. +emt.text.Quantum Wings=After exploring all the possibilities of nanotechnologies, you decided to do the last jump. Quantum. You can thrust yourself many blocks high, have a very good protection, and your fall is slowed down a lot. However, the quantum impredictability happened once again. Your fall will be completely stopped when spacebar and sneak are maintained. You don't know why, but it works. Included: fall damage reduction, 100%. diff --git a/src/main/resources/assets/electricmagictools/lang/zh_CH.lang b/src/main/resources/assets/electricmagictools/lang/zh_CH.lang deleted file mode 100644 index e69de29..0000000 diff --git a/src/main/resources/assets/electricmagictools/textures/blocks/Thumbs.db b/src/main/resources/assets/electricmagictools/textures/blocks/Thumbs.db deleted file mode 100644 index c67fefceefcdb234eed270dc0c14febd08aa9a0e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3072 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/electricmagictools/textures/blocks/essentiagenerator/auramfront.png b/src/main/resources/assets/electricmagictools/textures/blocks/essentiagenerator/auramfront.png index 6571bf2bcdf6acc19ebb06934186f712a778c33c..e7513a2652f64582b865cd2fb32b2ef5e98e7f1e 100644 GIT binary patch literal 2308 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 diff --git a/src/main/resources/assets/electricmagictools/textures/blocks/essentiagenerator/auramfront_alt.png b/src/main/resources/assets/electricmagictools/textures/blocks/essentiagenerator/auramfront_alt.png new file mode 100644 index 0000000000000000000000000000000000000000..e57af4236a3fd3270d13028d84d2a55893505278 GIT binary patch literal 2071 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/electricmagictools/textures/blocks/essentiagenerator/ignisfront.png b/src/main/resources/assets/electricmagictools/textures/blocks/essentiagenerator/ignisfront.png index e25e3f54f680f51b3c312409a7f4a0e5cb92c5e2..63ac1bfd1f35c446a7d32b467a40451583b95259 100644 GIT binary patch literal 2281 zcmbVOYg7|w8je9w644445s`){SXYuvE%^KieOK`;c!->0DdSolBVCec7(X~h{nha_n98Zo&A(BW5#zCPF zDBrx%1bN|bW*gzKNHkKshATsqRB+mcs#B^lG!EzGqf>)21%#5MP#moCCXbwJAd_IZ zH+h|#7!a%dpm;bSMFXu(2@I2^C}bQt+2=EomyU}OC?OOi>6D2oEm!AFe#6Vf=F{6W zGU<&8s_-Vibt+OEO!7lC5Xp_|Mv(ywI?01WrMs~>bh;~v0nnK=IzVG^D0DiP<-w)9 zliodKOid$?<%aTw@3gR$H#r_f)m$1aIXRh{%%mckI2xV9;m`mEjlrN`78LDf6$DwzP)nf5`VwLt?psrvfyka{69x zthHz;^j|kVXsr#~tcGZzkQPbO$gq6GE}sEovHN?WX+z8#Zjc7Xk^(035m}NFQlTQg zHyJyj%3(RzL&}j!-I?wb7ATccKsGCu0?HV%6gI#C*lZ@ib_3}%JRidIc}ynVjmHyk z+ z;^EF>Q9wD!pa8LQh$WS>_XvVMn^TnZ2&!L#w;ghPJAbwjn&g!MiEL?tZu zy(lXE{`*+Y-u}lq&!0ax7#wfFDph4g#o@Eu@wi0e`SYLoUlc>mhVODx>>plys$(`g~Ei0cI@1Glqoc&eD zpTj1jnc2jET~SpZ-=}WERsmeF$seKxJ+v4d(EF);>m}BPJ-P?S1ma;u0t+4;A@3n?Y+JE$Z&P)Ycv&J`8{Cz! zEu^66?%clSnAN=T7K)4NpK{0OLoJ(t_pmc1XSc;AUn}Y=yDR_IX4SepsI+{v_#`5%JzeH}XrYl#L~`2#118{@9oj{XNW7wtc}*3Ecr zxeVc^jX0%dwxfH$O04nRy+YI-HG64KNkN)@mX6(nE?h%6Yse2@qxYgbDkX~|7zGAO z*V#LQsb9>>UX~oU3l_l75>CuIxgjRzcD8vQwd8ogrH4C109L21r?_kT!7#$wPl>qet|j$Gq(WPfvqr>BTP=>L6Vv|XcXW8uF2-vpQna#p7L73({OiW9t3t6>+z zyn}+iGn2D)USs_>=^j@M^~-}x2M2tlCy)Nr=gUb!o@REhF5i9NCsygP79z{5Yy0cT z&MLc%QU6?Xvjc}ztreFR9A?j2ec{N4PWy~+g+iQ77T^B?1FuPViO;h;Hg+9p7>WDt ziGPmdG_X6v(O8jgj76)B=w?=yv;EAD*Ms4hHbUB6Qwo0@*7Siix3 zX~yQb^-I55*55bq3#;hr1EAZ~bN3&4j{^9DR(wuwZsA{99&QbHeV9zMZ=G+5ez;B~ z635HSn{wLQ+kX>y^o|zXl+->sWA55hd6>Gm&jO+fGmCeRH3yAUbtT@c<9%F{eaUjX oX^^$Xu%-632GTD}Q)fehX^`GNDNm7HoOF za_&7>vaC8An9iJWZ)EBFt`s{{_ieL9-knX5+gE2vK4j;}$MXw@lQ|g1Kj%~AZhDD) zxx5PDaX_g|Ku1I$F^mt{6~Q&3Wy&ASF(--+$NX(Tr9VX1?#c2n|Xl{M|vNH zZi)htdfoEq27dz35uV*>C`bn5hyWdkU~Pg=7daBz#H7wS1P$UNnuO>%PTrmTWGbn6LxIHvQhsfk| zg@q>2JQc`#3J}y0*FgSOj}AEA!t(oabzhdqPyk9*{g}@YOga_5sL5cQ?>9FH1%nrj zZE;dC(xBF8jRK5ln~boeSW3|gmR@i-eT^uhKMLbUA!sLwxf(^wbr?G$6M#bQP=J+s z9TJJ-^>j?Yvy1;}{d)BVVazJW6U diff --git a/src/main/resources/assets/electricmagictools/textures/blocks/essentiagenerator/ignisfront_alt.png b/src/main/resources/assets/electricmagictools/textures/blocks/essentiagenerator/ignisfront_alt.png new file mode 100644 index 0000000000000000000000000000000000000000..f48530bde95c86981ca2cf5b3c9227e3bcef15a5 GIT binary patch literal 2062 zcmbVNX;>5I7LFp6i%=+}q5>L5Dj+74Nk~WnVGUTydJ$5pC}x=~Kr&%6Bmos^MG?7_ zw%96&%M}E~%IX4&xPd|iMO#Y|l_e@(6t$J5AYvy9-uuI+Kkhuw%(uPodCxiDInQKA zhOe?PTWm%k5G;Z}5ER%nlhQh1U!lOlLi6XWb@bM;j={UFn1&j$uIz^IF&CzjzH+DJr+^`J- zq&E;Okqf+aDmE;V6o8;Gi9unIMN}F@@?cXShC3UAR+4B`hz>$jkj5rM5Xaqv12IW6 z4}hzoVhJaT7c`@Vueg8=!&Dp))M~X9EuDg(QV?RZ*&vk$(r9EHK~|?KF@cV(R4<#g zz=PEyRIbA0h>~QmC=enk7#F}jeH(&86&Ci+uu?sfC_H7LPM`uI3Kdi+3~{|dtFb8f zzizx2t&UDr!C(}uMp94_ejk!$vt&GXe=lSJ;@)r~P&s}nf+QXyN>RW{ESSdy@Dqwy zF6MX$*&-p6&Lq1FghH}_q84xcKlkxmUY49@SetYG=0 zd8>Nka-ZopjTgPRd-PhFEio`V=!)suk=47>js<~vR{|7ePn}lo4#_HxJXoqcwYR!0U4bArldqD5PLW#J*z*g(K$PCO^P!p?fxt zdI@S`oti0$g=1-d*wc32UZ_VKWWOBFdC_`U=M}!EO+2rGp3L65ch!G3udA=Erw)8H zCvV~v09)v{M)**YpNBAB);)-SNj;cbYO7ng-4Cy7fWA+1;6oGPoxus;9nUk|iaV|5 zKUsTAn_sm_r)QoxyB>5j4*1%5Oz=F;MTfeh4<3dk9L?%&?zzx2I-Tgcrr6RbCI;So zQTwF6^6?e(WwlK<{bv+CXU(5hPWkEj?|d=QqVJsIq`DQ!YRy>=hlb%S+0SO9X@ln7 zUzs8qB26pdsAEq1>0lONY#4ZqSwo!$L^S9{`jk`y6_*p>+BQi zBr!u8>FYYM$+y0tp<6=e_+4%0AAI@Bm2IUOwa>*q&&f-Pyb;x$#w9=ce0LzdX=9bt z?9Zn+TdG|=OJo&O<5#Pi*ei0Z9=~3^&!Xbcv`^~!hMOBseYmK|oBhcpPY7~+FgfJh zW!JG_(>QIjN7>d6J0X8%Pi4pT^#{l9-!CC%=jK{mth#W%#c1xA8SU}qW(fm-rexGP z63tGesuD2xM($zH%-uI_dlD!+`4)9H>mQb&1jdpl2X`f;kjI9}j&}O~8yfSXxSH6d zC(oSeQJ;2Dl)6?(vEy7<$;O?9%j46JIQt!w)Cs#Bonsa>Z#i=0n@03#j{m@j>&4O0 z(R-YX>ArbEF^EFpkUwX#c>j&dMUjuZck+){uz%Je8a}a@Ld5c%fi;UGsJ7ng2dTa#A&HtzW|v@NTdJ& literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/electricmagictools/textures/blocks/essentiagenerator/potentiafront.png b/src/main/resources/assets/electricmagictools/textures/blocks/essentiagenerator/potentiafront.png index bca4ccf3ed76221eeef7994c058994b4009833b9..3128019c0b7ccb5a6bc99bef58361eb70411a259 100644 GIT binary patch literal 2288 zcmbVOdpJ~iAD;**M664w=?oI)a^}L!AZccl+a$E9wwJk_VK8&X%wYyg(so0Lh;2zr zy3lUAY#XVhc9iR+va9s+E^pICy09hWJu1ELA3giW`+J^qewXw4e7@h`_wqbvZwPmd z@%+W}F&K=o|5|n^I%8*^c{=EO(t5ZOooow+E@=?inf;b4l@}X$4)EgLSxB_6sLT_Lr zEtnK6V?iP?hgC`9r3$9X8~C8hMAtLNL;(8% zg2Z_PADxN_4#BcuIfSJVXm|mM3}QVP1dv8$fS?s z*5pDFGnDQ3$rifv24WCI#v~GzN+m%_A;9uzBFJDch$J$ROva-KydqhO@KkuI0ynF` zh7w3WO&WK(n^RsO?W&-@oNDS#pSn!18byj-Rc9kQf+& z6)~_3%VJ@jH;Sb~SgBYslcA3nW_ac23s3((EyK7yoZ^T^RI znaoN!fx+l~<M_3P2d+96zt#uf935_KY@B*=X=KHP z2+M)pDwX1S;7IDjiItDM9{q4o66bTB6trm*Lu)q)25sIjuq+E`OUyJuyq4(NXPdRZ z_S#h1D*jr3#~j4z5M*6%P-`}~t1#UsCif4%nH_hz7c+0Aey`}Pn3&^-)4F;0Ja}Li zlYN71^>%^NSa})Y-~y+>z`%-1jk9*=PQ9)HSxNsrvj@r(cZ+fT1!s&{N6GG>VP#H$ zVNq6A)_6#XRd9QIyS=@AOju;(NKylwH!*GGcJJQ3Tj6fumYK_}#V-E-nRR1ehy_Qm zI<7Un%hlDjLepxe_P%p&p^cv6oaX6R)L2Wiq{T5$t;;l>XDVy(>NW9;b*!E0-NNdL zFB)gm>OkwMfH~Wt)Vo^sVe4l}C8?=IcVwkW;q6<%3SAN z6J6U=8(Cy$Ao9Z<$Ow1YV7DW!uhX_&RB}8ZG`CCY|bh1CzT^P(M*meJ; z^0>yj_xZLXfnDa+RYDv3=2aQH^(>pNr(RwMpDmC(+}x+mjXgK6^mkZvhm+P1T>a@c z^VEj&?)5ADu6E^_!C`B*x43E|NF_&?-#YF>!~SeEYM143Y;aINIfG_UkpHVT{NUQ< zS|BLbSnoE!G5fUE(llrKFHfzRY=2+%MQw9a=L^aEXZmuB!tOdtprzmHU{8ay%g}y9 z>!;J-RGb%*OLa2q7x!#z-40lldA+=Ib$H8Z)6U#BuuCVuS{+*T-AQMO!4kW7?+*c1 zG}V*K?71mVVruTrKfWeqVn4@*VYqkK&h*0MkU>Bv^Y*)kCk}LLuP3;5X5U|nCl?>c zKT!3sGgSW(y?nr<;!H*5^DXHtWFrAzB=RS4$i^xWkxW%4%-&I$a7T+5Ta9c9}!W9kc(mF%^y}=z^jYFm{ zW6`oc(WnXbuWe~%L%(~g4}UW{UQ*weT&rH^rJIM_y;QGnT3uDyd-UXq2HcfP$}_eN z5pNns=p*;J3zjyyaDLP>|Mgro`P)P^s83ut%Iu>Vsr4t#iNk*cCfUBNc&j@+JY2y# zlAmPLlw#oE7i&EA0vBXrAAiFo^OS{;X`Y%^Gd`X?tgEx8dFNLzpIrFo_FYc365|UO z>u#=?Tpzdav?o#*=K)`vToqg&duC&VditId!F8XWe&%3 zk99wK-2@p*fc-6PZ9zrNbLf^Hglp;fRlhh7m>zkBj_K|F@Em=N(Vn!8xOc6^Gyfp|94`B()lr%M0dXd;U;qFB delta 898 zcmV-|1AYAP5t#>&B!2{FK}|sb0I`n?{9y$E000SaNLh0L01FTR01FTSts}j400007 zbV*G`2i*(;69_En?0Xpi000_vMObuGZ)S9NVRB^vP+@6qbS_RsR3LUUE;TMOF-P-4 zHvj+w0!c(cR7gv;mdkDvF%*XVPP_z{geIG8DyU$RCM*z_LVpFT*-_L?uE2^#Rm!DF z8kW3X`Oo=}J+?d9fGYiRPdxVbopENOy02&F$i0^pa`(kJ%Y)Zbq;)i7xR{e+{^8pN zvUmIm>Ad?K!o{~Q;L>Ny-~W?QRE(BehRS~wc%p##F>ob|NWk0Vwx_2*pPc?+-IVRY z$pu0j>2(x(@PF|Fk$SP^(Io=V5uRORD99$`hyWdk;K~H;H*+MkiAAMz2pYskG!=Ks zOKdO;FJU{-Lk$nV7VyR?0QAqbi~*hDq6iC%QBW|Pr-E=qK_J@{s@pOga~0Yg&4tby zF@c6;6NDZ`5Vg$K!XCH3kA#mP3SA4G*?7SQNd>+;yMF_TwP^^@d%Y0O_)EaaM??ji z;cRo*BoLws?0&fihv2&1#(1>g7;MKVGczyXmrObZM)v{~uGP9OONnzxc}IdtqOD~O z1zN9j0a<#F9__PBU@RjFR0LYo0{#j8rUE;GodRQJ0-+=Jm|`kG`J&=+e*V1#H;k^` zZVq z2zot&5NX*%wOAqdUri9lpQOO@0-hr$*RCiU1Vuq;92Kkv6A{>#90`P&3StNoIT?WErnSbxhRsQZ%O_W-QM;1cM4MN3f&E|FY- z2Maj8M-*&I=)U%yDvJeJSfE6Msz3_F-UA9eG!Ym*aHCEYVNi7_v{FH3btVuxMy$Z& z3<_HlZVk=RA+or-#6}ZnZVF^S1qkYhYaoBAMh6@(VS7;-$rOGFX%Q5ZK0L48Tg)hJrV zG33;+NC diff --git a/src/main/resources/assets/electricmagictools/textures/blocks/essentiagenerator/potentiafront_alt.png b/src/main/resources/assets/electricmagictools/textures/blocks/essentiagenerator/potentiafront_alt.png new file mode 100644 index 0000000000000000000000000000000000000000..b34afdcc3c7484c77ec3f7e56b29934a5f440ba5 GIT binary patch literal 2069 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 delta 436 zcmV;l0Zaa>5Y7XTB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000id z000id0mpBsWB>pF8gxZibW?9;ba!ELWdKlNX>N2bPDNB8b~7$DE-^7j^FlWO00BKo zL_t(YOWl+~YQr!PMdwI?ULXgE!P#V!O~C7(K?ms~1bT*EFMs*YSH*NZtwtg)A)mo$ zq_6+5kS!nQ3u+Tnhk1Pfo9zl>^8W%(cX8~h$-ra>z_W8JXkZ$X?GeG0L{Pc^sp=B8 z=l*X1247b{$Q8{|Kpuq|+SUeu3`34bRBrAvhGqa%BIIx=#hK+R_5dK+@7>DFO1*&H z?wZnEBB=B>7k?)6veHWeFjZ#x9pXB_e()HV)FU`o*kR2 eI?O8r&X*e~O@unm>u68_0000yK?yHGf|bH%vyd2)O_L3YRBZ48 zMd=jn;0&**SZY;zwO158&VmT`1O$4V16);VE2373kD}PIdK(3Me>nZ)c4qhY`h32h z@9+DVtw>E?z1TO%mqw#4PE1gwQzOgs`pl=kPXg~8q6Q|ZRFmt7eA13uaGFd@XmD1d z5iP*eaa6ncz4Lf9jYfY@pP?qzsw4?U7&)j1!*LkR6q`nij&+z(%z%?D4PKx(Ndb3z z2f)&6r9hTI1**((xK5u?Y{AzRCud;A1`N>xu`#S@hlDa<#7UIpFczAu5{DFcZdXFh zJ=^&CPPq`(WO)T&fg9AUv(0*-)E(CI6gbhIwzDNQI zS+fs7sadr7l5|Dg3OSoLS-OjP|IE1Bu3n2)?1z|1>vnd4Iy4ggc4z|e} zHfKSBTQQ5?OzH^}%VQDM5H?Z@P@cZHg3+u}y)l@zp4L0~o`ZXy#EQh++) zX!Tl&NP}P+Ay3HWqZ$nx74!4iCyh1fJt2nye&h!tgn5J*7R%75*Vt5@*3tlCWeDMB!W&r0NKgu<8gi zD=v-|k)=0j3A=TLCqpkTtiUb$B3v79A&ji&A(rT0Au6v2hV3WFtJjfUV() zd2F#p1Zo6)7#4^`z${<;|AvlBImPwV$^X>N+!j@gp6SajpcXIt2scs9W1+facb9V+ z)qKN=3R#BZKP~H3DNEA=8g6>G?35pDS{1rt@2VXB*0+W<{+a_-$Ki7!QKJvuP~Y<# zt-4EBpGtdU6XU}ji*-J07QV)iRT`TX_O4!$+R1ZQjifI&CKazl9>67!F06dydVl=$ zoYLjWw4+DsJJ&u52)7lL)r}RN8`XjH{rvo#-rhmCri+c&Cz^hV&Psp(dR z*AKUPeNztyj53PK>8*!Tmec$C`X=7|^CycOp$|`-II*y0!x!&d9S?L!Ri@V9?F|hf zdC|+g%jBVXZ!a5m1PiXj?#w#Fys`J&Z`%fTuuF1!GQ*n{YMX8POI;Fia^|~!Ix}bfR9|185KhME=u>VtoryOjKN=cY zqePSTH#P!}X`4N5?edSk1DBKwEUi+@!cXqP*DiGp4W(vhGrfx1a}pk!@15NU*L2U^ zxS`W%0B`z&Aklp%{di-eJTl~1`$kU8kt0XuP2IUOZ)wGXs6!nc9~2fcu-!fL74WBA z$eVt6I6F5tRwAjLuAdNsV5ja<_o~dyo1G2tk6znD2l?sKHUB)l-{s2ZseQK2JK1_t zD+zmcsrz;Op5|JO3~T;W`BTtA`0EuHoTiL4pgK>jjkymET#I^ko%~2vP#4?BtR1_2 z89%!!ymu0A$|!Hy*KT(P2M6oDZX*%$vBXUV!wFaInu+ty_b0bZ)iO^P&m;N_;}eHY z?d)j|Z?ki{YxCCY23;NhNL2PukC%Nd%l!8@7yo?gmbTqh*C3nU zX7?=}JilnV@;95U1*^2|QE5s_LT0uxcI^nRSeJG?vbo~P&(4DF7xLFW@c&oaXN|4H z?$VM{)8hqS#eW>dW>@#3ePKtt;4Fs#X*%EiZp}bxTELR=l-&v-`|$S{&TTl>oW$+D z`1Ctf$s;$uC;*FS_+IN>-QPy84{_AhISmHGn62~a*=-tFBoaN)c0O*NObWew8Ic49 z!2`dXIU~DS*|l$ACdw}QXg4z>ndLtew4NW?@p@T#`Re%iK>uCUQE=tx^vsOd>ii5i zEx!Kbl9cJL0$lYqJqIS!{xSw0M*?qjPX(SCS?6|&cQpCG*4T8B*bfDj=MrP`k{#{*I`d#aX?yOB=){g$A7x(sm-lits@%{S` djHf;zP4>-5})-R#^pXIkYQ+KtN>CYIS#_VEczp|JZq+ncwxj@B96} zR2$1lME%BMVMBXwAz9#UoBIjtM#Zr4aUa-F*YGdV8jRnuo(>|tI!q;KIavZbI&#d z1fH7^`dILVQ|ZZaK!jT`fJ5idP>2ZwJOLf%umvz24KN{?#eg9OQ$T}ZA)6LlQnFL zL5x{Zi_T2wa1-ERL{xY#5et%@zPN(XoSgiU*kqjy6d5vx4KXudI>ayST z5fGWCGpX@>Ym_HLFD@*`EV?{Qy~u(af#)F>>Rus_K|D2I#Zu7(EF_D@o4Fls*qvOi+d-sOq_FXS~XGL1tjOf4*w}BI`Ii+taFUsM#@(a}*8`tRBuCr7qn-Y z{j`2Xcl@~pUBOhVMpHw7|HwMuTiF3C8HdlDd8z^5Mo<2@wmt!HaaJ8Yb?A@=L#>RE z!NI{l2i%Ap0`|Gee!uH-R?a}>rUwtKUu-U}JK!oU4FC=p*dZ4ex#bF~b$h4bf_>l% zX?D{O_bCUiRxdIAGc5m@xy(K5P3=!R7DtqNeeG~09UK`RmeK?jve}pJ--kDT>~-yR zLy*wXX-Me4o3Vc&!%ZEnqkC^^00v9zS+^q;+eb5Gep?#ns84i$@WJZ^mG*XU-PxL& z>XrtJd2U*n@0Wk0y;EIRRaGTKs9~+4yU+I8_m(GB^x89BrxcRTwX^#zPWzZwqr11Z z{$wLK9}UsmE-SjD+_9-x(Nmc?UQ&|7oj4fU;p;6&SJI)O>Wojry-)PEL@rkhEl7>8X?hg6RI@9?71>7!x8IWtTnnnNayp&O zqUNLWt93uV*6S!*vc`I=4TMHBr!g|m?MNA#=d&1^H#B@zR`|3~R#x1mXh}TM+w!nY zbv*t0z=daxKALdfl(6zVg4n#FQPI7#?)YabA*z#eI4JT8FJ?0z2!1m(7gTAW%BfyO#CPYpW=IpKI$_ zhW0}q_T7fdeE;s2Rx~D#`Av)H&e~_S_P)d25e0*->o47M=Iv3SryPzyJprFAlyzl7 zTT8;<4$yvEA)9aeTf&U41KbNoabbNdnoo#hGGA4hoL`gXnWW& zpcqzQjeDz|)M5`*6q1sh1lV{8BI}Xj=abymZ#Mu!2M3nwF zO#{Gt55P4ofTnGr#jgLk__l2UeERa)Yy@_cLLg8e0Mq#LJUj!q{&-yj1DIz5u$#u) z@3#Pa@z_8LZ8CGxx{84F$nyB-5kP;{^ODiqr@sK+b!(%^;17MDtS9h#^BzE$U&|3B z_l;D8puk!b3V#3a;NWD^Zv2FppzQ?JuQMe8<2vH;v<-FhRf55oYU z>pF>~K&c~>MIsuuPYg~UV;3!F<{aPi6!90;McsN6H-Ch6>AMu;JD;3`V;AkFaoHUy z49;Q2WsG3h4(Ai(MPN0_>U>aa%F88=O9;mZ3k7yu7W9 z=_37>xmvVuTJlZfs|>8^`ZydpSOhBRx_)I=u8w7{HvMxPG|Rx5b?$fL{sP$aYpg+D zr83VXHh(>sc8xo04vHmJjGgHRvb0guQfykq9d;#MR~bp0^11sb3B#nZ=!!kSbfi?s z={kQv6v1ke%T=u~wsC)%8Pz14t7d_&iHN}q+^+8Ai|Be9U-*H1`pE?N#(MzwclYTP z9Vdg|+cP)J3}BvT-u?aXz&w*)BlXSAyP9S%3Wdzw00000NkvXXu0mjf Dyazj4 diff --git a/src/main/resources/assets/electricmagictools/textures/blocks/essentiagenerator/top.png b/src/main/resources/assets/electricmagictools/textures/blocks/essentiagenerator/top.png index 0836285c53bf9d2ca808a6ce8ec7523783354c05..6e56a185e4375ff936319df9437ebb0de2b52626 100644 GIT binary patch literal 2105 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/electricmagictools/textures/blocks/essentiagenerator/top_auram.png b/src/main/resources/assets/electricmagictools/textures/blocks/essentiagenerator/top_auram.png new file mode 100644 index 0000000000000000000000000000000000000000..8696f7e839ddff5260280a1140a1d52fb8c2c131 GIT binary patch literal 2028 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/electricmagictools/textures/blocks/essentiagenerator/top_saxum.png b/src/main/resources/assets/electricmagictools/textures/blocks/essentiagenerator/top_saxum.png new file mode 100644 index 0000000000000000000000000000000000000000..d92e2354a032f7a4b772ea252cf03c919d46f8f8 GIT binary patch literal 1914 zcmbVNdstI-7#^W`0lZOy26z~1pl;`~8#{qEc7cf#8%xm#%(I;{wsbplJFrU>rpqEj z0~Eu{6bUaCBSR7qG{{HFDdwfPsYQzS5-QLfSZ6BMA3pxkd7g8Ax9@%5@AqAvlfPho zQt;@>qZtfFusm6!q({K_j(m>(4ut($P7jkPX*!igYAGvbCKw`|R1<*QfMpR%0>kYq zza!!q4F8pSRXUZfn1^ae0~_<%ux$ntjb@X8)j`=E$W4T6%Gv~|(;%z8RU?3`!zRsHAS@ILK?ng6ghgAhEOsM>*;qzP^bmuDuxQMB z6Qw7OfR7PVli5@PllJt{6$~bY;t8?Q@;Fd*$Uqxr0%0};8VtUBJ+!t^O5$HPo@#AT z*-ZqfBrIgMSwrVT8$AT3WA|(!pCRoHnrhb5Nx@b~NKLkZFj8_!0+T*r<9ZwwsD&Ce zpTlQyF}0e7#c{PPOoM1yagY#-i{n6XJPaPO9-<*hrnfK(f~XRF{*!xJOK&tI5kJj5^^vtOTg!HSs0EXEJ%wJT(z2u z^E9;kkMQ{a4IM~31^VjbKXo&-MHi!Q`lJi!#gjfFjCAvu=`Oh(c&ChRz8!LjNM-A& zUznL%goR!07LOYyeNJ_PFVGQN7ieo1R-R;y)oF9iUrqhq(mJL0^Wyt{5$E-%ni6Lf zjNQ}b+_f+5iiaWE>9vDzYj)vLh)hd~(ruxVBoF6F2(ZMCo)+ zSP*y7K9%$3-iRg~5$#pY80G0ku%x6BWlPGVW^HQw00_OuOKAkkGJgEIjJut4uC;nk zw6n6ZG9Im5=(*Nq3Y%GNnY|_cZLaQMr*yu&>C`DjQ~E4fZB31|?ZSn5VVUc;jarkz zPkG(z^*S3jnJSc%>aClv{*~+cqM>1X&*^@C*T_c4 z>W8s8F;^&b@$vFkWi9PVVH=uDC;ZZIqE4L_^L+O5o#$>XJ|dZ>+_y13f+CeJl#v*{#zD*FY^Yq#bh=YL50c56PC^n36X>v^{+r*Z$h`P z&yK38yLzA9X)jqb{rKndfrB%o{_Jb9oJ-bjr0eF*o8$fe3_c%KH`i(v-1Xl!=0a!Z z<@k<{j(gD`t=t!2+YP*6hYuXfuafL~>HWdWw?of-dGh+4ZzcpxgX=E)UmW#7^p+^U zq-0`ym$5M9Fr&xjiJiDEDaa9#bEzYI%!snne;i^5fUXU_)5nh-HgYg9@b>T-u+_%R zEpV^iTew&iFmC^pthMZANa?-I5$*8skp#zfA)KcQL+BK)3XQGXOxdQ-rQ{8 zq#jatSHlksxdKH+QEsT^@WqS``T3(-g0fR4pUmw$du6vLKe>=N@0T+? z#wlz`>HAf;Q7qb9?6+-I{1M0C+U1)aEGvV9ZDY=A3vqm`gPvtk0 b211rG`Yx1il~h8zeSbr_biTx$xNP-5V|)Gt literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/electricmagictools/textures/blocks/machines/bottom.png b/src/main/resources/assets/electricmagictools/textures/blocks/machines/bottom.png index 0836285c53bf9d2ca808a6ce8ec7523783354c05..f57439bc34bf652dcd05173a9bd821841dab423f 100644 GIT binary patch literal 1938 zcmbVNdr%Yi7S6>%FhHpl)1r4|UB@>|cJtmq8UrB)u91gO5yfGXY{+|)%|ZfVeW0RM zFIIa2p{ZIQgH)+lTjZtGiZsea9jF3=Gqx3_YN0-EdD(WOVEc#DKkm-#{$AgAzH`p+ zoY@_T%a;Z*XD}HIMo^qmo=lH`_x1Oozhmz_I!q6tRBRfxg3wV;jKmo-EuqGNI184A zC*znl*Y3fi7>r4FLrNNzrdlS}5S9qci-~YqY&4s}h?2T&n8t)tfEv#-SS8><{do{D zXeHoEz6w^^VsO1dnMdL)@|LG)@=O|33rgPwqFiFyfCZ;8z-2L89b%URd|_8i&%N7h z5O@KhOcL;=Q)#M1Aci1ufFHq!G%yDNglGi9=b;D^4sc+E%SK=}2Zazs%oBK_^iIe4uaV>f!0reDR6SLV)r!&IIjUdP@HiDuk8|JV%9Ee6hj$A8+xge`!&V&Uy z?$D418)YD@fY&0XCbB6BNPGG+1dC0jdS%$^7*7js3#W5s~Q3RPn5ax+0NYoP);m{K{ASMP_ zu+m`F5>CfL?+v{SSdNp199*j)2@CKd#bU#2e#eXY;T?XrEVs+=wkFvUv&Y!c-2R^m2MuA?vko+I7YhpYU1Rw z6jyh{dxnH`S;%^z!4KS7R*^KLQgtXh)>v|%tskwq)sg<6MaRB+4?24=Y2oM_MV|=$ z3g=Ik@($hfU>^&wWVAJMi)#jMFaF^BXCoV-v4!zpbTt(nGu{sl3}h_6%Q+Q(&G_Zz z{cDS=FI#ISJu9y2`5^U#I8uU)#2;wx`=4v@i?2o|i$tOY(uzu>zMI2qJa=xg*xgo6 zvD_OskY;nBJOAC_aMsQyN*vUBm%MaLFmq6G;-`Aw8+j+U-FWjYY2?x;OuPRt!}-U} zZIwoo$@HOei^*qG)6me+FP{EvF&9CSrhOmsII=v(#5|t*nf`f^tZ{A0veFGKpW^tr zKx1HA>(eTORev|>f;YSpL0b5ok|PY zf1tx1nmPTkakwphkrF>D*R0#lbbJ!J#K8Nh7ZL56f2}U1QyLXLy86q3r7il5f?D;I zNB{PH8nPGcg~F~e>O^G;VJ5j~@uKKfmFCw*_doa9X)2m@s#mWb>%b8n! z_H_5O-K<{~(z`qK%oO&1zZ%WDrf)AabPY7QiP5HOt!Hj`V17I5hqGG_?r5=8?gD@Q zF?jAiPhv^&o^>A0Z#B0oeo*#Fx7Hv3bWcw;Fr-zi8BsmSR3?`H3T6w7oN<}Pw@R1I zi)3{+d!i25vzD*T$hgbt3VxudcvDf9ym00YmNcQv6vkowtF&OvmEO{V;MDf!+Erx1 z&(T@y9RX)Y$gR_c_8hWHo@~4bIxgHfl^<$b!wNg?|J@XK$|C&6N9$)@N`1(E`275J zC6#A0Io}q&9T;D^W61+zPzC7R`okA=)T;+CqpH7l9%2~?c5NMUN=>uGq32h z+ibwq`G+O562K2LXCFGf;M+M?p%LDDDSw))a1A*<_qsD6JU=7yR4~_?rB!2;OQb$4nuFf3k00006VoOIv0MY>40Ne!6(`Wzy010qNS#tmY z3ljhU3ljkVnw%H_000McNliru-3$T~2rTLBdl>)#0}e?gwT#kDmb4TH{Vq z5=j7OXJ_^g+9fHTr)dIEN&&!W1z=iD7_a&JKflUqwF2<={kzv#5kLTf2zZM6`uPih z@+ymv0LqPb4+2_Mi`CJtr-uhgm%H8H%-((b4&ZQeV+K7`RDh5~{J6UVus<9m)zj}e z1{uH{ts9dEMSls^?YB=7fa*r%NiH%NVwXT#&Jph6`Wlj(5Y37L0dTk9w?Oss@-kr1 z-HN0Y*J4CGyP1xu+lLw?wu*^G#(l&G^<}cULMeiwW&kLVj<1>l3W_dCdjwICZJ=6C z@}NCVbqd)knGYqpCM-)Yc;sv;QSpCpJCbQQs=X2dK!4+t(=|H))GC^yX>o`eP*PM` z5RIZvFw3{uNG$3}snww6J5;O_p?i>hZD7+_=3Fb8mdT7_a|Sk|mvO%J*P@X$XOZSq zjoK2k?&}O{b@Wz=s0ME(zdYRE1Gw7ld#N=nZ=7@-Nx2xcRZowP0Jht02f1O;sMuhj zgR8N(<$t{DY;4PmcBX2@rj-T(4jvB_ zgiu|B2rhdA!$cr#(v+m{)mt(^gZzc=hYeP=4sO&-P%!|9w7h9t_b1;Y zFy>5VAqEUO#TDU?9h(4T#)m*;y>L?E#4sda^naw=>24{{lf+ybae=|Ser<{{_inY!V&qtI0dwBIaA5KxnGgoAq&&RX)q5nVEvi19 zMs?{Kh&=v$0Z=@#q#H>*OiLQ5WY6q4o-CP{E{Z zws5p6Pt|!R8@<+>%?yJi85O|A`FTGJsOys*z9g>K>j=eEZW;%e;G*wp9y?1zR~vt%`y`6}5O&r4{NisYmTpMbS#}C_*<1wm+Qy=+5kZ*Ymv3`@P5P z%Gl^P$B&&pmc!wUj|f-Cvm@Yn$BbaV{l2#=*kKx@Nn#S{bjE?(NX`O+HjqGs8P6c& zNu0>dZYSj&&d6*^m&7D#qhvg_hs6j6!@+?flvst2+*EuVQ?pCvCkQ{peF4` z8)aoE+5&hi;s!d0QSew#pIyOh)oPy`w%CUP#fD7a#H|9D4++d>&%K_a?MyuRj~g#U z+jY5CQV>tt=^UGp%}4s2VKN)L{}%E9S#M-9Hi}IOo~5RZIcCzrM5q-!_JmJRgbX!c zMuS8o0TJ9_0C6dj4&p{(Iw*xONGcUUQZWt>+j$Wm!cetPs*z|g6oO%mNGjH#p;C=h z4WXzQTc8={Mp*0&ZZVR>+7zoj#1;Q1SEjO&I78cXG@UhE1+gZYq3tHx3aC^-;3CRG z&<^`+o(w&^u$r_{OGzTkMw@}BA(l}ukVjD=PD)?`L|_;JQ3#QM7%CNkm{<&p5RxQC zMgwn%PyFA|30S8Do;vwg-3)KB#pszn?*ex5ypKo=+dMY5OV+(Ftz?^TV}yEv&Uv9J zF*(L3Zlc@WP?EfDYJq%mM7a_vSUIKX)lf~Y@a?qz_5MYsb-t5kw}pSZ9ay0svoSmf zJQEtZjoaV1>=g4_SYgDh=w`*1JLk93ziq}cr;l-WAg6BkaX!9VMLkNHu<7Q_B`3{^ zGprdIGa3%oR2(s!?UBniq?VSJwiX^%X%kMjDiVXNc)p*h^LSQb)rsYizq?cQDpg^B z>|1Yf<+^+gZ<0PWHFfS|AD@=G!?*r4d{bZV73E*tx@V7A&s%>c_afuowPexxX`k$F zZ1lxQQQ8#f((xrFViX-*5fFT?FE$WCkTykrOG{0S*<~5XLpt5==3Uj%=P$Ts&Z!ID z+^#PP@y^T3+x|iGiG!`W`COvpRQmlrt@8rM_7gE04R^9wE`0-hv`nc-rk`uydcWQ0 ztC9&PPIKNrx?J9I1NpkXKCZ+f{8Trq+r(XeYjtvRvTka@gzB0a?uFY+feo+bt?W$L zZ|sPwN`GVa;Sz&pVs}JLUz2NsighbX~M}{P;Th*Srb6 zg@PFkuIraCzn49+@#h@BhNh;J-Xg_^E`0z+QD^g(C`|7d-v{L*yz4=iIL7c z^!V)eK9>)BKloyH`Ep|S;;7FiV|+dcdcFC5d1!WBUES0t-|YI@f2ZRDe&yujgZHw^ zQLf+30pom^^4?hK%$W%Pqc4wKe1gusT3vUqtGM;^JN&){m5$yc4Sb)B1lU_LZ)9`X zl+{NTM(-=W3J+{qaE2l+|lKaPS5d!3QiwQ8<9OGk_#Lcy_~k+B!9)aYOOX(pRbr$zH{dm$Lx?B z*sl7Qd;SoW%bm5?J6zqBm6bcJKc}VgySlrBl^YwpH)vGKYfORnsv@j>|E%$cir(4Q zJua&MKy6&wXzum-lFvf>d^SDK|3b26Kp3No?2Ij3`A|0F`k?-9|< delta 657 zcmV;C0&e~B4ygr@B!2{FK}|sb0I`n?{9y$E000SaNLh0L01FZT01FZU(%pXi00007 zbV*G`2i*({6Bji-)soEs000_vMObuGZ)S9NVRB^vP+@6qbS_RsR3LUUE;TMOF-P-4 zHvj+v5=lfsR7gv;mN`!YF%X6MdE9{(K?CCGI06y0NNEysaeuT38c+g1lDGT3auzP(TmBi z%Q-XtIYUNOj{9E+kMD>h5rHedhEMw6ROSVaMox#bk|6DlL;)X@=u!6*2{jGP!BoI; z-5uc|1zfs}z<*7LgO#9H5D>0;4jRGE?HFMV;<_VfU1c!Uf-vy}mJ&QJ7vBh2Aa9lE zJVBwm5y%orjpjlIQ!Q|$j+8*a&OwmY2+Hn8pcXyD*GUA~bw`@+89})_k`Z7=+yjxT z`yO^b5G`;UCi26XhJ%1FnG-RBX5tw^3O89Gh-lMY$A1Y7pHxKw|KMC8Sh$d0J`@l( ze6GrDQ&#?Of`CipKKqyOi@;wMj2sKS9kC{?bTAU(h6fx3ypjys(7HQoQbFMB5`FXl zbMcLUJ5K~eWjo?EYQY?Mk-*NKgGB-1+-$r+o>X^dxXra-4vb_3kuG%C0@GUYLJ|(! zR0{-63xBE_x$Fqf<>NsMg5+T}EvG*SmV><@Pcv5F=AM!n0a4ilx*&6#)&jytU}1C6 z@`8FU8NqV134&JV8DWh^(`Z2?%WzmC3UKfc?5z-c@k%HFVBi8D1n##gvj6ag@PGdN r<1+GEWH>F3>rZ*ObXF{AkNyBk0U0x|UfqWP015yANkvXXu0mjfq*NFJ diff --git a/src/main/resources/assets/electricmagictools/textures/blocks/machines/etherealmaceratorfront.png b/src/main/resources/assets/electricmagictools/textures/blocks/machines/etherealmaceratorfront.png index 2dc3ee899de22be83ce8e434a75466468fc0b628..9929c3f4303d0c97b0bdceac84db64208b4469ba 100644 GIT binary patch literal 2251 zcmbVOX;c&E8jd1DRb+8t5hVr%s)X#21Oh@5A+kdVLD?qBL}JK7GMEsTB8vqSs9RmC z0t&?iq(?-E3xbLjajSR=R3Nex1fp`~B5;v%2NipNc>3ecIWyn(JkPs)?|aTUZHQUMAO;VqEyKqN~7Yz4zWK#-Eu z2znq821z0|7vcs6Q28>63owImQA^}78-eifQp*9p7=(~KaH~j4L%qFz3xyO3XsAe1 zAU04=2NOho8U+}x31ag#Vm?KH^72G_sHw1k1cU&jT9PPLQq?rnM_npBpV`KskRKtC zn1=e~6gMygNtY==B*}$@=40_Vq#MNrMV_vUX1Oe>5(1=raMrd6w*8sw_K#dDT>%1+Ou?4P5@)L*BtZtr zlnF99l1@iDMT(>XnM(QX%nf}Cm;ow8+d;ubg-n9{m}08vE9PB=cs|LMNI(N{lxPZ; zh(l9|SPGg%;JFb6fKWs9f=g8w&l7}zPyOr88s-OO&m#W*wl(gpD1OCNz!xOo(C zm)MLRxrso`8)h-Q+3G*8aQyxFTbI_3_4R?>1c!T@FPd8>U3>LBb9=Zmb0PmYN0d2m z30iH;DK?PQcl#{pScI<`Og+5GQW9C>UX*M z);z?f{W|=oMln57FmmeG>86UY_pF1x+jpcIeqbH^v8k&`THVuDc4AL9!`3Q)$%z05 zO=Sp{6IITMk8N4YYOQm>uwdu-%Q+zjE^*nByJ)qY);m{lV`3y9;w#%yuMLY;Dobuu zRNJ#>Y2W*;xoz4dx3bFJxW~xIsII4npYtLhY1)w!vuoY}dqJEwdhz(s)MQ+Ns|x2|aVo{3`J z^6PI@H@d4$Ivp(5>#scWb`qDR^xQG9$45ClD$q?PK89jqVj?3gw-h?(P}v0!*mOqJLvx^xUwfa?XCW$fL5 zT`?BaqsAO}9%Y!8;x(uee?x6O$YE|#(6PUB4vEh%Lhmp2TatAws5_<7?9N!C>lWKN z`QPue$nFc+6oe@ZI1pm?F2Ob{A%2pW{+?+4w)*PTxz*LxPwZcI)Z}nIRt2y5+35Df zK>oQ#8i~OSvR^OD3!QTQZgei`YWm4tG_cl`ct+^LC-Mgl}XZy_yeN(;A&Q_S*yu34g?b7Pzfp(ovrHw8$Uxn}|IX!J` zWR?8~%Q>>lZG%x46L`G2cUsqFNQ4=O?K0$Z98RCl zQR|Nm^qwQ{s$uS69#4DJ6k)!*d&T_H6F0y8ZdLTPoK4J7xx7&kc3-d8A02zMrxpfe z#c-qVI=V1GZOu=yPOpgLC0ebvs|&cLGo@!$S5!P18h!Knb+SrzbX#2**2>n-4pU&@ zSv(#s{}Gy1Sj-^C JC7<}T{{jNLtl|Iw delta 697 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 aFUF9<2B(%R{knDfM};38&aDdEvhzRVuE%!( literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/electricmagictools/textures/blocks/machines/etherealmaceratorfront_alt3.png b/src/main/resources/assets/electricmagictools/textures/blocks/machines/etherealmaceratorfront_alt3.png new file mode 100644 index 0000000000000000000000000000000000000000..438daa3b97fc5fb7114ef3ac36b17aca29d3fe44 GIT binary patch literal 2379 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/electricmagictools/textures/blocks/machines/etherealmaceratorfront_alt4.png b/src/main/resources/assets/electricmagictools/textures/blocks/machines/etherealmaceratorfront_alt4.png new file mode 100644 index 0000000000000000000000000000000000000000..ec6550e3168d93bfd4fd44ab7b88d3959869003c GIT binary patch literal 2329 zcmbVOc~}#78V(>DPz0=spg3m zViBwuD(8knEnP$q0S{;eMcYLVITnw$cnc`ya0eB4|M2M_JI^z}Yu@+$zTbB|&!~d} zH=7t+8DlUQ6JH-rFgoMrUaUSkPOp0MJvvz;+;AiWjzW}tIfU^P!2$^9E8#~&!4O}x zC%zqW!(a^J#i8Lycz{1s2ule3ISfH1k)do1#?3<|;|pUU1Sf!^#ZngV>|zsu6N^|t zm}>wSAY(%@VxJ^A6p|DeDolzMGDLufJI+nTL{k?pQz!g2C<3q8BSrWsyi{R7 zufTy6Lb+Imh+!#iPLVHw6A%`Fdiwqf5?MgNM`5YrL!i)*5mkH{kwgHA63N`X-k}vp zF!WzHK8aR@?vX*nU`PQc$c1P=qU`6%Xzc#l&>Rr;hPhQPMw7yi6MH21uv7fOJS@Q)X9@((v8EjTXpq&7fePh^(YQDnt1&Hy8BOf@Ziiu^Js?& zr}!TSHMbHzvz(oAD@@>urSjbxcl+*v=AKyL;O=wv^~QaDeTxe`JW5R}q*=cWCyuZ1 zIPkpA>Fbh^@qwww*oo39&%6J^#H%zV`Q3e4O|x(8o^4Z~4s!BwJTy?x^)0?bYkjJ% zQ9QQE2_G$zEFIxqc-V2o)RCNZz%6ywOrG?zqoc#Xz+g>Ug%eVCDX;m8I`Qdk-FB`| zX#2A7j7PV9ZW+PedN0eky#Aha8a#adyvyB^k`j+)#pz{N1-yp6zdq3MGU81p+&0rE zgiKv4q3ljZy$U$i`OR0cv5KOie#f|7`-kXNJ-nO-aj$dRjCDpuyU%6NLv{tzpq{^DYd*uIC!Hm+<7}NG@?y* z2yrZ^73CdWZ*1&!%65^yiJ;Kp)+y@bUZs-uxU;ju|@LqP>~o6<`zN zuwjc8cTa5Q*!i)9b*?`aXj1+ps#82F)&(DI9Uj6SN`KEQ3)9(2Idl2X%ci}L z*ilbQF4cGIukImWCpFQ}GE^CbR<S4_N`O3f{8eQa%Q-EN;% zP>473AHz2}f7ZBZpH14#x>Fn9FwY7#PDyyrjD=W>X{QSaL^wguX{rwSKv&ciy z*rKko{tK0rCXb#^Oi(L2@(o0%n>ojGSieXGo2c5LveME=GaHpd{rB!Qo^G=n3)!`c zIKH?@s|+>#TrZG)KEEW8SzL#+-rCdpw~<|A#yiA; z`pBzSufkOut`!ehtw~zp2@lli?eHh<6DB6E%+dleMnO~>E#6dkuAw2~>5Iwa9G?YO z1l_s0xmvB=0#C~Q1yg+^*mJtQX8QJDw{7sss)-6({SaKWX=&MCGHTo3_+=IF{BpkDhz@WQn9`lY%rj;lblE%q9s@_WhXR}4t}4>5w6M5- z{d(&#sIT{|tqrRhMB}h#O~W60ei`m8R;0DwuHfYA+J)&a`=SH_uOClsO`gdCL7 zh4`0E$=}wLu3N52x%{Z5Hnr!AH>16H`7pe=$~g7K^F1xt@YN5LwwcbqYAj+4tr;)! ht{_javlhEC>&{*6P5)_k``pipFE@}=<+XeNe*h?F$>sn6 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/electricmagictools/textures/blocks/machines/etherealmaceratorfrontactive.png b/src/main/resources/assets/electricmagictools/textures/blocks/machines/etherealmaceratorfrontactive.png index 12b2a6eade0bd7e6512a13434631448c854e352e..a259e2150dd8550345706e5177a9aacc7af62ed5 100644 GIT binary patch literal 2393 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 delta 770 zcmV+d1O5Ej5}F2(B!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000id z000id0mpBsWB>pF8gxZibW?9;ba!ELWdKlNX>N2bPDNB8b~7$DE-^7j^FlWO00N0g zL_t(YOSP6+QxicHg?;k}xDye|N2`2Dssg{ja>-y4OCo`|;C}+Xxqy^bi9j%JkOh|q zFfl}MBmPKF&*|yh?kPx!r0T2Y|sSPM4eLITrK!hSTKK@HMVsj>bHg zRhNwp;1NxgcN8UmE$^V=xR~A+n9-t#1aPtrcu@MIDXJCj6EQCmPjv{)XlV`cu>$TF ze@oy#8T0yw(j5XbTAU$Pz`fO961e*i5Kndp%xH0j=zjqIlkcwll)xQ{dV@phwhZ`0 z`~YW&6)^eXhXn5aXksv)bQsu$(@_=R4ABAnbLaiG1nx7@#MyYNL-20U;ta7a)7$U1 zBye|un6Qmi2k?k)z5NbGUu^)0n{P-%U|yOnSy4hv*n;MRKnKvr?O=rICvqIMtWY%M z1RcOzQh%2j*P9jvpFrnyy$*qX)|J+EJ)PQM1&lA( z1-NO~CoDm&UXq~b){Tb23gDy0FnR6*P&fB{EzqcUr2SQ41&l4#0;*Wq;OnZ^i?y*u zqpNt?(#8|C@~ diff --git a/src/main/resources/assets/electricmagictools/textures/blocks/machines/etherealmaceratorfrontactive_alt.png b/src/main/resources/assets/electricmagictools/textures/blocks/machines/etherealmaceratorfrontactive_alt.png new file mode 100644 index 0000000000000000000000000000000000000000..ce74cc22a072a53e0cc7e78bbc21d250f44a8cb2 GIT binary patch literal 2458 zcmbVOc{r5&9v_5qY{io;OhXN6mUk9rhOy3w>_(AP-kEtZhgr-_3@xX!Rni_M?xaxa zNr}!)vLuv|$kt=YwdC5ui9=43J1X7#N6-1=zR&Z%zwPt+e80c%@;vVeU+--iYKCes z7)-<6jpi>O;mhx8Mfvx${=^OWU?8Rki5dJbaV#i=U`}j46N0;Q!EneQ0@-oV^^hG5 zrWDNy2oeW*c~V$>E*f0Mpe0;^oDGB7IYx&) zd~+(u%NOp#7ea6%nuuayaRA(gj0T7VG5~Ca0OeSNnI1CPlk|R)}IGz}kpm-v)6$Kh3 zVhK3{F^A8CFDrsf{(dnPA@}s#6}SQ~uOGrZ(f2^fLxz!n0t|r0Vz}JpdwoTV#QxBK z-S{b56c8tXF#eE;zhB6b=OfH)g)EQV-y2#6%DtiZ2s!ekfKfC)Yd;s_iQQ>bg!}}} z=CCO?OfrjUjkiV-KqeCfk_cfakcA6Fk+5VeiG;_Jh#;_{^D{mPZv(iH2v|DVng#%L zyc5mE*_B}J1YpU|WC9((!gc3~#2}9at=Q(sZGYq9UH_I#aS=kGm@f?A^P^U(z&C;~ z=8Gcu0=SC{+#-;}WAkH0mdhFXc3~PMT& znFJh)X#-(VST=|!u>k@WBCrwP`RxBUbQrl)nB_Y8pSoGuk{9Fh^hX!S7eD$4;>nvw zDDRSegqJ)ROu5pX<`f|5D%t4~wPS}ab@*`a&8gX@$O2+>;O)`G8hys=TO2n)fqo2o zP3cs$;^p8X^RXj+jygInh68R00HFkE8meyAFDSa6q-_Btue)zi)G~Kyq2iEqfm|qx zDZS_qw!O`mowO~Fm6p%#Js@qc`N#!N(Ge)eqYiaZ4b_2I{hEiI%T>-BwO$Ty8hebM z(ycxqoBF6^{08#;tBRVe@Z|7>p)c!BlD*b{LC2z_Q%P!FjE|F3BO|chN6~|5rLMF9T1QLE`TEiiC3rjYt55Qr z@~a=@Wn`%29j>bgLK@kcCzK!dIJp?p;~u_8+O*B&xN1LD-NNtwv*%yFjD!;W&i-js zUD)NwoB5Elvu~bFuMaHrY^t|2AAW1oYrL;ig&@L)KXGsA=ukPhG$QqQmh--`u`$jp zHB;)V<~fUc`(8OdLm__E{9tEsua}aNQgev;x-}`!@OZo&=Vpe0^;Rk#H6aUE`7Bza z7AxVWxpxUsP=1VX<q{;uC@8a> zwp?s$Z;$&#zn&8tpzL#O!}Tgkzl3g-PRR2Q7cuNQqMz z(d&+1^7ujW@tkA5shgsL4KQQ3?9jfVlRn0UE$N@ynhWN0FQHDS1gSfvLCPw+%*0F158VXaqVO~`y-6(75I8m+q01N!>1TlQ`pnE020TX-+t z4H(#0+S&`Pl4?Tha`c$i8%-98 zb;Kpc7sU9RjT>5tor5#)^Lb}Th9Ug0eCY=?TC=HmJlQI0CR}Ha7hgXhyyZ{XutKK6 z$)RfIV%AgJbj=I3QqJ;yI#b4W4rk| z8S&acb7{x#F?T=m@C3rU#y7;Vi8CsuRM+5KY3_#L(NnJFHujmn-1!prd~|}6%iI-! zE+4nZjdNCaGxBJ%KiPV~lshxEfBA38o$gI5bPhfC EAHb*&`2YX_ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/electricmagictools/textures/blocks/machines/etherealmaceratorfrontactive_alt2.png b/src/main/resources/assets/electricmagictools/textures/blocks/machines/etherealmaceratorfrontactive_alt2.png new file mode 100644 index 0000000000000000000000000000000000000000..a72ad30c14c6c3719f4a94f22f78cffdc7cb87fe GIT binary patch literal 2446 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/electricmagictools/textures/blocks/machines/etherealmaceratorfrontactive_alt3.png b/src/main/resources/assets/electricmagictools/textures/blocks/machines/etherealmaceratorfrontactive_alt3.png new file mode 100644 index 0000000000000000000000000000000000000000..36e9220301cba54d640c26b279c1b5bdae0b6b88 GIT binary patch literal 2598 zcmbVOc{o&k8y<=z8E+v=dB^Qr#*8J**vd$ZNQGIBF)@poBcqa~RAekK*~&T< zQd$wp5-KIrCa)-zQi;++^|pMY()az*_5Sgl>pJJRJ@?i}heFYGAqaC~@fje(gG*J6S0G2jV0Np-0y;Asgb)mn&EeT2Uo|!(5ge91(jQO7Pz7W# zjN`sd2>NdGqA|CHGl?wZDhGs}m?S6Qf)E`c=0@;DB(Xj6J1wu5#LRqaC_tr zrvj+n2r^#?BJh@Y6cd955CoznfX5L5zyg8A09I%KgT@k306@YKNPsos=Yy2130a{e zAByWwE&0kG83sWD5*i&H9c>wHWyu$^(EyQ1L}RdMEEXlVK#5{_5M7MoiI&eYP(Tq= z$PqvsJ`XX&NN4b)AbX_T(;rvh3aHdy#5~c@K*>Xf7Sjc2z!HPza%b-K-C6|sfd6&l zx7H$Bi~vOYfFgdBkSWhc=<->xJa+#sG-D|DhO}15ktc;7LE$r_xF8Smpx7hjCzdP@ zi$q`$nG9jX0Aw2guy!F@Qvkrl z${CNNIO6~(EYXUBv%xscVm){wh|Xhzv)UZF_D?MSU$G>z5TrwVA&t+En5_cuFh0Z= zh4BRlG8tj!&*8E7(V`VI8TxTy3Mk}k1zD~_J{R#l#3asd zEQ&z@F(?d+Ze_y)a2OEBLjJ_F{@>7{g0dwW_C+nj5E_;T_9il>LZXRZyuq% zOV0T=DZyaMYdk1UH1Yj&>%${xE}BKQ(>47MCaRz{8=uuGDZSsTH=n^!(vrjnEZ8D8 zF1r=CZ}*~vxe~w?XXv`PBToarTCqUKSXrw0CdGZB_o> zlnPwq0BX~A+wG%WAG<$x=dUx!|EA+yQBPFAIs`ZDjT{=D{%3e|FVrHepBrEvN%K1p z*O^y$4M%l!Ug3O6d54q}KiYjrq5YXQ`~>H=k=SB7lyrm|)E+p8c+ECzRn=B4Kf>b}oHg*|A@t`BO-c zMHl%wp?>jh%xl53;JB|8Gj06Pk$_>}%IgP;n$SZ}+LIT@-zi@^@3?=}j$QNXl*X*e z!?-sFC^u!)^Sjxv@+HgTx7SjYBP4Hi(zIi`$qljZ8heE4lWG>%-(;T>v?@-}PK#w- zEr;@(nsyqrE3Xks zaH(Ju54;svUEEe2_4<;!fGyiR#AwbotXIUVkpnaAj2^Z-Dyv@3f$td%>W!-DdhV7; zi)g9qyFaKXeu-XlHCJ}nRlM{J^Ib=88uieeK2eEGTzI&qMoVy~HbMVE<}H0)-O0cl zi=D}vLdtkgt`tdobsZ(JiT>une=6d7RB2V0rR#iquegd@L%i2T9`#mhU4L{#*C=^d zBYQ)=kISCc&rO87IMu41wwGh3!nU}G2uOKmWM+NJzTf+Y#_H? zgc~1RTE!0gkkI-zYg2gl>%q0tM$GlG_xeV@l*@DuT&rF9<#DP8Pz_vVVIOvnkB@s* zezJ9&SisiuedmBddRo*2wVzShVDEEcYrI~7n9<6R(85P41-xwV|{RX_= za%pI2=)H!n^Quzst9Q_I^?ddEOCFhG&TF`)CX%M4fcO1)Y zd-jx+WZGtP+ztDa`;MC!80QARNrM0V94Zl|NV%<9({H@fB@ziUK9=#JqlDq;*OuDg zD=j`dwUzL`BD3>@pO)z&9@Zmuvq{9B(~n*XZlNo_K(Q5j@1gWBB!ot!7;*y{o&ze( zoy9c+FAP{W=j-&({u0P*N`P_?ZyNkiAyL zmYBAT${gLo4|WLE>Kzg1;!97QJLkj+IDG7FcH)V7)Ra>`6&0mHd!Cjt@?G?FI?gve zIJL2}UG0<&d}Ko{^NMU!0jz9qbmH@q_I#^PVQJVde9k4W667I!*s xd3^aS{M@U`BbN7q!ijxV2IU*OhyGMhh6%2JN}Mh&`8@OI=HcQ+sdf%Y{15I4RImU5 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/electricmagictools/textures/blocks/machines/etherealmaceratorfrontactive_alt4.png b/src/main/resources/assets/electricmagictools/textures/blocks/machines/etherealmaceratorfrontactive_alt4.png new file mode 100644 index 0000000000000000000000000000000000000000..aaf16b310755afc925b5339383957834d1b4c41c GIT binary patch literal 2496 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 delta 835 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/electricmagictools/textures/blocks/machines/etherealmaceratortopactive_alt.png b/src/main/resources/assets/electricmagictools/textures/blocks/machines/etherealmaceratortopactive_alt.png new file mode 100644 index 0000000000000000000000000000000000000000..f614f903597da3e9018cd1f78b87cbda5d467b8a GIT binary patch literal 2302 zcmbVOdpJ~iAD@zINg-j2Y1mDdF=wu3Cc|Rf%58=Q(-w0%GX^tfoO5EZMPhABNoqrO zN&AczC9Ag9tt4zw*cRQiic-4RXp5-cqtg5S(X)TN=XuWg-M*jC=llC!p6Bce3h*{I zvNpouaK^qqTs}79XI_K3*mv6U$q{U@LOsLKU`U20h+q)sCWXWx-d8D-gM3gVO^mw; zI^%FUaf*;IG|bF-j+c$iXSPWM{5umg zhC_JoRG5Dd-UEU`Jl&B_lmHYm-ihT%rqftt@>)CvAX7EBseBe9U)jwBC}X55}DCb zAR>VkYE%KK@H31eF|-xs5HL^QUqPw%_y0(&LOuiv3mHixQj^Gz07oxPNJyd@B=JE6+6qgse8}u(!C376U1-J-^M)M=E3l-9V!4oHs}fY9zFZCgJ8_gM zq--ZKOCn}a8AO^$EGCMWG#ODOp~#3#fCVs_RDekrk!N{6g{J^4t_PXx>B(Yvk;$G^ zH!79x=0>HsQJH`j%iUuZ>#IUgkxBy2YAZ194_NNMV%Z)rC_*7P1cG8`s~{)}LLnpy zQsX^5@D8C0l@v-qR?TGS{e`(8tcVAtUNEG@zY8&2@djR35)0iGC?B1poxfL zsfbQw0CWJPG8j?@gGTs(m;S$@BVkUFX6odB>SlHeE5@1W$1cDYANvSYVa)?$T{7uy z3*d0NcD`J<5Y3HxL5$zBjpmInuSn#@YfsdjF&*meI%de*l-sKxC0tKah|SFgZQo8- z7&9zOkIfsg5Sp2Fzfn$)LMamlhg(|nzn`lj5`%#BgOB4Ac5HK%$y=$2+Q{GTY;TRz zU$+{lFK;7HC$F#$+Kf8;8azwdmTEn1u<9bkxl*v^x$YL6Us-VK&-?c*YkL?GUC3$| zSL0Tfum84M@9XCA)bW~{)a?D?6VW;PHvOaZ#$i03sBy2oVG#YfaPwwel>I}+oy;zU zA+4{k&qIzNW-XR`9Fa zBjF1xwP{6V+~wa8ttR1#F&B%HJ(k5s*R=u=*RJwu;7Utk!&Id6-BZsiLz*I?<#ObP zuDn58-Ra_*nT&tAnD4tTZT)Cn0(xAp=>8alz9lL(< z#dlrQXuTIe*#%SIsN}Wh`uBQX=Ua3Qj~BctfsZ?^?vCai@Lh50$nMvx!Uapn!S>`I zc^L+;+P)+r-Tl3ft4jv2@uIHTo>4bdNreKf#S_!<@}fYiqOpOBDp@pRpZx*5g2X46 zyZ)&af5D`sR|$(#7T&O#4-DgNfxL;=+wHTpK!MzPV}3<>f?w!~0`pU*;X^GIF}HJW z@mMWK+jj_`_F8jlYv#B-B~611`wJI}ye)oulfGfJ|Ia%o)@<^5R$rpGz9liBzV=Cv zcizzcjcN9;2OnI^3r}y{o_3TQvc66qUbW?JkCFC5s%9jGXZGm3Qiq(i%xhs#?de~C z7364tzR9ot`-gfuROX(?a1Lda?OHiukL*q6aTuKw@NKl)@!8pSUFJg*SIu93rde58 zsjelurA@X6+rhD=HAXGc4IB2^3%QeH-I>Fx$yV60G;{UjD@}TP*YiqyAj9gFSgEe- z&v^_)U$n8s#gykq=Ehoqy+ZkooT!vhEQ`fR*he7VN7Y;rg5 zlB}Y3MO$3qIBlqrs=W>#h8h?W`;1~SCHAeRWmhT(zgNA+!um~L4v$*t1Ddg?-H=!nw;ct1t{XQBW zKVrDXf;wuXK9e6lmDD-6tyMLxmlD|6J*Uv?2=C-)r@ko^T{-U}D;o=?$^O)FZYr+Y zte;NE?y-cBgkjqOyucvDs{9&haIg!4VwyX4b`;c)m)RJ{9}4GPg62^49~BmLcdEqV z^Br0F5geP&j*bOieXm~FB~vIKJ{*ZYp_8V!E%ol!(EQ%WEe>_M=1^b!pe(h+vucqJ zxmc4uwFZ`)ZhWv(y5V+ymT8XX9IQCrn9P5(I1)F-41;#xIxd{~Bk}bN;2w96O#2US CM#Ay{ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/electricmagictools/textures/blocks/machines/side.png b/src/main/resources/assets/electricmagictools/textures/blocks/machines/side.png index 7783103ab1c3ce3e44fc28507d0ebf01b73e9f8e..49d4c9fcc3c152aa867693240c6e7b37a5e4f44f 100644 GIT binary patch literal 1905 zcmbVNc~BE~6b`i!>oq!9#S6DlfeM@KCYxi^BovZRB7`$VEHGq~-H;WM4aw4kV5x;l zwbgn6TCaj)!B!5jRZ$SA;(Dq~7Ur^H#w>yc3`8brm2-NVS~&oT z%Q=gLT1abC5@s^WZ6}i4u{xtW%ZTEfFa;oUNf`qcg2n)sCEMzdy5yY4cBRbRyUpVO zk0ErHob$w~6m2}9r0fJBRIJQ589?#jNBUGfms1Jf73()?L-XQeS0Xm!jTv7jOx zMmuSvNy-X%En)^LmzHxFPoIQfv1zqW4O<<8`4l37fWbVT>cZAI3?)gGqAmfcR&Q3Cyf@P~HW3Gj;(i)YV!<=w&5|@e% zsL>!2h(H807(h&dm_W?PH-Qoeg(MOIBoSiph@EHgl}LCbB#98JQBed8s|Dc_p)g#f zR*PXo2!$h&BV3KuL1R`UF``W}+QVGrxm>BzPGB@;*HKjVNEO7JDVlPaDI1_v0>O(& zD^58buX=CjNx&+?PQFdxk#@=gJWjEce1^Qp#5W2>hycWxC_xlLU=T$h6ch>!Vg$!b zCW!>+4D<2-n>rrj6wg~H|EZgiEv6W~)2Cg)ES~leVP%@f&UA@JeB~b^XaGmRN zb8>2&U&17hr?E73`?NyY6itN!DO@?V`IQKD9{;V3fpvk!=C%Hl=d?$CwF6k8AG0AU z1Uw%Ry`4SKzw|8qYGjdSc5I7$>zzy6s9(0ASu@6XI+3%t`&n!5R+E3HP270%=8`j( z(k51%G!#KDz!=H+T_V0Hmo4P+;u8Dx%%|-=wChQdZn^x zApXra*)m;$nlo9So}NDMfuCP%{n1;08um6c_{0R3wC&p`)N|II&$~ies``YFQj~&3{)N1w=p-l2R`1ewU9+`2mW7{7c zeqWSMJbjM!-tpzK&fkzd4GjsUR{kd4>>e|F-K~#OQ&V-*3Mbao*0L|(ej8Z-O8&~O zq=UxJm}=AOa~7BPZ4+kioB9Ljs5(^>GXQ?q+^JaC(%aj+@fSe$aC&9?@{ar1s*<|H zFTL9qym(bmlK%<+yA~QOImeO*toga<%)Iu96`yvxf_Baii4>i%pYOin==}CI@x%EO z`-*ro8{IdqU0aqjspJO$-)LD1)olNAv;_4W1B9_`(|CvcbZGWO${2Z!%v zSBTjGHwTRi+=_c+C9`HB+>bv$cIA5d;wmRp8 z{f6#t7}xu|phD)VyV2?Hsj8~lY5P7So!i~h6ROzI=(}F6RQyC2`hHl9Rver?;Yjg2 z+k3{x3>>OU$QaGOu|TvrqTg@hgM!aQs|NXTy6CR>qLqJ1XWkgn-;G}8!@9Wk07NDi Q?DYNwHR@PZU4*{yAD?RQ{Qv*} delta 669 zcmV;O0%HB~4z&f4B!2;OQb$4nuFf3k00009a7bBm000XU000XU0RWnu7ytkO2XskI zMF-ss3lkSLJ=K!U0006f&U41KbNoabbNdnoo#hGGA4hoL`gXnWW& zpcqzQjeDz|)M5`*6q1sh1lV{8BI}Xj=abymZ#Mu!2M3nwF zO#{Gt55P4ofTnGr#jgLk__l2UeERa)Yy@_cLLg8e0Mq#LJUj!q{&-yj1DIz5u$#u) z@3#Pa@z_8LZ8CGxx{84F$nyB-5kP;{^ODiqr@sK+b!(%^;17MDtS9h#^BzE$U&|3B z_l;D8puk!b3V#3a;NWD^Zv2FppzQ?JuQMe8<2vH;v<-FhRf55oYU z>pF>~K&c~>MIsuuPYg~UV;3!F<{aPi6!90;McsN6H-Ch6>AMu;JD;3`V;AkFaoHUy z49;Q2WsG3h4(Ai(MPN0_>U>aa%F88=O9;mZ3k7yu7W9 z=_37>xmvVuTJlZfs|>8^`ZydpSOhBRx_)I=u8w7{HvMxPG|Rx5b?$fL{sP$aYpg+D zr83VXHh(>sc8xo04vHmJjGgHRvb0guQfykq9d;#MR~bp0^11sb3B#nZ=!!kSbfi?s z={kQv6v1ke%T=u~wsC)%8Pz14t7d_&iHN}q+^+8Ai|Be9U-*H1`pE?N#(MzwclYTP z9Vdg|+cP)J3}BvT-u?aXz&w*)BlXSAyP9S%3Wdzw00000NkvXXu0mjf DTYx*4 diff --git a/src/main/resources/assets/electricmagictools/textures/blocks/machines/top.png b/src/main/resources/assets/electricmagictools/textures/blocks/machines/top.png index 0836285c53bf9d2ca808a6ce8ec7523783354c05..7506fe8cc903327ad4082940fcf65f1c968118eb 100644 GIT binary patch literal 2004 zcmbVNdr%Yi7LJBdfj||s3Q}2uUMZ4fHxJ0BJR}4ZCA<}=NZlkG*g~>lvuT1A)JxG3 zWx(5t2q=b!Q^8`PQm|;SLI)WhT0z?DqZNc=M^IiBMUlHv@ZLY1{&9C^_xJj~^PO{k z=gb}o58Y&AHngBEj+q|1VqjrZz%XcTsVFlCA7w|TSC<7{#L;!;-MXePXe3-B8im17H zo5KWNL&#(w<{PJCrQtvTPN0B*Envw(E(CbNY)HU|A;<&Zf)I}bfgCQ(f*=v!O9XiW za}SeJBNR$eq$Frgi(2_GlSon{;&AkOJzLLX<3u6{f?=2gayeWsi$bupX=)NNu+&=D zc?%L$DVbw2;#y#zCb+B4OVMOL@h_>wJ}P2jtl=SR}?^?2#FKXIG!?J1>s3JiEEQ^ z4G<6jxW!;<1+LeAXuhF00ZUK<`wUeC5x5F?onjI84tY-{S1$16^H>NKB?|`m5DVsm zFiXIbdGQs9QYjQFm~(u^|C>4v7(k+B4KqH#r^VaNy?~Ha9M^evM}3l8 za(HDI{hqr1Wm#>lT|sw7XJ_Yvs;a7?g?`YVFg@A*L`&?gr(^9FL7CsXtE5t?pSX|P*gQ1x*VNQRNK8!3rcJGl*B^YhKdY;& ztNi; ze<^_jE?weAG+rA2V#_H?(8AGgpr*EV;kj?VSy6Glt1CO-d(C^+Xlm**|5gi(-kbb^ z$jKJ?B`rTmJvM$P^F7yP>l*j4!%i@D1$P~tI?8#K4ZXcRKeX!}le1?S9`7ISS)ZQR zBJFPJAKZG}O26LDGIjg#kE8ZQo@Z&(r`i${3cuEOf7Jf|zNYh(KQb$&s&{b+t}RKTcbReM{`1K#yv{fY%g#7 z;H3A>=BKSaMn;KgPgYypUgzq_=Xowh=_BAwR^Z^XnT%WCid~*>&-5CvZB$Tl9G`Qmq*o*-jWhyAU8-Au&#@@~fR9cP>w8I~Yz7=JnN UZ!2B9`9B*R7%Hh2@A~I|04OjoU;qFB delta 887 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/electricmagictools/textures/blocks/machines/top_alt2.png b/src/main/resources/assets/electricmagictools/textures/blocks/machines/top_alt2.png new file mode 100644 index 0000000000000000000000000000000000000000..f4b5c063b8a434e62406b1359f6e9144c7a16235 GIT binary patch literal 1914 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 M07*qoM6N<$g7C_UlK=n! diff --git a/src/main/resources/assets/electricmagictools/textures/blocks/machines/wandcharger_front.png b/src/main/resources/assets/electricmagictools/textures/blocks/machines/wandcharger_front.png new file mode 100644 index 0000000000000000000000000000000000000000..6293754e32ddf446e2a4a3cd5bb192aaed2ac8a8 GIT binary patch literal 2047 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 diff --git a/src/main/resources/assets/electricmagictools/textures/blocks/shield.png b/src/main/resources/assets/electricmagictools/textures/blocks/shield.png index 281371cdcd34b6625b2037283ef96f0d723bd5e2..eee71316d473d3c02f13fb8643670fa2b4950b73 100644 GIT binary patch literal 2262 zcmbVOc~}!?9*&|IL=;v8JfK7HfW_PgNhBg9L_otrL*m4u^9J4-<&75tw-K_ShFOn}@JrJ{l@P*TD+Z2g2WIg zPu+SO3dG^;wyI(zs6@1uD}yy8aKeUU(&#WW4i^|?(t)yM2nD22l1j@X^i^LW04h0; z5X%%%L^?jCRE3%K&^mKujLe)YCmh(iViIK(8WjlOkf=-she}-z&?rbPXG(P$(Y=_FX6M5b~$95RJQrqPI)1rbTrqM(VWMSLb1 z1P~(At8}Oe)&diZpcFQsJObwFyCZ0HBGCt8E%H84SjfmGP)DYcC}fRh;#_a75mXHQ z*Nu-_BQdEuh%AN>*r1nT`B3;wg0a~BvCxDe<_-5RdKH!wP%VIE1`VV|!v#D7_J<@_ z$+-bij!ep;vxp2(DkXw!hJpynXbK{m!lAI)bPAgZQYU#nh7YB&Xw+a9hr-}sIS6G0 z^JxMhpUvm6X-o=DD4fKGYY`OG%AiSY6{h_j%l<FF6xPSUuzIozqLeTSBT85Y z@cDpmtV%0~jfmewhTa`m0O?gJkX)#THNe{tb5$RaXM-#jLm`tBp#YhJ$f7WqM7CVP zBC@0u8iTEnaTFkf@E$M!e?v#coFY%u$^X>N8O>>g!5z5Aj%n|@ z6<3c0CDk0>V0%G@X`Z|od8G?n2Kq`a4ZKMGGO4_;>{-gU+=9`-iu=cJHfK1r6+|v8 zxv;UVV-fEfa~7W$bj2OXdj+#=jX-Q=h{gT;{tE8P=eA>&(+HYveUDoGJP)pG9ycFt zbQ!aa`_*r$3|S$HR#v?ZdhD$CeztaftASH+F^44(_T7EZMaZv?Y6fY?DsP+%k9Gfo zD{1mxw)E97{Q>MHKzu(v%6DmN9UORa%K7QMJTb+UE@g=KNggxe#(ulKr5kO2X#4Ad z%)0fK3*y?+spjE91G^^TrzJz}4od>k>$-UjWnM~URlfa^ zh|1&#RdvxP(+O@R_THN0^}Xl*)mrU-K&;L$Yk9eyh2zeeK39CACO<}2cj8W-r0uh)(b+>6ZaeN*FOldui2>?!mz&;hdf&FKX(OpLir(G#7+LE z#PNx254*o_pCehARbM*&mrXDKQBz1prT`BS{kVrX*Jp39eWUnt)`5#kocmtKpCWy> zF>>14caH9O(iCzuHZ57{=}mK#MA9-(Zn*U4?=svD5;Z^#}?ikqOU#eejh>}x)bec)c&_2Urk=y_)Kc+5y#n=(}^ zygXMMJz{QDW0mrFUrEu-^Oz=&b`cGdK-ucSpQ1&=`^Z4(hxIUa;*v;eg z#95_I6$bosirhN$bNL`;1N(?Kv&60caKk~v?$8BoZ+^A+?X2A&ZTKu@g-egZ_1YlE@ojhy#lhB;wY_$z|6JhAurB0HVeZeGGDvojU+H*S37W}OqX ztif)-D4f3RUVPjYC)M^E`Q3VGKPPEKyCx~Q>dW{ROKQ?!phWAT{-kzkT3pVdZFPqJ zAEifzdM(VAo_U98uZcUahSi=;`(BeOPIgN|C3OQ?w+JUk z@WGB&*^0s?uEhKO1yg4i$^9E_1s%8}r!IeTyLixd<;qc2LtO6Z$HPT9JM60R=~j>9 SDNz$QjquP&!I_Z6UH<`A?xw&1 literal 217 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`3dtTpz6=aistgPb%?u1b{{!il z3=E|P3=FRl7#OT(FffScPl`Y422{&g;1OBOz`!jC!i@DP@e_f9QYEetCBgY=CFO}l zsSE*$nRz98ey$-3WyX4@dWMGXpPkHssw_QS978PplPwA!9H{p)xWT|?bg;u9;ne^C z2|dggE-=h+E9qg&$Y9`kaDjul#Grve!jEl2KmQ+ghEL_+bPbKZ&I204;OXk;vd$@? F2>^w{J*NNw diff --git a/src/main/resources/assets/electricmagictools/textures/blocks/solars/air/Thumbs.db b/src/main/resources/assets/electricmagictools/textures/blocks/solars/air/Thumbs.db new file mode 100644 index 0000000000000000000000000000000000000000..04938b4c7437fb04b5d7e197c0c159e6d2f542d3 GIT binary patch literal 8704 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 tLq?@6w- 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 F{{eyKaA*Jk literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/electricmagictools/textures/blocks/solars/airbottom.png b/src/main/resources/assets/electricmagictools/textures/blocks/solars/airbottom.png deleted file mode 100644 index 8b45cc4d6ee1f9a91dcac56e88f4c24ddf2274d7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 775 zcmV+i1Ni)jP)Fj$M0000QbVXQn zQ*UN;cVTj608n9RZgehAMN}YmGcGkQF)>H;LN@>a0&q!0K~zXfwU+5llR+4Ty>}N} zFF=V>XzOLTphR5JA7WVAQn9t%h3B2~ZZn<6L__jqIA7^J=k3t1^u~u*x54|Dx4_|x zn++dd-vOWYw;Vo_AOG_99ymI90KUF^*l_&?eCpNw`Twv=VKpBUR{mpw8AZfP_X-!O zfG?BVex5v=pFCymF`gZ71L|lGigfm48%Vww^XRGq*t-ST$-n|p7hR|gDZm7hM_Tat z&0XNG1Ydh^(mo?wN52a^{3uB0D0YNOUAZ!2TRAph!Zt;1GIJLbd1!v#e7q;2)Xx zP-kP#MQ2{g)XB(Bu`j24ZGmj4L=E)Dm`WH$nt~PZ#|AYgRW&h%<5K3JdYjV78`Y&8 zRtbx{xK_}xoa`;UfJa2B6{xy4f>xJVKswO^X8t3v0=IO$prey9jhqX+KnwVhw85CO zdI3*hO-e+)IG2@&p9^U8RgDlyF8gaKEIEhz*SXLw2(V4mp`e9pO_2ienti<>*()i* z{=6nkDnS_7I%o@UthEu;I!;<#49Tm~jJ{1-V6LXXjJ75t6l>BmqvWOl`;*s13??Pm z&$Y(w#(IJ5Z|q6BfiUh|o((Qz-Kh&;ne0xFpMbKH(pJqI)unJ1FQww0e18mBP~B*B zr2>PllA-VdGm2CTP9;RasTCX@+y_OG=Cv6eiZE}S^x{ZbpdvkwKh`6 zbu(Jfd{+hE4j%z#e*NPy@?(*3EIyup%bP26%?0~ge*oeBPQs1kUEKfx002ovPDHLk FV1lI?RW|?t diff --git a/src/main/resources/assets/electricmagictools/textures/blocks/solars/airside.png b/src/main/resources/assets/electricmagictools/textures/blocks/solars/airside.png deleted file mode 100644 index 1fed154937b3e12a650796ea15478ad9b1d21e63..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 680 zcmV;Z0$2TsP)H;LN@>a0uf0>K~zXfwU*gV0znW({dX5! zUyZ(KK)=HUCE|)Cyg)#W#^p1-Gq^WZKq(F!2PI57Cpn4Nd(z-N2=}_L49{5BfyNf2O?MYosNzWEpQtq^0SVHgMcrY6ET8n;u%2- zSD7P-Xw_ZE2@Ic9MFIcdTp(Duka0c~5H@_S%4}0sE;m8IC32rFCHx}rR|O--LT^W` z2`e3pM7ZJs2LZ1ngI2We&YDyZ__9PFJ-}RiBjC;x0a4kGc#T@n0M8THxpS~qKsYxW zFOVnI-5G9kEogv|j3ClA-L=59R=kje!#33dLDPbwMlL(TjeI<4L6AJGrsebp!D6r% z-PS)u^fh3Kr8VdP O000021;?s0t$iITnj+MD&+G+@S-wLPU?? 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 K%_{%38Tcohg^VQt literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/electricmagictools/textures/blocks/solars/dark/darkbottom.png b/src/main/resources/assets/electricmagictools/textures/blocks/solars/dark/darkbottom.png new file mode 100644 index 0000000000000000000000000000000000000000..9ddf27c63a790f9f6ad5d719b1dceeefee001b9c GIT binary patch literal 1821 zcmbVNX;2eq7>21;?s0t$iITnj+MD&+G+@S-wLPU?? z$e1#%7>mO~$P@kwF5fiAg0hq#pDAGS`R+_U2Z3koe2nkzBj#{9K71xyz=L5wwy%Wm@8>7> z@%Ljf#lHT2GhC@gPa+x=o6*K8?P)IWlU$)#han`P3nPg5nJNg0BS=CYM`!`D7;uZg zH44J0Ut`YD`wL4j9d5uB{yIVpOodp8e?*>-aJg(HssJ$_ssy=AHV5P@lw6Q2XR_FQ zB`Q!NZ2B}`@qa@HQBFbTI{8oC%xqD`Xr6xP0&4N0k1!3@JUXgNqHa_vspj*QN_@gh zt+$S}1v+n9vey;f*J#SwHwWD5aBHO1+HIsJ6)fX@J{H$e^)jTiqbUmlvVc>ar6UV+ z8;eHkC%biv%C0qBw|F;LI4DY_%&V?@Y&uyGSeCwJ!t+wty5~=to6C2x7db>n zN6&>AyW??uBsTo~wR4q~TOu!pdDd5p_4I{ZwWBwggPh;#b(1OEy;4lj;Ly-D@9vT7 zm%GPX+uI!s21Cw)194h|p|-QPS8}wzKYeU$tfr?2EjBjwSNDf=iha8J{0rpYxsBhr zxpp^?7kj&^s>(=`2Xb>=^QGPwoSkbbD%P}T1q27@Y9hkJJ6*R$MJ*26xN+`hEiF(@ z=bJaphldS@a8pVOW7V%++Q`&{r%Ez^mcwfT?Hix;_MRE;>|DxPOLPfZ$8Dzv@>g_UTy+ra%6{Ocy4UA^H{ki=rxjh9=WAQfjKP|{ zCkpRW9y7LDk4y{=J&tkyBfG+`{BY}FY;kT*jt!5;TV90n!uFK?hCi@=`0#I)t9s#~ zv(I#ecaGMjMCQp{ER(l43^?ZXY>)5bT^|!o9=2>gZ7r0p&L2tMS@CL6E>Qf5ctu;g zd^^$J(&9RP?W!XG;qVu8($dnxH!F^o6i#T>=<4IIiQBth^Grq6?=Y*&wVeY4zZjM| zIbCTeK6&y<FR?EAAJ((UGtd=07K%pvb?c|(Iu9j~C9%N)>*qv=dN34iC_Z2o* zN{=_g>-BaP>9dwL*#_*kY;F7c#k|P zON%b#GdA?$;@9vyvkB@1>`d!=3Wu+Qx5?v__-heL_m@uHu8 zoUc70r{4!p`3jyE6r^9;n~`mFNeisp`gZ@Ew}fq;b^q4d*RzAwUSlBtSwHAt*%<1q%e}7Ft9QAs|Zc zMVd%dihxup(nE(E{9gU;kNe)U);TkC*7H1j@0opO%|5Z_mkl{s1z7hqEVC7s#`;Ph>9S26CmK)4?QpyP&dK>&?Wa3sP40e1`bZAU->06K9`OBL&93cRKe6o58>fy z6yk@t8gkjvHN@Lh%}qi}69^50Pz6v392^*gx`D<*f;1$4>q4mgqt_q_;BN@dTSMYM zPT8261NAU|2%w6*ikz#0A{eNuCJ$CoRs(}&fr<)XB@kEvq^Kqb21ArpA>i}Ce=Z5C zH9t3Zhy~2xA6wLshJ*(W=K}$O0s{l(1C``4en=2lO-&7?pa@b_l%pc#u)$~?JV*|W zJ@rQchQPY|dHUcyF=*hCBHRVzkJFH#ditLbP(FWU(b#{ci8^7RAh-_*EU$1B(jTCy z>HiN!q5h(=I19vo{rx|Mv6jI;2#^H=i}Ck!r7oQNsUuT95IsKx9Eb6<#9(gxnMHFC z3=V_!!1w_5^nhorJ<)EMK%epsboF2c2KuT7;6Gd##?>E%K;!;!-Tuop_*d>xCZK$%mSG4#&j5s* zfgc71{2ejG^WS~Z`&YexxNiUM3+!LHAgVK-^^xHF=J@f3uc4_?!0#G&R}% zs97!Zx=I@WI96*6)3FR1TySKwdD1NC4qA}!bS(0U6)j8Ri2nqQb4O&mSd*}stTg(i zvKww@!RnR)kXHHYrM;JEK`B2Q`yl6Jp66TMJt<1;7DoM4mg}p{K5Vv zGhU_U%PopPZFs=eVKB00yXGloddBn^N9l|D&dxOHC49K@tUpA;OiEZ-IDdOFieee; z?ag-W`zKuj8$IpLtpJ?OhJ#BQqrtk<~s;EKD~^NPx02)k!GuLn3Fop#!AP(1^DulFPEP z#8i4n-e2-pb8{t$RYYQ(ba8QU-mWSIcR0;DQTc``n^l+gxDkL0e`EvZv_+FzetwQY z1YBz-QTr}ZI%}^N_G;l)fu)ym7Rb`>6K%}pZKeLkg4%r-YpxMaX7;j|8c?Y0&*G~* zpZ5|X<11b&DJk7t*D~T!n1d%)@Lwys@~Y&>2$04Ia1_XKBYf8ujos_ykO*EWCC|MJ z#Hz~5r_#u-&b94~VKd>~>@%hHvWn2 zHBK&rP#y}vQs<8TR#Nm;V3~A)I5vXW_GzNuQT*=>F6vdowG?KB}q4_U*@gl7T=`tCfFwy|;z~+>@!`M%_~d%XNLAFDte;{_7VlEeqtbGgnS2w@JA*SjF^MJK2Lar5eHe?TP?`rcvrOy9W>{GZR#`Y7 zln{k`ce8`vl`sAJ1s}lJu0bauSWLFX)9H-$5Do9Tc}9QJb&?Z56AJ~PtarkwPDF|E z&4QJcL!zBo0(O%^ai6v2h370YvqefBUmox8>WYOm%wHVMR-%db><_e0o1PwuZqS!_ zSk1C5_s9swH)N1E-@Nz8O0OEJNX}P%L&h8*45IrvtKi3rDcTL#!Z|9V!v$~R+W=|v%O-wr3Sf4~iH79a=b$LAT30)34KhlXx1$bii*!jd;3b!2gU?JULJ04mgH*}FM4@-h1jPFLS^3&vQ>dJ z6}0)9`QF%l@1x&Ht@b~edSM1KzaI&zt$c}5s%M4kaFMeEIt?}adbcfri>mi;G7*lS1X<&-eS1Pjx zY|wh;y?%`%7v?b?TX(G5!u0i(5@drJl(~?5`1(^ktPy~%LWfF-+VEnk3)=su% z9^(yB_ilw&W!*&Q8uYh(GrPdJ9yT^W&%l76j*U+*_2`pH(A;5m=;-Ls4AD2<+?jF#zb6f zd;FlN5^G@M>UJm=1@Tc@j*2>CYm3aW=u1^Oq(7C^$*CoK_Uzu+odl~wn{wPw*0VNw zrTq68B0&wR-q4y#<(tGsv+v=Ug%EGUn`u{d(%Z!ZcZ?8-sRXTQ+3S16sYj0=bDvGl z%{3s|HUH$szTk7*tX&Wi5>iq!dwkWu_vY&AYG-F>o+%r{^$0p)x)5Q&U_BrMqM|Gg zZ@ta1_Tj?h3qvi1TRX~Y1tgL5g9uIfSYDarmKOPYv9a=Ua*h?~YJ(S~vMGX7nC~tn za(P(+7)_Fma;@W#Hj*dQ2Zn{!M{{_qompP%;YFj10Ar^lepLSW5tq!TG7g^Y$?C~a z52S3ZxMJiLpwQ5XmM-ZeK?jeV)dmqg{M)i&;_dGA-GWxAvlW-8qhZYDv&tkFlAX!N z#p3N(7pA6V|zOj4ieYLb^N&b72m!u zUxY+TuGcp=R~8kCdc5na{!vXCeBSqBX(C?OqhmQ@oF-jX>GQzAz*6<*!DKu9L!gxZ zGnzOrG&;c7w?yA?AwY<+(B{B?wJ+Yf_&Und^L!xSgw3yBO0!Gf=YpP;899Jp_4O~k zy*|rh5y-4tMw_4U;?Axo!lQ)&Om z6#-&cTjGcJv#;dyiNxsXoN!h{5* ztLvSMIiEa~y~&}tS@Vmk49QQPXh*21)Jo83(BW>`+BWB3(Lr{nlbAu*tC(GvIJMGg zd&pf~rVOEPkDGqytS2V%nNG#Y1- z&^P2TCQi{yNsqCnOq_X%SV>)Rv3Mi(e$B$mfnWOibP6mD3=MCL>Qo^6@S@11U#0G|SxF=ch4S^ia`h_R`knRl z#{`hmGj|hHjk%>I&Ih=#nnx;kqNVSiuH)&-HhNloWqlqzg*n zd;{M;V3yvw5I<6h8I4Fy9h9@zq|q<)ooF3VUu=xo#SE3JoYAKVIqWy9xG`83yf$q* zR=hZRh>2~AurJfm$|e*6MqkEUQuh!p$BbUFvrB$bR$5+;p8i-Hy1OV|ohg7k`?$SM z<>q))8<8m83r$KQaB~Gj)O(>1T!z>mmWD`6EKZ&yLZRy=_BAZ`4Ge{DX!Ad9$*aD} ziHE=Un@U3rzIsb)Co)@ zcUw!DNQ{DCJ(P!)wOl7_XeJ#v1hnesRO2RoT5fA6&{Pocqa4}AU2FhAn2yfMd~tE= zdAapQ&chswf@jao(%bOlF3(UT68R>o&MhuJeQ|EiZ{1^OCTmIIB;=)qVX5&M^3VA5 zyD8^Igjj{~wBRL4ZhVFR)^eX-%!9V6Q*?Aw*lF1IP6#&F&cwvT-yanm%&_%7DoS7b zr(_@E%oY^dF^6Jz|-@zNuSq}QIO5ejf z--g@f7Zg0}Xy1Gw5Id%g*3TiBL}oWNyYzpW@DIPO`Ez>mbmdeWu*XnhpO@^AND8CN z6!LmOJ$B;{I9@T0muxa!ohm$ek#BC^Th5R-f8e#%zE!cRVhg}`X`fx&(ed>+P6d1{ z0;NI!UFo(oNKUR(tQC(f&+^!9 z4;_o1aCb{d!SObEimpK;YkHWS7df3p#2dY23vV?iB_(A*D$14Q;p8=?g6($frTg)w z`b55+lyP+r^90V1kfp1p3mlSJQT~^u=YwrG+95H#t<Pyc6w- zK%k%~Dk>sN7e%(pL7&BMGOMsU6or5GXb;YTf=m3P`y7!V zlW>W#j8Gs{<&UJwf^yVIWR4&T&PjvW5~8;k!BfY<49F1_BIxAl3JpicCBCxD!RAZb zR3hOO1Wn@-UpplV4JY_3)d+z>VUS^fP9u1*DKv&Vn?`db&;gnol?G7hY%-0;arfZR zn1nYM5mQr3q#Pm0d!vP|xWrTxRdJ|PtyW9Xx>1zs6e^9)W>Wz=l};yP2(l(yfkHa6 zLgTz_0Yo&gTBbr}N(EubA|zI3qFf^8>FW^Ws?gB4h83DOiNaDw)j=vMjRH{R@};<5 zp*5%w`OA%WqBT+3DugOTG|EghjGc$nd6|sm?(c<`fS5O&FtrRj6et~3!kKbJf$~8v z5&J@s$Rr#OF&h>$-I!!|NGv8pEO#jxg6UE+3t$5*mK(rgK(u8$@8YvT(9NI8<^}iy z0F4&l#sZmsERaVF@ME$7H;}o^Dw;A7H|6qQDDuZ z#=2yqb2bf!GYaQ}zEQdx-&Ai?ItEznoM&*$3~-Ob%{Y^bmv)h|j)GGKEW##IF2CN9 zwPJB+q>)K|kS{x`u>X0A9pI?8tv;E)quYR4xK&weEL4s2r57RDDlBa{O!44e%(5Hs8kZr{Om#7nBQlspL5dt zSR+nP2kezCb^-)k*w=LnD1Lr)O+f{zsWQWI<(Li0oPI6Bt5dYO`%u;mzdn|~jOD~` z^=b4Ab%`V$!#{N@0%Dl9?N$c*@e|I0c2@5FQDXkrjk(Q?j&RbM!as@D5sJ{j)vb+I z-Bl$78kYE{mrri6qdvBA6=QkE{34rrPv~-t+i=gUot)p|g)y(%XEf)hX zio*CdRfDx9o+d7hhi63hLtx|5Ev_fQg(q;u5rfFzCYG>b=6M{9AP$ zT|1K_PsMqg9qXGa^53o#G!RV8|AdFl`TAh`L08u#Jy(Bqk7aglLRXibJxd?`avORj z5{jyx6&#Z6)q&Q<>axpbXY(+?7vOSukEzEap_(y|BC`r zbj+h~H?GlJPF)2`rdmk{Jo_1K)5DGbB&&0Xr}aF?R=70wBmMzR3a8>=faB4!^ZCFX zxAB(Wat`w-27)m+vHgd%$cy3;@c@a(7KZgDXWq7%iD}8s)O=2~KQhW|%N`l;I)%r3 zIb~M|6#j0wX7{zJseC*>ucN)v`+ktRE$jH)C-Yx`vKIfX+?vAH>Dg)i-EprL+nH^_ zMT_9-)|t_D^MNyuUwrw#aU71bMk;~(6CQ@;GQOXjIO55v3T~;G_GIs<#KWBvJ5Cx5 z57zef6u4I0>HUgqsQxVXSB9(~1UTTe*gK5m1F&BoELF=y6q^w(N zs1&-nluM+G5OPV8RNGQ{NfYIg%R4IjzJKhqf4t{;&iUOwpYP}U`(B>sB)Pe4(^S(} zgTY{$PTMIo#fVsZ;Yy0{tlp?hF{}|fdJEm5Kw&tY55nx3PymQ<;?RRY8c1hGgf@XT zFqm>E%fnmf?YxuBfH-LSA_gty@Dywq%*Ia4qchl`5D@?dvADL#vFbV`g2l8&dJ&y5 z&O8S&n6*8U54uOXcrYT_3=$J*w*_G%CMyhZKp`C==7ewsWU(#si(Rr}zPJq_5nmue zwk`6jQ{K*Q2nUD{B8X@rih;pl5mqELmPjCBu@(p%28#!<7yw5?VX3e;o<0TJR0H$0ay}=1YmFg4u?`8P=W}qkS<1X1?!hA zP(T5L&*BML5Erp%ksbhvgtkb9r(dtY;W<11Wtc1Y7AQr?05P2hV9^+W!&$u77qmb~ z1OMyB-=YN`5j+r}fdWXxXDIR!xPFPOh}}O6EdmwZkX`vKMN;S?6o?_>fLx&y#TKbJ zK{HuQvQ+?y5nze8L=or#0VujPArM7p-~v(B7!tc+{*I4V1m6*Lmb4H5R+MdBOkyZViig9uJR~IN2fAtZ_ zRWuJ@(Is)!&9N}p^6O3%dk=A6@$RQwhLcW7pQorzZtT(*x|RD3D>KyWw0W;wgOvXS zzoTv^xnuNRa%kCu%?p^-z$|Qa@bZGwzrQ;q+<3rgBB@;mir?lyP&{g#V?Rb=m^>%lY;l zMJuRdM>2djbuF-iGbJ7OdR|A*eVnZD1x%+6w&G^aOLawR2P#irupNpR&rJe1YZ-x= z02(#alxnviACs<#fx;VRUN;Uk?Va%|UorJb(z5j;Hz76 z6iPK5+u3GvxMasF71W0g@#Lc>l3;2Os*AGK;w;odjN%L-t%muobv5mQ<0bO2*0k{!ZZ{FQ zboS)agxlt5l8%a*+4hIRgS~dcQo{1+?$M@Mek5^zLQi*#LHKiY@KAraXPN%Sc30)k zGS`(0)1zJ%QG-AF?6t`1ZF||4;?*wG5EWZ}yw?Db&(__z77;2ZlkF|=xvD*{&bhj@ zxnxJ8>>@q)T`Q^;XPe(wzbO~!!rRSC46YPxwGbN?e8j1(`O(kG`1{?bstdCXhW%5( z6);X&+NP$5t(_Se=QxpiF|TmP1pO8_c2m1=(ssc%1&$Sl-{LdR>92E!`w39m$*o6| zwE4f4g%%MU=k+?cTCkQfIL`lEzIS}#GTNPZ{KjGPo`30?$i`z+Z8wgHJc0eU(Hrl=X%w?vQjd&5|L&F|hXQ^xZn(Q8 zaAIyWHTm;}^5q?aZ#B@9lPO(Zmtut{*cS~j>OHT!ZlrA4vAf<>sUZY2@~i96F^K6w z{k`POV|n>Gl&Kx|CYY2b;%q{m z^6%xJe!jY{GB-u_i1JIyh}$;(^mt9sG&=LpKK%^i+ll66j~1?P+c~jl*OUi9}eq>d>9F8`S-RX@z_wpPlqIB_p_>c*Kz~R+uRC4KtnU?OupEv>Pwy?VvaP_u5jy)L#mv);rs!6%vDGQTLc`SwX#zn!ev%t0t)=Dzo(M%$uXW zIax`m8ItpeXKO@1v`Z6z>#fPN7)@Tm{$3mTxZsD!PS>FHrxjzyb2#)5=CP*a7eRhX z$DO=i-9uFQ7!}5782IQ(&&(!fo#`(-hN9d*J$7G7HTY-|8?9QH(44TpBgp(>$Jy`K zf|uEsH6LX7}Sq}Obq@sweX&1U6@pOr2tHw!0&g`qPh z@RMY(U-Xtuilb(SMsh`ud0E~%5eG3_Yz~AS`|<8mwx||vfRa8&ZiiP8Sb#8w7QHQD z{Jz@Gg6LFx#_c&we0rt|MjPYmKj0&NBK0EVJ(!)|EWcw+CEJN}{Kv!2JARd-2W$1ODiDO%E^E z_S)Zgrx9bX+F7r4`CVA&4Af5BT%9-GWi&Tbn>FlvoOjPW>rqW-!&%~SdG6ygA<=vG zBzv*B(0NYwlQn0FvQN2h;(YHeu>0%YEqF=3gEfyTUHH^m9JdKw>S(CHAC1RK)WaIcH5l?2aG+Q~1j3xz0wxHjMFSC_9|*AH_OyWx zFxYo{xBaqL|h@n74YHniU3m}fgBNPPd|qcEu_=G3iHKZ5~WTVS_%l!SQG{w9X%h{C$t#y z1OMyBH__sNI3bAk1H}S~h^4*{&W{UZb?*M&&^%D>4cS}7RbL9gqY7A(Xpj%lsE!Er z35v~SlL<@`i)n9bkF*1rOe8?G;~)VRj)Np(NEjl~7DL1X*ae+$@hJp1R~*)v>gtTa zV6m>YL?YFV*RmxW?@TRjPuj4U7%ik?IVz{ zZXS`kOMoZsM_@3mbQ;w;K>GATE?vfOU%qd8Zl>dPhhp}Ad~B=Js8gB;X+%@I`Pg>N z74C>qhJgpQDPx@xB2{NuV2;(Xty_tEent%Cz>9wN@K{a_w*+3-#EwZER397S=4R^F zPxSX*h~SuJQ9eBAiud2Sqi@HAr1SZ%gj53!ST`?ZH3@H3W;yC`-@8YKm8Tk{>J8j6 zQVgroxxVrYY}a0~VkE~av%PZLgwfLd*4AZ&=X-&(Ay32?Zk@!YKFsykA*n8#B~3q0 z?Vc$}Xk)E%CZTH#6(xmF5~PL>6Q`q6wY84K7OQN+nBp3PbDL9r0@p_Nr0*TYhom*k zs+PdsPu>_h@aB5O7=GPIW01W3hpx>2xW+3#1d|j3!kN0r8xtSVewCY_M=GDcS`lbP zFM9Cnp39Qafz3`+eWNx=PDqTK-09=^?-NT#_4z70^HPT@gz71O+G`Tl;b1b;CaTCFl)jPIS`FOLWrIa0TB{ch5 z!GziC@IGX6vlS~KYKD0DT<1(_6b!YiVO-gu-&wOY^EfM`Bx(9tOY3w(SC+Q>p~{S& zn|&z`Wzyj7Pc^6R*wpvU@J(8upHUQBcS9|9XO0_IETQX|(>&TWGew!du_LuM9=6!O ztb{iRP9|6lbZ3lJP}&#{Q9M5lyJXC^MAY{dIu56dhKygi#Y=}c(4B23q= zEVDbEt0yroG;?@t0a#b${UN*a!oNdL>Q{uU<#pIz(6->ZJ!Is|Z<)W-d11;nxsY?9 zdRpXJrGwCY)Gn93vn<|#}r#ynNMJo<|JUAK>4i-lbwu0*n)b~r9xmUDOCh7cSw zZ+V8+3XhzC#Z>EBE6^g-KfADPjrX}zb#cZ>k7}rB%^Iw+es1llmD%F#utKIza-?6_ zS-POwXotavj2(}Qm$4XFP)ryv>3(N(L?|%3qrbkaGUKONP5mvV)aG4JE>BL@Z=`77 z4yJ~-)~t$sWahbjnf5?x*@r5p@)w=*?I?zCFHf-k8Cm$-cCU!eyD9xmKTVdM5H?(m zY`<=eJNLU(Z=Y|W$;F%2zx=zF(Ah6*OVzNPE_jA=kz9(2K*ewOceTvUdQFT65aQ=@29g9><+xUf1S88C3zibH{Q_r=c&c? zO5Enrg04qPzQ34)naGNJvID&+>s+%`sPS&#bb@kr>imOorP*r!mPA_OM*5|>frycU z_jI5zzS25Be7duG|C@hAjMdjFcWPf5Q{3~0O7L?h>J$Zh$F~)h*scw_A8#^ErFTEUvUT096OEGPW4(c%(9)u-_G2kN^ zhCYm?6|fEaw^~`eDb~Df+S@Xco80``J^v!=yk&D?Lw(?&=tgZK(7Khl$V_%-uu++@ zIc!Ady)tbuuks!{Oa3R%`el^~zPg;D`=PVvubB69)9*q8IwAd2i(O(a#nch_*jyve z+_j6ZH#Q_GRlb5|_r}gOQ_J;~844&SK6X0Pd*9%SoQOlG`>Ola?d-j3lW!mRay+51 z>hjd}BHJu0mum`~dDXr=W1+#6Zzt@u_Yc)Xj@L2Hid{LxGZ}#)ZL8=732*Mt9V$QY zX#Fw-wWrMMT@B&VO3{oVeU3!w$|mG3-oMjW#oV>c{{WxXwJS-I|Bx^{e&QOcERO=sIj2QhuyLECgMq~(R`Wl8G*>U`MVH;l F{{eyKaA*Jk literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/electricmagictools/textures/blocks/solars/darkbottom.png b/src/main/resources/assets/electricmagictools/textures/blocks/solars/darkbottom.png deleted file mode 100644 index a9b6ed20b444c8a1ff93aa9e27c44737ce3a6822..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 751 zcmVFj$M0000QbVXQn zQ*UN;cVTj608n9RZgehAMN}YmGcGkQF)>H;LN@>a0$52zK~zXfwU*g#8bJ_6^LdF` z24d$iv0ySAi~s*IRds7^21QC_>8N}M)8{sA2J_`*yCc4Bw#3($O~YolC${^}!6W(c z{ozP-$5-O;`quFI1$gRm|M(x~6z2OKpzrF2!b*u(%7e0K>Rk1~0%7L23o6 zu12EOWd@QiT7Zmy1Xkdd6)&-(<82x_3k#tI_(*zU%vrqzPT)ZbSUt=^1viL9!Pqp!InsOv-_oZO&~09cwibRfnC5 z3n6(`n$fo@3e43Mn9*i3lHx%+8Iqd zBJJ1q=s-mKmF!+Y)I2MCL|Q-=cxwTzlv$0?VLnF-n(wN_@$CnJjIVzMnC`n diff --git a/src/main/resources/assets/electricmagictools/textures/blocks/solars/darkside.png b/src/main/resources/assets/electricmagictools/textures/blocks/solars/darkside.png deleted file mode 100644 index ee0350abdc47c59a112ac4b8853a10a8dd38b00e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 663 zcmV;I0%-k-P)H;LN@>a0su)wK~zXfwU*0n!Y~j;`*|&o zgcQ1|N<~}o2=M>w-sC#tneimB0O?At%$YfkV;f#(izV_lUm&luxyyW6A&aV(a72$+ zs|Kl?HL_Z7T%Io=db(a+j?Cq9K+au$4~Ng~H{wV{;EwO%zr&HrSm0=6-=4<=Wp^YC z_?SeuyB{Rg3^WHz0mpTBgo6}t=>mb94hK8IenddH=Q(Hu%X)>d265dHwC-|hwIEHr zfTaYF%f&YW7RXyAIwctCZUnMKQlq()Q>z7z)R7Vh*f|Nx8bR6J2-Knne4j!Pt~)Yx z4+P`gkwAbMaSvp!@B6jeAzI)zOy=9OhLeCVnG-RBVd88=H)wc>>&oVKYJ2wE0&HFDVzp5*gEOM>EIH7%z<3GRcvAf_2BaC0xoKtNRXfG!Ab z(_TQ>2rO(4S}f@25(w^_O%l}2JHi@`meGPtj>Bn*D8Ru(u(wj|#VerzfPqK&Byhh~ xk!JIO@PGdN<1+GEWH>F3>rZ*Obe=4z>VJBIg%z#Y+5!Lo002ovPDHLkV1gm57Eu5I diff --git a/src/main/resources/assets/electricmagictools/textures/blocks/solars/doublesolartop.png b/src/main/resources/assets/electricmagictools/textures/blocks/solars/doublesolartop.png index 29fe5396a215ca561acae33e3edd356220a161b7..797aa005ddb172ededa23ef3b51ce716cf6c0646 100644 GIT binary patch literal 2091 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 diff --git a/src/main/resources/assets/electricmagictools/textures/blocks/solars/earth/doublesolartop.png b/src/main/resources/assets/electricmagictools/textures/blocks/solars/earth/doublesolartop.png new file mode 100644 index 0000000000000000000000000000000000000000..797aa005ddb172ededa23ef3b51ce716cf6c0646 GIT binary patch literal 2091 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 z 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/electricmagictools/textures/blocks/solars/earth/solartop.png b/src/main/resources/assets/electricmagictools/textures/blocks/solars/earth/solartop.png new file mode 100644 index 0000000000000000000000000000000000000000..ddf4eb3e20e02ec6bf75d947a33bf5c1c5668e6a GIT binary patch literal 2707 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 F{{eyKaA*Jk literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/electricmagictools/textures/blocks/solars/earthbottom.png b/src/main/resources/assets/electricmagictools/textures/blocks/solars/earthbottom.png deleted file mode 100644 index 00f5701dd4915bf899eaa05cb0a96fa03b44d6bd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 775 zcmV+i1Ni)jP)Fj$M0000QbVXQn zQ*UN;cVTj608n9RZgehAMN}YmGcGkQF)>H;LN@>a0&q!0K~zXfwU&!cQ$Z9({XCyM z6h%#xDE4wy3T^!XA1Kiu5W}Mdew2M?pVv%pW1=Bh8TKumwNHoM(mVIRJ_h%`Y=XO= zHyR#%djcLFZ8>}-KfddKW-ovJSjxxkMo3b5@j-WapLj4ZIAK(iK9 zu2v0&2i1ktN0uP={f#|IR}jYi-ShEotowBVEc1icCwrjmq_kD@Ms+D%#Y?GpU;XX?3#uE9 zu2f*qRWcM_U`CN@!I^|8IJ1KF<84qBX`RgTM=GQ+SBR>`i$KvDpx4gMBw_I?vbpsc4iiT069{2zN002ovPDHLk FV1h-JN_zkR diff --git a/src/main/resources/assets/electricmagictools/textures/blocks/solars/earthside.png b/src/main/resources/assets/electricmagictools/textures/blocks/solars/earthside.png deleted file mode 100644 index 3c0e78517b7be30c78df49b37dd582821df1644d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 680 zcmV;Z0$2TsP)H;LN@>a0uf0>K~zXfwU*mX0x=MVeLT;A z;)&>u1T@irzJUjn=&cDi5Ky1gfA{ZBXQo~70+K(`lyBzicH6?%?#mIf^V~wVpPDXv zugA##s4d}$9zT3PMH=ICr1^2-vUvf~+uui*8|LSsk9-%op51l6x`-nYfeXHbyR&;L z^8!aBy~VIjkakC+fR9P^YSKqSO+|As6>wa4M>t3Umo6i4)8SwtnAQjgmpliJ;Na~9 zVGZKCBWPV@KG1?N@dTCo_&cRv%;oNMz zK%P{0XSmI^U6w- zK%k%~Dk>sN7e%(pL7&BMGOMsU6or5GXb;YTf=m3P`y7!V zlW>W#j8Gs{<&UJwf^yVIWR4&T&PjvW5~8;k!BfY<49F1_BIxAl3JpicCBCxD!RAZb zR3hOO1Wn@-UpplV4JY_3)d+z>VUS^fP9u1*DKv&Vn?`db&;gnol?G7hY%-0;arfZR zn1nYM5mQr3q#Pm0d!vP|xWrTxRdJ|PtyW9Xx>1zs6e^9)W>Wz=l};yP2(l(yfkHa6 zLgTz_0Yo&gTBbr}N(EubA|zI3qFf^8>FW^Ws?gB4h83DOiNaDw)j=vMjRH{R@};<5 zp*5%w`OA%WqBT+3DugOTG|EghjGc$nd6|sm?(c<`fS5O&FtrRj6et~3!kKbJf$~8v z5&J@s$Rr#OF&h>$-I!!|NGv8pEO#jxg6UE+3t$5*mK(rgK(u8$@8YvT(9NI8<^}iy z0F4&l#sZmsERaVF@ME$7H;}o^Dw;A7H|6qQDDuZ z#=2yqb2bf!GYaQ}zEQdx-&Ai?ItEznoM&*$3~-Ob%{Y^bmv)h|j)GGKEW##IF2CN9 zwPJB+q>)K|kS{x`u>X0A9pI?8tv;E)quYR4xK&weEL4s2r57RDDlBa{O!44e%(5Hs8kZr{Om#7nBQlspL5dt zSR+nP2kezCb^-)k*w=LnD1Lr)O+f{zsWQWI<(Li0oPI6Bt5dYO`%u;mzdn|~jOD~` z^=b4Ab%`V$!#{N@0%Dl9?N$c*@e|I0c2@5FQDXkrjk(Q?j&RbM!as@D5sJ{j)vb+I z-Bl$78kYE{mrri6qdvBA6=QkE{34rrPv~-t+i=gUot)p|g)y(%XEf)hX zio*CdRfDx9o+d7hhi63hLtx|5Ev_fQg(q;u5rfFzCYG>b=6M{9AP$ zT|1K_PsMqg9qXGa^53o#G!RV8|AdFl`TAh`L08u#Jy(Bqk7aglLRXibJxd?`avORj z5{jyx6&#Z6)q&Q<>axpbXY(+?7vOSukEzEap_(y|BC`r zbj+h~H?GlJPF)2`rdmk{Jo_1K)5DGbB&&0Xr}aF?R=70wBmMzR3a8>=faB4!^ZCFX zxAB(Wat`w-27)m+vHgd%$cy3;@c@a(7KZgDXWq7%iD}8s)O=2~KQhW|%N`l;I)%r3 zIb~M|6#j0wX7{zJseC*>ucN)v`+ktRE$jH)C-Yx`vKIfX+?vAH>Dg)i-EprL+nH^_ zMT_9-)|t_D^MNyuUwrw#aU71bMk;~(6CQ@;GQOXjIO55v3T~;G_GIs<#KWBvJ5Cx5 z57zef6u4I0>HUgqsQxVXSB921;?s0t$iITnj+MD&+G+@S-wLPU?? z$e1#%7>mO~$P@kwF5fiAg0hq#pDAGS`R+_U2Z3koe2nkzBj#{9K71xyz=L5wwy%Wm@8>7> z@%Ljf#lHT2GhC@gPa+x=o6*K8?P)IWlU$)#han`P3nPg5nJNg0BS=CYM`!`D7;uZg zH44J0Ut`YD`wL4j9d5uB{yIVpOodp8e?*>-aJg(HssJ$_ssy=AHV5P@lw6Q2XR_FQ zB`Q!NZ2B}`@qa@HQBFbTI{8oC%xqD`Xr6xP0&4N0k1!3@JUXgNqHa_vspj*QN_@gh zt+$S}1v+n9vey;f*J#SwHwWD5aBHO1+HIsJ6)fX@J{H$e^)jTiqbUmlvVc>ar6UV+ z8;eHkC%biv%C0qBw|F;LI4DY_%&V?@Y&uyGSeCwJ!t+wty5~=to6C2x7db>n zN6&>AyW??uBsTo~wR4q~TOu!pdDd5p_4I{ZwWBwggPh;#b(1OEy;4lj;Ly-D@9vT7 zm%GPX+uI!s21Cw)194h|p|-QPS8}wzKYeU$tfr?2EjBjwSNDf=iha8J{0rpYxsBhr zxpp^?7kj&^s>(=`2Xb>=^QGPwoSkbbD%P}T1q27@Y9hkJJ6*R$MJ*26xN+`hEiF(@ z=bJaphldS@a8pVOW7V%++Q`&{r%Ez^mcwfT?Hix;_MRE;>|DxPOLPfZ$8Dzv@>g_UTy+ra%6{Ocy4UA^H{ki=rxjh9=WAQfjKP|{ zCkpRW9y7LDk4y{=J&tkyBfG+`{BY}FY;kT*jt!5;TV90n!uFK?hCi@=`0#I)t9s#~ zv(I#ecaGMjMCQp{ER(l43^?ZXY>)5bT^|!o9=2>gZ7r0p&L2tMS@CL6E>Qf5ctu;g zd^^$J(&9RP?W!XG;qVu8($dnxH!F^o6i#T>=<4IIiQBth^Grq6?=Y*&wVeY4zZjM| zIbCTeK6&y<FR?EAAJ((UGtd=07K%pvb?c|(Iu9j~C9%N)>*qv=dN34iC_Z2o* zN{=_g>-BaP>9dwL*#_*kY;F7c#k|P zON%b#GdA?$;@9vyvkB@1>`d!=3Wu+Qx5?v__-heL_m@uHu8 zoUc70r{4!p`3jyE6r^9;n~`mFNeisp`gZ@Ew}fq;b^q4d*Rw1?fsN%-S@iJde)DM#`2`UXDY?7ja79ipE-T_`15dc_MseIsfEEoX*d-p`09lnqZw} zIsX!6qOHfFjPXEohzpAg*}z0aI3%QmMa1D!A|iquqA(FLs0a)yDkUT$f`CgPL~e2X z{cxUo^RTr;7^tZI?dxt_o|0MQA`MIN^253)=mxs;i!P#-0xpGG+d!Vhb7!MQ% z#4RNi zH5CaJMO8(Zq=<;Bn3N=3QB@QMzon`oq9P(C@f)jxvGH<6yJ3H0ZU2i^`d92(CAhku zdR9SuIC`UP)jTk+9DhcPaQt^IlK;y0H`eywwMhLd7J4cMdUme==bV3Uofgm8^q;Cd zUHnt`Xt&d1_c*QU!{b#D007=cswkp-$5zd0u&6sP%6FGtYjH^$Jp5H}C>c2zxhV9^ z#=z8??Dl|+$V#e9g(-HSxXfv~pdPGl{8$|XVk6)!5eIy7{*!~IvnB<3Ok5=BBPT`D z8y;JR;=!iI+Igc#D7Nm#XUUIkXz}uE7k3YLHkTU@#zX3Nn@_kpJMEn;ZL84=qzmf| zYDtjSJxhF>~5Ig%kSZ?4+cmJ_h$|RC5B3B77w!wQ83;KHn~8_?Q4YtG;;wmY>?*sd|>C=(o$Hv1YD-cQB{UH6;K-fCo2m; ziv>Ujz~x2(KjwnB&*_UdSKz95==Fj}fxCROYb!hZz6XQ&t&KXP;ocJh-ZLkp-m6`D zT{5Q#GEsN8Y=g)yARm@>l6mke?rlj)3Dpz%K~(JGW2-B-AoADftZ7{fs} zup1g~SSNH}Q|+(3L&o}v7dwEU|K4s463H4ImC~-1B}>YSKs$Dhc|B-Cw6mwI#m}4~ z6~U1c)Fm|AO^LX47VgWb+Upf5_c;4LoAAZN$RsnuQ1W!2}>u91+=RsVO;_1 zJLTMLcl|LBpg#Asp5DgME0D^H8ggty;S(h#6HMc&EtF~8eDiX*OOIO!< zNzLImyKn;H?0+8=P%;_BXRaA0Pn8F>v=jl{uh>-_KA^k-iQ4`nQTNC&e40AKg9 z!F$0>2K)C34Em{xYXOd9$_a)i!AnH}yg$bpNZZVh1=xaW8k;Nvj?GdPEAk;i7k(N^ z@sLcX8iRl_=L0&nUahuy*q@RX-)h|xCmhCzRH4Q26B2h^Rn?W>qcy{va(_V zpwv%Hb39u{b|aJ+i| z3HcwDs>b5(d`aR)CfLG8Fuyb{T})rxsw`Els9wa{h`C_OEL?lOG=z*AwqU7j*e-%B z!OM&9r!RFsdc?KHKf3p0$mp5KA6wOzgHf0$2r^^Rdj0D!^Jk>Ayl2S<-j(- z2O=xj*5KF{^SyqpZo=^Nf9G)#q=VRS@pTr%%@EKXzIL~_pQKUZzXqG!pWARh#p649 zp&B{6^}u6Nui)eXk$^8QZqk#)Xf<_MNB7jcx~oML^ttEk1G5D=nX?Y9Og$X3kmzXf z)w_J|M$D^+RHBK_l_<9f8BANuq+C;Szf-;d_-3<3bT>f-kjkxCy!`xiPzcQp2}rX= z##A8cD^lS$`Ek>F%S>BVd3l|f{S%Hl>noy+Au`KU0>wC(ZE`l(W;5tRM}0 z>D^ZSK|=$CB~Yfee)*_`1P2OrU(;sIV|kO#&!5&aM11YfK_PZoa6~_7HbpjtOGCpq zzyH#FSQuq0z#;cJ&4u@41hte@o#)aLE$WpIB<{~09e+<^bl)KGo|g>S@K9n#_-}5v zr^cg_DkAQt=~oX8~pvfb4d^6U?$@C3H=zs9TP%J~fgeC{T4 zr+FInav^ILic~hQ@>(b|}%f*_r$LW_xXURGvxcx7wBaZi|Z! z%id=0?}h8f!^Imdzs|Zt21oi}ZexvDqsx8A3rHUjG{__v|BtMbQbgtze-`n>b=+J_T)3vbt^ zw*AvSZTNW315|4)cbotU_QuT4aNg+#$fHhU{GEu-Id*qmVUDgPrWi=sx5@tELPxQ# zyF2^x$MaE^7&u)KJus?;OT0zM%{*b-|_boXk-4Hdn zxFMxHodZ#`C(`8MH#D~4Wpy>BU#KFK85Nm5;m_>g@0t)t^20HzeV4b!pT6p2TR{Z2`BVEaxQpQ-|?3ZId zZXsl*w1t=rX%o=B_=NYx54MnB_+5)&sXPfPt(y+g_2Mcty#Y~ zZVe5JkqM$^nyC6hg=w?J47TNKczGfJ&G+P=U>CKWITM>#N1x$4(A$#?etcvJPE~TL%{WU)72|ej& ztI}>LMROiddX zZ0Xr2ery$9rJK4n9yYbx)fJ|Bw=uvctBt(DBvr$NTyKr_jfr41emJT&=hZVn47cJ4 zrJD2NOu=%eMgcUKtfl#2KEuGieZ8i}Ih%dok~HA09We-Q;1(fTeLCnABKyhBUnR|g z-9K8&SC6|YF|p!t{W~#x$^T(A`WZ}u^U8pMRgkf%h?1e%TD*jVj9TIaxz&Zo&rAI zX%C8<4tWf+ZW*QOL}*v^YHJ=XrqH*aXQPnSY`q-~X%M91NsRA_b~?=4+ul!W*M2cb zI4FF|Hooz>B23Gc`BK@*S|(h3ZS0-mvIEup@JL#!2SHO|D7QEFP-;%B=~!E`d_3@8 za-PZ)yN^j8Q#&W%#;mXSEek^J%F(dJj<Qa_*hXl7DOJ%H^nSS_)iRGS?{EbPwkG!$AA%)s6Dms6pgZr;D-3VSafnv8bEj^aYf)yzxI z*AfppKIrBK){FnFGgchVe#ss7jTcT)HuSA&cVdB1CtG9NVc6T8bKBscgUPrVVQv^S zTfmpSelAZp^;~Q$yXp2(S@vpyDRK4qNIHZlR`MYMqbUJ<5{BO4%&xhThsVHbHcT|Hyh??(Ek!Ya5DY4^uz50mA)0P+S>c|ee3J zJ^$vdkt1*%3)5zZ{@~CM++d=&;UcKUp z2gbwd2JHex_#BlVATtR#@~lC6SIuw5B~vi#_U>34w)?K*r#KAGRQ;^n-Q?kO%kV0i zR+7xj+vmUBASYDm0PcvO_R(>S_3WytovkyRN4fT~JAdg{efqOAp{QAw%>M+)4yn&{6IWlpsnoX0g~ zL>@ZE9{T#^;p_J3G2_6UE)b)jj!(FQYP1gIjs~Om`k%A^=t+tpTucev7_OySnjj^=lUfoy#BrThn|2xrdZn z^XGjTmVLU4kmf#DH33G7XI*X#{W^!oHGMz1xw$#LrccwMo3fQ-FC`4Y8^PwZm2$Z~ z>YU&b>awyj;Qmt49>_~>IS5p=pp+T^S~`LUP{Kh6;H3kA0DtzJj*uAu>Kls_Ti{w@ zwjycShkP;=#wo2K%ja1){V{a-6)2HVN}L;7qa^q&g0~N;a9YuC^}T}i{N%*%XNGMG zfr6Aa=>J!zskc&Iv>O{uwimctY15t)ILIb|I_lrvK6c3*8yoW_*j3Z-!Ir(uz33OL zj0E6vdTWlBOo1t>-APG$-$N()o}6`$zh%+@6I4`^Q+gwUt@KD;PD=CmeD8d&y`p`o zWl06?qQDH5BcH*2ikld|FIzO`&Fy59@$&{lxX*v}p#NoowQh%y(*fWlnOKuY_`$P_ OL8PjVO1Y9{_M6 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/electricmagictools/textures/blocks/solars/fire/solartop.png b/src/main/resources/assets/electricmagictools/textures/blocks/solars/fire/solartop.png new file mode 100644 index 0000000000000000000000000000000000000000..ddf4eb3e20e02ec6bf75d947a33bf5c1c5668e6a GIT binary patch literal 2707 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 F{{eyKaA*Jk literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/electricmagictools/textures/blocks/solars/firebottom.png b/src/main/resources/assets/electricmagictools/textures/blocks/solars/firebottom.png deleted file mode 100644 index 7e820ffe4018a941aaff6ddd756ad59b844f3cdb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 765 zcmVFj$M0000QbVXQn zQ*UN;cVTj608n9RZgehAMN}YmGcGkQF)>H;LN@>a0%l1>K~zXfwU!HV5y29}CPVB3`;z*rfu#Om6$J zTzy|Ina3C&=LmiRU<@_%l=vlOU|MGxe-PS0&Ej?C}`nYQ=~w=Wdh-_HhEE0~z$MbJ_b7h{nU^4v!<6y#uh-mld00000NkvXXu0mjfA&5%a diff --git a/src/main/resources/assets/electricmagictools/textures/blocks/solars/fireside.png b/src/main/resources/assets/electricmagictools/textures/blocks/solars/fireside.png deleted file mode 100644 index 1b4f33cc5d5f035dd25af39a1cef610fd91a2e1b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 673 zcmV;S0$%-zP)H;LN@>a0t!h)K~zXfwU*0L0x=Lp{XTgM zF12t0GQiLHMz@x3w0!)bcjjg~-JN7$Ayv0ZE1d3=$s~c3yZ!*V?e&qH)1J%yV2C^n zM-q#e%{TDp@|w!Lz|qK8 zwJr(L?no5yF^RsZUU5Z4_+ z>pH7S3&O+`SW57?Tzn&7fxK0sU4lY)BakJM8qI~QDlKrNj+8*a&OwmY2+Hn8pcXyD zH%SE9bw}Fn89})_k`Z7=+yjwo`o7KQh!(gF6ZvYb;UM5k=0uF3op?r&!fo~lBHDJ> zaRS39RZ+k{I2Q;OE@Y7p1%wTst1{b^mH(R{;1apd{w4e(@K*&R$3kyMtO+X}j6}HQ z0S5uEB!jlJ?#`N25csAh27; zxfXQ5NJbFpLU%1NtragM;jm4$K+v?Hu93@*a3>!RS`Z`;t7$p?L2wxC1$mmW0yp=R z%m|3e9?%7u+q4l7HUbNqgO(RGbIAw}n@texCT9q1G@3>WB3XvR5>bGIhhT4o*o#*} z0RRIR_#kk^N-8OYmwo!IIchC;nF#>U^w~%MpmgL_kzp)00000NkvXX Hu0mjfSdt)q diff --git a/src/main/resources/assets/electricmagictools/textures/blocks/solars/order/Thumbs.db b/src/main/resources/assets/electricmagictools/textures/blocks/solars/order/Thumbs.db new file mode 100644 index 0000000000000000000000000000000000000000..26e243bba0f3007533a113e8cfd99c7ab4bbcad2 GIT binary patch literal 4608 zcmeH}3pCVO9LMj>f5yx(4UjTg|O?K>$zzhm1~3PH(9;0}W`6vp1Xs-P42{%=FU)<2i=oak+gOidX6Uj~ zNO&LMsQAePoi zXA%;V&i=^0^wZ^(E2(KWxS3hmyqh_>ckbT1FDUx?L2*Uplc&$Bo>#x9dsF}RT|?vh z4^5q2-5+~;`#$ymg6hHmWJuPCvQfIIP!|@5<^|P-!G@y3sW|*hU8%_{>TbVv7&52c@W6~YVRaJGL0SKw;4LL&2QKvUe&b~cb1uYVww`f&MclHTd zz0A9|($@3!m)kx@*ylb;aCvgA>XEo?U~|XntsGW{r^ov0dxkwZ|yGxtrcJSflc+t-adSLerbc587E+Xp~-)-dYmn z=OOglGNr4?Ts_yhw$(Rk{;op~!hlp)3GnQX1M;4%OoW@(AI{}5eLVfW-;1Y2*jM>y zHAm9yZ_>O%LPRfp1iOoO>z|h^wp=Q=Lh)^$avfI2L0Y{@US33!z|<%7is1E!$Cn%NUfS|etvQUW&285{cm}un zJUOLc7PgU%m#W}8a(UW03@5MDE$8~#X-6ad+c@{NTy3*ztm`7~rbKc)aC>!F?_&D& zS;8f^UMltn#=ES~a2ZS?gbY52$#Yk3JpQo2?BP?fhG=0Gr>B`^W1CI03JS&M`3Urg zWyWHq_HHa2R2c_%a9w>JB5$1w9=y=7+KT=|$YUvyTV8&3X{qipKEHgwpfcHZrC)_p zX1^eQL1-n#LM>5-D!FOv2l;q zT?FwCu>uEwqZZ7H{C2dP$D*Tw9DY}cnqr1 zX#vHmY57u*EZ&AmZqeKmq5aIni->hm_3YjnQHe{*_D!{S$)su7#8L~{z_ZtbP3%O> zWC{Fln143;s(TBad7GKY9#|_>V}3NN+h8d3X)Z6UysJoAdD&qD%vT#`c;ig?f5i;^ E3Y{*$SO5S3 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/electricmagictools/textures/blocks/solars/order/doublesolartop.png b/src/main/resources/assets/electricmagictools/textures/blocks/solars/order/doublesolartop.png new file mode 100644 index 0000000000000000000000000000000000000000..797aa005ddb172ededa23ef3b51ce716cf6c0646 GIT binary patch literal 2091 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 F{{eyKaA*Jk literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/electricmagictools/textures/blocks/solars/orderbottom.png b/src/main/resources/assets/electricmagictools/textures/blocks/solars/orderbottom.png deleted file mode 100644 index 938dd67475e54793a8c89fadc22eeabe2f7b33ea..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 750 zcmVFj$M0000QbVXQn zQ*UN;cVTj608n9RZgehAMN}YmGcGkQF)>H;LN@>a0#`{yK~zXfwU*m%8bJ_5^Z#Gw za3^*i6AQ>*0e?fPr}{R-B1?%Z9gS--bE+A$m~X4i7JOfCz{_ggu-@*#X190vNPc{G zID-B06&zmQ8os`OPo3@`|HGKVc)t@?{$qg|MZ`<@3b$0im&tACu0M4h^Ah*>^94{x zdr+kBmkW@5yYuL(0@xP|u#uo6T@S`A| zqu3EDb>+&aPSw{!F7P9Y0&M%l8)J^w$N~!rG;2ZSYSmD9P+drUWC>TjlyI#JLg$1l zbdHK#r@80leC?MCD3XvZID{oBp;~l=S=QMK_(!Ha)Y+JG(V15=buzM3?EO5q1+t+M zHP9PlDq$393Rb`$Pt=@L)x;EzOPPb}ZAv3=RF`sCB`ogZT0uiU&7BwUh$yuJRo6z) z>M|XqlNK=ZAAuFPWx)#;bTX!qb72Bnz>lOS#+=m)cmfYnBI<6Gm4}}TX!KQ$5J@ik zYbh)_hx*SbEEWXVChAbo!nLMIfq2dSSdi?Mlwf~e6DE})jJA$#0gkmcf?CH(i;E$7 zRhrSaDGSWi6qwQ0WQ5{DIv6E41=ydwCSout!G5kaZZ{qaWPf8%(kFy*xD4YZ)}bzd zWtx7U&!Ft2v{my)btzoMOR0E&olbxSt9+x;l?n{HN`}G<%qUVV=p{r!Zw33~4^R|o zUYpUO2=kWg-a=8!TBAp#1+dUt7hq>uYa?}BpQ8oMcU5qF`w5u&^^eEMk43_<_;~&; gZ?4Q27wqMA&?*IS* diff --git a/src/main/resources/assets/electricmagictools/textures/blocks/solars/orderside.png b/src/main/resources/assets/electricmagictools/textures/blocks/solars/orderside.png deleted file mode 100644 index cd9d3b4fc8e8b20ef865ba432882111b936699cc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 664 zcmV;J0%!e+P)H;LN@>a0s%=xK~zXfwU%3M!Y~j;yZ@E7 zJQ7mqPgN?~ibsG&^d{FC&x|L550I|Z%AA?wIJV(swpb!>^9Axco4d@H6|$&m2}ksJ zwQ7*MStG0U#^w0}qNnTC<;Ywv2jtx4_i*^!ej|=V1n&4A{yQA0j0KKH_U(C0P>%|LUo6mVR3M>t3Umo5;v>2R_-HId!BBsH2#Ikj5gNF6DGfSr?|tPzymjX*7W!1pNx;kqM3 z_dqb-9SH=O5%)mm`o3Sg9ijzp!(_faYd8t`k~tA07$zPFN_fZ(K}Lt}I!<8tqACmc z2j>F8!lmrvP(ax5QI*-ItbA;efJ@{)dr0_2;I9fsj)mTiSQAz{7|HO!15N^7Nd_Hg z-JLb1An|>PK6-$;_(s5;Cjz3f9q}5qU;@4+uyg0&sDN-Z8!wP2)!i9xb1j&FkwB2? zk?vYxS}R^i!fBgofuLnUS0k4l;YmIpv?M4VR?~9&li)ts3u2nF0yp=P3Tyd$j9Xc;ZY<8LKQ1G$MTXPjxc-!fOXtags{RL@K!tDFarT`600007`90`kvor^zHl zEg&be;%V_l5v)Z%$~D1Bxl)BHSEu5s$+0n{Xe%E#pocMtWYuRH%zUeW{Ms%bpS!lH zWYTL0rW26g1eFq>ND`qYn8c#602Pf6k~lmH$YSz9Fp@;4feb20qtbZ*2=bX6KFB6b zJ!IUQNv+|_#Ve+K;VS`Ii(y7Sm1?nAC>90uRb}g80~RM1knt0W z8d38(N}fu|X0QP!q*MYBm#G0D66D0YM3q z$E1sd47!L;Wo zn^8yHJU6UI{(bKP?Y8t=j=GA`EphFurAxa8pFQ|&(}S9Htr^qqS(B17Bl_(A14VP@ zJSw-@3Qxvy+;Bk@L`AtL$>rTw>_MZIRaKs)V*8$u{e^;WXYbov^QXnfgZFMoJAR{a z>_<_WR9g08Wo|B?7Jf5z!v;?c3~Wx%SvFTi41=w`}>zOT2Bw^Dl036 z$lBgDoMiw!BAtNK)udi=t1>nqN z*ACoYFmm{+V}5VL?D8K7UfTo5uMP}&+!`GXYk1$sbFEif>go|?mQJ_r&e=K-27^(k zXD&$HB;D6mAmcwVix1WPwpkl81|Nh57W<0BmsH* zc8>%TeQGa*8|a~7VKSCPa--)}%<#X57LFYXEws~D{W@IQ;b$ooPK=r=hmIble|RJ(kJ7tew}2XX$o!d=e7%M3U{e=D6^* z*zxFk`=rO2^Vgr9C=8?rTMQpOZ#Z%=pt$S9#Z~9+9sY{Pb?1EcXxk$qB1$Vx@y2R| z)GN-KU4OSP8qGU1KY*C;)xG4>!0uuii}Qn|uX--s(9&s}cM0w9lPMHe8k>i^ZK;<^ zEaQu4n@;u5e%9^WzGKIi9T$GhIG)Nd!#~!GG$lCPR!FY zfBnZJ)ozs+o3!sa6Pm_fR$kk>qdKQPb$M^~t%*!RUd-@sX%ANxxDhIlNr7MX=y}&q NHclcHA6}le`M(cjBgp^& delta 669 zcmV;O0%HBq548o5B!2;OQb$4nuFf3k00009a7bBm000XU000XU0RWnu7ytkO2XskI zMF-ss3lkSLJ=K!U0006f&U41KbNoabbNdnoo#hGGA4hoL`gXnWW& zpcqzQjeDz|)M5`*6q1sh1lV{8BI}Xj=abymZ#Mu!2M3nwF zO#{Gt55P4ofTnGr#jgLk__l2UeERa)Yy@_cLLg8e0Mq#LJUj!q{&-yj1DIz5u$#u) z@3#Pa@z_8LZ8CGxx{84F$nyB-5kP;{^ODiqr@sK+b!(%^;17MDtS9h#^BzE$U&|3B z_l;D8puk!b3V#3a;NWD^Zv2FppzQ?JuQMe8<2vH;v<-FhRf55oYU z>pF>~K&c~>MIsuuPYg~UV;3!F<{aPi6!90;McsN6H-Ch6>AMu;JD;3`V;AkFaoHUy z49;Q2WsG3h4(Ai(MPN0_>U>aa%F88=O9;mZ3k7yu7W9 z=_37>xmvVuTJlZfs|>8^`ZydpSOhBRx_)I=u8w7{HvMxPG|Rx5b?$fL{sP$aYpg+D zr83VXHh(>sc8xo04vHmJjGgHRvb0guQfykq9d;#MR~bp0^11sb3B#nZ=!!kSbfi?s z={kQv6v1ke%T=u~wsC)%8Pz14t7d_&iHN}q+^+8Ai|Be9U-*H1`pE?N#(MzwclYTP z9Vdg|+cP)J3}BvT-u?aXz&w*)BlXSAyP9S%3Wdzw00000NkvXXu0mjf D3Vb_w diff --git a/src/main/resources/assets/electricmagictools/textures/blocks/solars/solartop.png b/src/main/resources/assets/electricmagictools/textures/blocks/solars/solartop.png index 3274227317b7bfcfe8251844454991cafbb1443d..ddf4eb3e20e02ec6bf75d947a33bf5c1c5668e6a 100644 GIT binary patch literal 2707 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 F{{eyKaA*Jk delta 940 zcmV;d15^Cv6v79PB!2{FK}|sb0I`n?{9y$E000SaNLh0L01m+b01m+cxRGn^0000Q zbVXQnQ*UN;cVTj608n9RZgehAMN}YmGcGkQF)>H;LN@>a13pPaK~zXft(M(x6EP5l zM{TpY8O4g|cjB63Q&qaFru8`wo+7!I2XKfir5a3mO3?%5ok&62K18daa!Rm;tUEIMG|0c7+56_ z1854EmF&PKuvyA5wlqn0&?J|A{!<`0_7CJ}tpHoY9Dj>xOC~k}ydz@^Ol#praCu>O zN|rhdqwCI~r?bK*(x$bf@5$4`10w;><%Qj=F&wn(gks9 zp#*qxgiNVyk(yLGgk%$?4l)8L^NKBEI*#iqyw0|iF5J`YDLEYy8DOsvZvm0#+EK+oC6WAcQF+Z4}5RGT4}s zU5;U$K=97pYj>UHZb`{tf;#sAk=&MNrMj?f%kzwYeVVA;ndW=B3nP*M9!aEulw=2V zccV=K)?VprZTtIHx%CL8iz5Y7x;PRX)He_0X(v514eFn zyVz6g{^9xujBCM9upDAAW@qe7r{~Yyd+xpG+{gc& zx&KXL1F4H%xTqVv7d8M3lZ zKc|2T2t|K~!BVgpgrF@2P!+H7oI@Mn|LdKf%ZcySi@A*dtugP;+;5Hj5dDAl`+o>i zc+KBOKo`9Y7G3o4v-b;g3%!5i;wm}v6Ve4Vw%I$_0}SSuk3PZ&n*a`r#bI#-9FCw$ zz!Ox}RMAjVCn`dn^rj*H(#-C>zgAoXgHu)}st~n_L~Si~b#*PpN?mLAG}4?d@-IMA zL2K4hEJhzFkuX>i26+JV(7z{m^l9HdFuJdV#o?6+Dys9;&;cwBpoGCgKFMIoh z{R4y2(Xnya#H-1vpA~sw0CqO5x0$_{7YWTv38$DBMP3-CXhq^A9R5>N<@p_ z>YF90Xl*=4FRWHwX6`bw-~gp*p0>g2?$4x()ZSz^x5SSAUzxp4>_2(E07NVXojfcF z*n$zgQwY$MiI&6&zG^A>OP&X<%EW3cmAQDa_fkN}HRvnlGg3Ty20epiE31YOVD`nP zp|QK)kp*hKl6rBb;HG3e&ZX>W`tGOsyvOo}*Lz0n_AzLMTROSXRO%GjThGFZr}^66qOY#iY+iQEJ$cc z;v@(kb(p4x*9f^s8`=5FOVxTpyNa7M^Nq@E@Do&Q_?P9mDIM<4Oi3n6&I%%PioIQZ0V8v z`(>v)#&#ml-xlXz>*qSOoG5~r?T4cd8M(pw3G3(o{4ji&`YC1nqf=)M0zL{HzTVGR zawn>g>-E@w+16%#htl!~`|{`$c?<)I&jDSdu+!428Y6x}2W>q9&iYv)fNxw$tMHrb zdb}>VmrL&4p?`C5YI6Qox6gf?LrnQsoi}wBDz^ZV8+6Lly>qw2kfw&yidUr!UIof(`VlE5fYFxbg% z-h*2BbFUY*1_xI$(qv7Y>&F^(HJ;EitS4(itgQ(F<9bQ8f*QAvnP-iKw|%ebJM%hQ zQgpg}&m2pttp3ETMsAZo)-b~oiTKT&hGYZ~$~Sbk$4BM|A7DA|%2qjQckYHiN${f5 z^M~zpwmI4IMc$o-DRzDNEukX0+IW-a_IHZQY)OG@C;$bZ02F`%Pyh-*0Vn_kpa2wr z0#E=7KmjNK1)u;FfC5ke3P1rU00p1`6o3Ly017|>C;$bZ02F`%Pyh-*0Vn_kpa2wr G0^r|m&;<7Y literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/electricmagictools/textures/blocks/solars/water/doublesolartop.png b/src/main/resources/assets/electricmagictools/textures/blocks/solars/water/doublesolartop.png new file mode 100644 index 0000000000000000000000000000000000000000..797aa005ddb172ededa23ef3b51ce716cf6c0646 GIT binary patch literal 2091 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 F{{eyKaA*Jk literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/electricmagictools/textures/blocks/solars/water/waterbottom.png b/src/main/resources/assets/electricmagictools/textures/blocks/solars/water/waterbottom.png new file mode 100644 index 0000000000000000000000000000000000000000..9ddf27c63a790f9f6ad5d719b1dceeefee001b9c GIT binary patch literal 1821 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 W=S{(XXqf%{BZhz*YL#lBBL4@y(;-^` literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/electricmagictools/textures/blocks/solars/waterbottom.png b/src/main/resources/assets/electricmagictools/textures/blocks/solars/waterbottom.png deleted file mode 100644 index 06e1b42ff8d261b22e0828353317bf7a427c94f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 780 zcmV+n1M~ceP)Fj$M0000QbVXQn zQ*UN;cVTj608n9RZgehAMN}YmGcGkQF)>H;LN@>a0(D75K~zXfwU!G`lR*@PU7l}r z0ZJ5G>wbKoL^mLYM++>%2R;{|L@Bg&4W2vazGga&iH79MaQ@Qy&h5~@^wQO*@4=NP z@4)59ZyT;X`v9(Q9y@#_KYsJYC$P5l1>Ac1wc+9m_|!*7zyF6(3ZtV1VdXy-m{CN$ zbgyuj3ivX)?f%ZMdpkdwdo0$sPXKka2SvL6<^)JST=3|s0@%9+*vY^GQ5RjP4Jp6` zlIL1*b@q&&{#x!y+oB=K1 zN74#o&gum`fh8#s^B)RObrLg22>IeHmw;;eaQHO#St~Esp#B28D zf@H6x1pD)vFsTG#YU{Kuz_HdwQ0q8paWN#XN;CR4Wr4Yx0yEm0j8H5|_l%O80_;y- z6ET>SU_aLyw;Rg^vcIt>=?cPly0JIii1oBCfMtAkcl!q@J1K3|yir{WSMgFR-aD_q z0~S;_8eOTtpsQpkyugei)q-6KQLt+TYg?Z|QKWfoMu#HITe5o#MJ;QM9+4KnLT_Dw zon@_!)Nx&n7Bt^g!R=Sy05iY-@fi8BNH`WB&%fo(mAT-8&Er3|ipHcon+iMt0000< KMNUMnLSTaYsZS69 diff --git a/src/main/resources/assets/electricmagictools/textures/blocks/solars/waterside.png b/src/main/resources/assets/electricmagictools/textures/blocks/solars/waterside.png deleted file mode 100644 index 14cea2f5160ca9e58d7fcf59354921f44549e33d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 687 zcmV;g0#N;lP)H;LN@>a0vJg|K~zXfwU$Xv12GUqIUaLh zi(ms{I1oc1f-O=ui4x!v3}M_N*nko^1i$;c%T;A}l0}fd1ae;0bGvOPbBo9K$imSb zGJkmMvUKu*EH?)dj_C2#vnQm{dO_CCUtRuRK=k0|*JYo%{@FvWifnhkHZI>0MR;1)R7Vh z*f|K&8bR6J2-Koy_%ewgyY5KUJtL^^j${Ow5%)mk%D$WJ4@3*xhKYQCq~RdoOXft3 zpqh9_kiu0a2qIc_*Kq>FCsk3vKR6c%7A~Zd4+Vq`pQ|$4l$Enh5O9gyXEO=E2>eyS z$g$Ad5o^Lq2O|-#c)&rxE6Jc0t-G@(6$HL4(MJz37vBiD^F%;Ywj*An7L0)>3GCcC zSSui$n~fL9lj`max49OKfsu?L(ly<+z_eDpkc7iF)dE4&f}%z)JHli6c+i3%d00)$ z=?{YGU@yqij1{=Kr({MzRQ7-_$lRu-fUpr**c`OHpqxuaFx_l|pwW6pSfkN2S`f*4 zI4ltbICu#5R*1cLB@_TKa19>>?zbwke({FzfByXAGV)qvI4zFrPkFd>{#no*`~ew& VtwO+^Nksqv002ovPDHLkV1jD;8({zd diff --git a/src/main/resources/assets/electricmagictools/textures/guis/Thumbs.db b/src/main/resources/assets/electricmagictools/textures/guis/Thumbs.db deleted file mode 100644 index a6d16be998cb605f2099ccb912c644163488a6ec..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5120 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 P4hm-$Id?r&@#KF26pA$2 literal 2092 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58911MRQ8&P5Fo{p?&#~tz_78O`%fY(0|PTd zfKP}kP~6tn$^=gr$B>G+w>MvxEiw>sNIYg$`s(+7{mBQ|wuDb` zkv@OV-e%gah$qrVG|Ou5ZwBMSz#-KgSvlxGT4poo) zkSqCMg8v^*1=}K_4fD?4m3{EVH618=SaJdfTl1eBiNl@;s?4q{IP7CnX|8!I&DeHY z;q}d!#SFnW6@~A}HSefi%I&th<_%1qs%nqmHN z5S`5+Q@)W!z=47B#_we;4|Y6fc_41D!l3{ELNSvJ-_OJvJ27sBzbog-|Hyoi$>8_= z`^WCnYz?pHu{~)2RD1fRX0Z;-fr{&8zaIWl;b55XKH_}j>qaSvh1)wuxkBPySJVUdHyJB zr9sgG(#pV46S%h|Nzb;zJD1^~$$abo+jN22K_)`Y0C^hd^M?NTNTA$Q#vSiBg?zln zSDblu+AW4TnZ=_1&u(vn>S%xm6F971-94$fb*T}<_th4Q!>uUTe#x+d|kflp!+LSPtyHzO?Im`AqNC+pe%ZxSY1`5&Ny& zXsBKXhQ8eqFue^7U*A2Ob}LA7K`)Ddg4qFY-iCeEzQ1#qaWT{$-xs~&$1h`tDru9; w6&F-jZ#cb8s6o<;G?+tE`0ybSYENzc&(J>drFVdQ&MBb@08dz@t^fc4 diff --git a/src/main/resources/assets/electricmagictools/textures/guis/wandcharger.png b/src/main/resources/assets/electricmagictools/textures/guis/wandcharger.png index d64de5025e1e10381b2a5a6cd2b9b39783c8dfcc..137d7817d2f2e52a91a2745bf299c37c20507b48 100644 GIT binary patch literal 15672 zcmeI3Z)_Xo9mgN1rX*o>=_X3Fk#TY~i9((8UE(-C9Fs0?n?M~xnn7A^!{_rQxz+Yv zeHYuQHuW^Lp$$f(j;Yl)216hrF(#0<6>VMXPOF%-7YH`0s#FkEUN9&$LI^soDf>Nl zj{VrN`@oc!kCo*4`FXy-KhNj+lY4VN9v|CrefwA15kl9Gj>IMq@_^|W; zXxfaC-6ldC{(^r!JN~=y96|$|w8<%JD!x-v^h}SO(vxaWF=K!lp~xLYLss^x7ME0K zwCteo;-63WI4w2kyDu0I#EoHfRvX!$Q+Mqjn^gAiRl+IX9ntnkQGx&&)snelCY?2< z;-JroD}jx>c^~IUti6N2tvDe!6(8q@^_}0!h*1c69YmoF9dio z>=y*7FC+>5T>0aRwu2SPrKY8c*!FTd_%`U9wJby8`9h)4Q|Rr{b2GdU4u|=G$cv&M z6n=9)Ysp1_*6enJti*|_rjpYPOVhI)jw>hiIcw18!-*=N^1L!eB~jKavjd8JQ8sv? zC%`vyN+}f|V=k9=N=qrcnpQJv)-u6QXy|9m>XvTK>P=EshMOjaHHpV7xf|A-$uvxD zTHEq~pp3Mkr#U%qsQiR#>T@|o-Ij-`bT^v4rA=2CrzR2}XvCCsJqL?R}gZ;!`ve|{I{4yo(tTCvn6Av>BT^2X`kbK& z_f?_q&S`MH$!S7^tN*+y8iZMuYD6<(Q_d5c6}GH%f$dWF)%LCoq&4RvGUS}8;$t@G zTRCTyo2zm$VISwXO0t5lu&9Dhftrf&HNDlcDxPIG?f+dsH$LIsJV#+x&0g&&xuG0Y z^B|@^Z58C4x^)Kj1m%Fc0c$<#BS(0A+o!eKHE?@tmu6+Nu3pLrzQiQh22hgh;1?qN zs=jJwS3iZ9Gd<_%!@+^xJ`w)g!Kds>4%fTxzPc+pT<==-{AO0OqHqMALhHH-FMQLw zH^MG>C{UyQ!C-GN!q<1#dyH#EH9Zy6;OLroLyE!vvQzy?L(kn!J&BRBr@L6hKX7L) z-ClS+fF~2a@@P`K%#~BH#zu8YYaEyi$C8jVs5ZkzMMMf1E|Lb-X1J(`NCCq|(xBQ5 z7ZnjHV7N#cRGZS;h)4m$MbeOsQg* zYBO9^M5KV>B56=Q4x^>hKr;@wHYodB2vI`ku<0_!$n0z3K%Yu z2GwS`sE9}b!$s1d+6)&J5h-A}NE%f8s<_&#FZ-!kc*Cy%ukyX~%9nowuK{w($V42W z{a;7OegL8WdWA(>wH+bvuSR2ACyQq&Kq%{r*obS=*tnmA;g&UM9{78>@KEc^6UdwR z7mCFWpZ>+nW*oNFMqlW%_dJV@-*(!2-Wx;SA+%|E!{V$L3~%De$2~Xw6iTtt&X0#n z-5WcQr^9YLaNW{(-SJoNUw8aV9uIUMxpWa-`H3sN^5D>kZQu@}F5Ojn+y|53&_kCu zFBRMXKfJ=*7xD1r84mlpKb@zSulZp4!!6egA@Ie+wT+{~RUyw1>bPnHyg`ivf0o96 zVcmlH!KRJ*3)cIsrLV5**!b-|dz~*fItOv7iFzYgu}2`Q|4+`Nt!V{hId}-3wizmNxq!%74#W9>?A#*c5d! z8m9pWkPs5ol~;-f^XFRM-p++yJF~BQ;UGF5{KNTf8x0)EL+Ll|#PitjVi(Nl+H=@{ zT^8n4@*IWw7VXzzsz&L39Q6h0NW6p|rc*fidt6Q8EUqSitEm>hcyHq98)x_3_WW%pOFvIk4#uY+ zeRy4I-gBmV>9Xqsc;ui5MSj`8eE1cs1Hor>+gR*(-$?x6e_^_-Gynhq literal 1932 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58911MRQ8&P5Fo{p?&#~tz_78O`%fY(0|PTd zfKP}kP~6pE2MUgY(GVC3AyAZBavGFTN`m}?fhm6^1BT%5 z?5e;x=PdAuEM{Qf+Y7>s?!PCj1qw=)xJHx&=ckpFCl;kL1SDqWmFW4ohA5O7>zV2q z8oGaWGG}05`rzr}7*Y}U_V&fD+YSP(fvRPH{@1Umc+&N>G|uOR+U+~5rnedLtUWwS zRcZIz-)77A?#sPjcXp*?!t5`9WSKTI=uIzTWMp~pPLNZff#FT;GzO-E?;R`x4h-M) zycrmGRJ$;7C@@q{S8ZUpW2?l-BG9n+w2%YCJGqGrOdJR9rG_&9sd#^iUDcOi$G+0X z&6C_1{_Ht^csJO95*6F5I832+r~Jz?C#$--14>cR3uNr3Z%7EF8zlMQPUqa4#o zhIR*&1CQsso@8*(WVn92x+dTfL&H7dUBRiqP~Pvsz{ryDeiP7%yWOvF9GGuDCw6A~ z|DP$jH#rZ~zo;ntou{7d4f8?6AmmEXQs;oU1-htBlq)~kK(uXgPaSCt-j~t3-Uj%n!I%>Byu^hGzWbkjDG z1^f%%=jMUj1U7U6Z^2838{13Y&yZsH*1KChq|KvgxKE{-7<{&)Ls^EMc8xV~n3cXh2*mbs(1*MmGn zR_%u~rE0c$b-@c%GXpIoOnO`&G#`B!|NVDiuvm!xtNgV1-u}DHp$A`E90;O{>PP);Dh-SxiXTlF!6eUn$)A@5rlt8LK3#Uo-PxRCTe~ z5~%Ca(5=@sWyi*iml#7*<8@Vx{NHUTF5r^9o_yu4RP<>{iT4Rcb8oE>doJYuSGPdY zX{zO>lC}flGtyb#MY>M&VBv9l62SFgmwoK|H$S%?@(%z1PFnoWoo(7b;~8ogw?}0@ z+ji#VH(*FHc)I$ztaD0e0p;I!vZ193(SlSjf`ZryieF+@}4>3#&)L`$JZaS+TQE?8~N-C zZcO43p3=r#Cdb)kEH_u+tU{~9o}G_*4?Ax!U=z#pT%pBsz@VYCwcF8e3hOCn21CX) zwzm5Eg*HIp2e*G$^Kk7BH{3Cm!#Rnm!}+zVq{MPDL!0VY3$_0nS3bPjzMp6H{i_0!y#@?L dc18ylRYowdu`#U4Ptox!Y diff --git a/src/main/resources/assets/electricmagictools/textures/items/cardboard.png b/src/main/resources/assets/electricmagictools/textures/items/cardboard.png new file mode 100644 index 0000000000000000000000000000000000000000..8cbdcd579749a33336fa4afc78b7152870b1692f GIT binary patch literal 1382 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+mc-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc$WX!DQqR!T z#M01EN5ROz&{*HlK;Otx*U-?)#N5izOaTg%fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD#PU%0_}#n6BP2AO_EVu8M)o`HUDF34YC)x{-2sR(CaRb3oXS&*t9 zlvo|%`DUtX*UiXn)HT~doO%TiO^it=+6z(H)4iN$)eBx8$2 z0|PVNMB^j_-DC@3AXu0hn&_sPB$`;Hq#C7|o2Dv3^{0>4VYQEU|{U_ba4!+xV2=`Uhl&JB1g}AUp~KNYeclnotV2Z zEaB$n;s^8oDYDA`Wxm70zS~26BcI--gRdSeSnyy$H%C!>3Jn;r`Z_vVtqm+n3HA9_#J|Gec`#X#w;nSfZ@=c z&Zj|~7d;wgN&4J&RC&^_VN$Jih$T>@t?jA8s=)Ktznq-7~c>OXK^bm3gz url~91&f(4!)3M|G`rqjXES@_zFftgwJ9*FZ&H1ySlF!rC&t;ucLK6T%FY3eq literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/electricmagictools/textures/items/chainsaw.png b/src/main/resources/assets/electricmagictools/textures/items/chainsaw.png new file mode 100644 index 0000000000000000000000000000000000000000..c291364a50b9a32a310a8fd9dacc8f1bca90ff1c GIT binary patch literal 1455 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+mc-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc$WX!DQqR!T z#M01EN5ROz&{*HlK;Otx*U-?)#N5izOaTg%fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD#PU%0_}#n6BP2AO_EVu8M)o`HUDF34YC)x{-2sR(CaRb3oXS&*t9 zlv1t+S;$&fD=?c^9nO9trn3tRivpW-LH&m|?UcFY%MX8A;`9&f5`8lvu z5Rj2yl3$#WU!dUZte_E|nU|7ZUaSd#d=z=VK_5yXV& z0w4#Tk5co1nWqStOV(ycw=gg;Uh#Bs45_%aBzS**P@u@aciQ^>zt&usKJCJhh0T0! z$w3=09=-BoQc`eugoH=R0gDB~oXm-7f|3emP+aJoSvx?Dg^+bY9DU@Mu)IU{kou|8UR!cHiF) zHovWoKl;lTSGRxByWF={|8qA7E%4{u6Iu8%_b{X1$q z*trjcu4g;H|4hF}&-VR>(;ocT+U73J`0J~t#4fgcacS${!oG`lys`K%n85I7VpRU+ SJ&eqtBGl8>&t;ucLK6UrP8p&A literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/electricmagictools/textures/items/chargefocus.png b/src/main/resources/assets/electricmagictools/textures/items/chargefocus.png index 3b4d04245e4a50e13cff714d3b2ec8faf227b32e..7b4d5ed38634ba9b3b787ee5ce86b8e9395e23c5 100644 GIT binary patch literal 4189 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 literal 6298 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 diff --git a/src/main/resources/assets/electricmagictools/textures/items/christmasfocus.png b/src/main/resources/assets/electricmagictools/textures/items/christmasfocus.png index 326b5c45a3612c6337807649dd9a62a540093f83..1779674e4215e44235e05bedeeb94cf14bcd1a78 100644 GIT binary patch literal 1447 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 T&NX}+__Z5!*~I5*rIr5xnQvMQ delta 518 zcmV+h0{Q*N44?#%B!2{FK}|sb0I`n?{9y$E000SaNLh0L03N^q03N^r5iYj300007 zbV*G`2i*l51_J||C4_VU000_vMObuGZ)S9NVRB^vP+@6qbS_RsR3LUUE;TMOF-P-4 zHvj+uiAh93R5(wyk@-skQ4q&BB};@32nw^pj?G+8Dm>aeDu2UHiZsvA=m0ITkm#rW z^}g-QzPBPs6wwz3_sx7iGxMIxzo`5g1I6y?Bo2Z>B;turQTmw(K5uK#^DZ=N58TMN z>V+tOuebIK!vtkC1Qko&Qo*B3433Z>@-{Wc<#aPwBaJ9BfhcBFg2?dD-6r4 z39K(_aC>;hQ-8Qw;~wv=E}K=48`s$k*W}d%HXy_YLf?^vpo5%^WLBO+SZ4p`2P^(vYW!33`dw;~vZzAgk4uu|s4h$Gm9xFxu zCQ~}CV>7mG8jY|UA#36x%`N7pjKaEk->cFMyb+zJhBQBdD-q61XkpwYrw diff --git a/src/main/resources/assets/electricmagictools/textures/items/denseironsheet.png b/src/main/resources/assets/electricmagictools/textures/items/denseironsheet.png new file mode 100644 index 0000000000000000000000000000000000000000..6de0984905edb4f219d1892c4086f40e1a7266be GIT binary patch literal 1159 zcmbVMTWAzl7@nwzMq?9$ih}K7QgnmP&UG&{$+~QI60^|Vgw28>P;@S5lOdTo zNhN3r5}_?26-q%`3e8&+Us_V?^+_!CDYQ@uu?P~8Qp5|Wgb>dpyU~Z>g99_?_I>~N zpZ_u!yK~3uY7f*>6jhh$RP$u458iEC$@imYD;gR0(w=qFR$>S2G4720HAwoCN*&>P;G0W`aHu z$#PjY4F{~wQ4jWv<_gB>pdp)d@)&3>E5v{eu?EWakmD=m1iflkA@g9HrNJr$4<_g} zr+Ty9AdNf-BH;*QZ~_lva+r@uGS43c0>_Ii&#{8c@Vp|$6g~;!rBb*ghLP9L^0F+moWKeKLlBHV;$W@JIDS*rf(m`Zvs`Q;2Lu*19S!3I zO*~z@g6(Fr>xLb_5-1Wfwye1{MH^C)F>FHzXVe5uPQs>TDuyIQrJ`go5h!p>OqO&;i|aZg!dMZ; zWWzLKT-DA-e2G(|YP-mDk}UCjyA+q>TsoQ-#YkIPR#T}eH{xqS- zZK3IjA4zeZlRFO9lLTN_%&qObLwo{sn1^n DW<-Df literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/electricmagictools/textures/items/diamondchainsaw.png b/src/main/resources/assets/electricmagictools/textures/items/diamondchainsaw.png index a860618d78a948ffa497d232f7fa3919c12a0d46..13c34b221327e872199a485152044958ea967b15 100644 GIT binary patch literal 2346 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 delta 772 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/electricmagictools/textures/items/diamonddrill_16X.png b/src/main/resources/assets/electricmagictools/textures/items/diamonddrill_16X.png new file mode 100644 index 0000000000000000000000000000000000000000..b8e07be59a7b0f43e8c9c3ed06b110e5940e89c0 GIT binary patch literal 1510 zcmbVMdrT8|96z0pS|4Ldn2!i&MWeXuJ=)ScNhyh(Mpvr7eY ztVva&XBAsb1|F|Hp&EkAW?AG@8g5Uut_zvZ{OiVu)k&}}``D_9c@&jIS*i0(69O)&SNn3VwJf#71rec^#l>0wV#UD=YWSlmFCBd`m9I*z{Q!$ctxv1bDf5M7c{={Bj3|pwSZ@HnTf?wJG1}oo1fC_KVJk z3!CS!Z%vDAs2THOvJZWe-TYpOZ%M|D5Azg??gmA)pe}jV&2Ne`Zq!*{ax~7_t=P9= zTeY(0`W!!|z0{;#b=Bun;tf@On^NZ;=Ca0ru&4fR!@$o2M`ze=5B4_Rn;0lLF}>(u z68m~z-&@Nvnzrq)T~U0h_sZtZoGV+++f&E9YmP9N&+)gznf=h-1Lf`YRma*!pXuw5 zY+Mw5Sfz00(k-o##GUrT-(R&Np|-QV(Y(~DjlT3{9mQKLjS1k`y2g&PDK~o# z-j=%lEV$tqOuV>C_h9gyrVHG~+oASrd{5bN&tS)>E57biZQo}u9T3ecS1N12&Yr&` z&{4dv{+u_l*)^d)XMME4MXBDC+#Ky)b3QctQ@1kr;~gnW4tZ>g_x|C$Gxe@_Uu4y; zzr0Nq2!P!r~Tso>zgj*4xG?UnlftV%Ttci1$o|t^oA24?Z~TyxB5uYPYE64PPSg# zQ)H-St9K_(uojG6jy^7#hSpZr-TLmMleeII#fQ)Iq-std*j=~wG!EaN*>$gL-NfzY zuHv!w@rnz~qFrI!lBDru{yux2wlCW-&|@#yG3k9rO|-1&=p6c1bN}F|$Dv0_CD7;B V?z9`8^z4uQc^z4~wiZiC%|ErPF;)No literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/electricmagictools/textures/items/diamondomnitool.png b/src/main/resources/assets/electricmagictools/textures/items/diamondomnitool.png index 6fa9cc12a5a04f2a239ef57866977ff3a7d6279a..30cb97874bd951ebb23e7ac61da67036cb19a9a6 100644 GIT binary patch literal 2173 zcmbVOX;2es8jgUX0p!r-RBQvH2uUX)2}zJ}zX5Yn&u&*j9X%ZW3P<{j&io~F5ND1S7B!~zG{A5rp90Eg< z-3guW1{_X5K^hi;Mg#`1#fXdq&DxMOG6jal;Wl__6p%O`Mgb8VE0uc^#;;x@08)u3 zA)Fpa4peaAIH@p635O;Hg^82m#ViTIivw)XurUG|j6#4$wo|TRYdi^`c-h!|b{ixB zpG?qrPr_%XA_9W}E~111I*Cpclc^NIokgP1X)FrG6`+zSZXksWQdvX_g-vs3Qy9S9 zL%`IOk{EUfPcWy2tvm^FD5_wCpjxdasohA3G8Uw;SS*lC1*udbW3ebkH81J0%e zw&kXU_szsRk}0P_!HLPz{=2k$)l!#uyTig$^>rNcZTPV(_mBGL`#y1f7*!Fas2TQB zy>WE~UepGzn$~*7cK>?vUGqnV+dmV!Uz67?G2Jqm8F@~pWA=9s{j_p(;r0A9EX@AZ-=CF}V;tGAH+y_v!xF0*`-mod@#fzQ)J$*N5yL-bvTkgt7~7xb zUDG%Gauql+gN(N=)caU{k*hb;!o6VFlq^27^iQijRva_GLLvRct?9{k_N1FD@zI+sM;m84vuB-Ymfw|8*4Pa_tm$-Kc=qKtM=qNW7JD>S+{+2;i1^(%I3mJYW~AVM zb9ii*IQic|d(S`gge4w>nHevSz3aY}_n3F$ZyH)Ck()asI!`XropH&napIJiYPDJg zbA|5iJAKY>bxBTlw}atZ`I?+Jc}q9tozs~Y{nAz1=0wd5T~+_!)!2}xthzcYJUqO- zscGe+)CEOFMT&;V3pVerv-|6-SR16qMH2TO}qYDg)}$4b#xX#F=4exju>KkkI#PwEg6Y$Oq!^*o>5c zfyf{8%^vajd~0j#!$<4u>V#lUZZ6+n)r-%%qBhr=mET!+tt5GS{;V6AbN@^`PngLM|m zGMy}f^i7vUm+YWVuh#*MulybIq1&$=9YZUayBZ`x=bmr6T$m4~ zT~}tQ!0HEPQL0y`(T0G5XAg$VyfPh$qgyj)CXcW5sqF{Pt(~Y93(PH@e9IU3GYss3 zUdrE>Dc3f>zY>*;q-}X_)ebLtKUx1^`e}IV!NrNo_D|S?y_Cw*MfRup{)cWJh%ZQZ zRbWH5-CU86yJc#gSv_7`am+$VG=1OOZHH9%M#rP1l)fHec2k)7>ZCKbZ^riAG;JS;xjHn*s;!dbkKY)xIr7 zs~;?llD|8?*mcdF?c-VBw^-F)9=KBbaCo(uRzE)~xD{_yem(o%jK>81>GhC1N|E&A ljz0NIu5T^ ztK!CSBbv9brhg+8L}3jO!Px-owN|UG=R42<^WgP*U9PF@fOeqPF@?8d@S25V-hF3f zp}_1jPwrgdcpvXbp;d)KD6;6xLwF$bSf^oanPlZQH%V=WZb$baiZKTn+Cr zH>-017oNGw29R!5F8oK+f`bq|ddm0g;iF6xA`Z{z^YhQ#mF|F?b-3jMzkXxrn&Fpq z1|J&w!hcYV4;~siyU*UwP`~2ISa39f&xOsB8$#h%4MX3L41ImZ0S-bqTjqOv85&l6 z8twZu*z;u$TaM0gwPlx+hJXIs~|hQSh|yX(`C;io&HF=k6GFBC@sz;Wi6 zHQsXWeE2wo+hwwj!Ls&r+ov9f=v%w%mKF-50Dn5y0OuS4W0+Ivy3e~Fos_wA4)Kw% zFvjh&<)wuIhrjXmc zEsvoded4ZRjN3AQCWS}<_UH+Rco6MG2{ErS+z^0>?Qf>f2(T8oDlvrPwZdI#h`8>I+ zejo4e*B2`*9^R6=Jr#nWEoG&SDt+7*dv8n8zs5O@(}zs8xK6E>+-iW60aPeRE&!K# zIS;4;oX~RcOOOXaNe9K6ITY|w_R>azMgwv8e1 zDnxCxA!|<6IV)kiBmz!!CGjRu)^yPqFa*% zH(TW>S+}LHY)FHu`dJJM1Olc2X_90QMlcM6;bzQiMs)7IX_02aLntC#kGo7)GF|=8=In)nifC6 zs(>Oj%e;Oc?yNXj&)v-p#elju>|R;aFNJGzNPM#w_|!6o4be|bf+(=O#bUL%Ej&sA zGmg@X#f5UYE*DAy+6`!i7kCukoS2!^J~T)LRCk_1sqGUh_2sE8uSVk>PeWUO&+ znNLwU9}nWTMcwu~*LqVfYnK71N^*@PHN~r-vO!WMr9tw;b~}83t>_b^fRYotp|yY= zKo*|@LWwMS;nftg;wI*Sl>~sNNR;E;ILf;%1e!|`6iVtbyBQ!5Rx5?9^M(JLI!t#8 zi`B`0>L$LW7h`O?(FOWqqmO`3Zys6il6zk#(jh3}LYbqmCis&ps%iO2yV`H>`SoR~ zCu2`^B|N(@Ds@~myt6XBdnRfOc<(sV1sldLN7|nCEJl~J4==p;gVwgPysXWi@@U-y z&s-jRT3u*6vHgRE3Cdc+@GrD6 z!!+54-#L*On(R^x=DOM`5>E_kea7&~W9XIN6Ae$C*CK;a*W$H_k)a%HWOjV`))J?Y z?r=W3^F;3(M=rhAF{>Fq?$icr@o3*Z1N2>xPrZ_M&zT~vmL1^7rj|zW1tfde{bP6f z*2ZM*uH&KfyOUR@rUyJ@lQ%}kdiRG4PtHALzrJsO$JrUf}ZtiR(yX5F!TDqiEW|aoN z%8!~Z&cAf%>O$bYjzCXF=G!3)#3z?W!V}4%wDRN01&i9z(iD70{ky06l1DC(1?>sY Y2jQ*a>9nHHVt>f8;tI$6MF*by2Nx_BJOBUy literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/electricmagictools/textures/items/diamondomnitool_alt.png b/src/main/resources/assets/electricmagictools/textures/items/diamondomnitool_alt.png new file mode 100644 index 0000000000000000000000000000000000000000..a03c2d73b3459302414253997bd68009454fbc0b GIT binary patch literal 2182 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/electricmagictools/textures/items/ducttape.png b/src/main/resources/assets/electricmagictools/textures/items/ducttape.png new file mode 100644 index 0000000000000000000000000000000000000000..4d86abfb3661a3cf4af91c28fe2b8cdb8b8145c7 GIT binary patch literal 1461 zcmbVMeQXnD9Im3<7+}Ug3I5Kr0A5%VpBuHXpUdM|5LHNTHFOH2k%J+Htx}bg$swAl0}|u|wH$ATZ^n9I zh-1xgwcd$2Lsk&rmTVTms?9DBv$>8TS-7keDv>EgAP6KHl7k!hFeRJeaa~GTr;bq= z8iz=AX868SUgrwPDu@8mYxD?%X>rI%YH&S4;^)F;q(;I8G5p3O7I#53E=d zSwH2r*(Yo%J2M=Rq!5Lokw`=n(P;#+7R5=DL@_O@)glT42{-Z*EhBt*L0Z8E!i>m; zBu?O=lp^gD8YDBUczXW|!I0DWK$s6t1WE}RD$^kp*I;Ncn7Y?EIxM-tzivDf9riSa z0O|%|p+RJneE1in$x7@VZ72m)yrGthoRSoJqfKBMf`FGCHZ!bz(Xbp#F$7^C`~-vO zffhrIB;iA7lh23ffYA?(B*QXBEUoh}zC~v@F2-=Yg47$8QD?CmNNa^&Z?Rd7R>NX_ zn(N@h63sIpZJSeUPjInEaw)3_Xh{$~g0L}N1uFuAB!mM(2(ntCqH2z3g-H0hREF+f z*ak#y6JYJ45QN4=vTIa(M#-s$nq{j)wPtb&k1zOgq2k-=+{lB3@ z6{pZto&2Y6(nm@$rj`%7K-oO#Bfu-oBPw0e8r;4?rFv}0VY7JTpJERfFQz`Nw#}cj{#5JIcy;}iDJ^#&*Q~4iAvn8$ z4C039-s!h34T+9Jy}x;?qi^Rf?^tu#eU7;H=ZkVr&D=LCbEcbKPu6{&XWm`7>G)bi zimmH!>hM&NQxm6_s%K5PyQOqt)KT18RoGN@5I#3bY>V%!I^QRXuk{%x&Lgkn+!=PtCHW_NUuwQIY%ZF)vP-@Ha-Ylf>m)<;rxE6@ z84HTvT-ki$dMv;Eg5m1SW9lh+i;|O=CL3H|zqR1rtmiuizkO;)!m+jOjKAe8pQ{j! z_a#Qoj(R6|H+vgP+pU8Q?|#%Vlw`Fn_79WPMfAX}gtPbO$}X>Gb@zp5WqV)G&Sj># zYo6|mSLd8O#BYktyO(*RhS=lG+if2+$yYkN)*d+AOHXW literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/electricmagictools/textures/items/electricboots.png b/src/main/resources/assets/electricmagictools/textures/items/electricboots.png index d59477dbd3a7337a25f6fe320e2f83b10ebc8831..c77507a218bf2e4db26fafb49247f52cfba7ee25 100644 GIT binary patch literal 1740 zcmbVNX;2eq7>*#+gHx~|SXm<=MRIJiVUtKy$OaOWD?|t)mCa@Y0h0~MLJ|tK9G0V= z?Tp7r6-6wHRfaO!Q3N?e1rJcGjJ4EpR77n-X-6$1bfaMV!|_LVX7{_^=Xu`mJ!UK7 zW22mB`OKoxXwEVzBBw?-+dIRN`udGdpwuvrlqktWLPMHSBTfrf6Dk~#>Cg;Zj-zU8 z&P6C2Y^VHP1ppu2gHOC2Y5^#17mYQ02VMo9wY$45P-u5xh#;);s_WZD1=}k7z#{2bV|*r z)(GWDGL52v}?mi^E}177UYBPofrv-n3|n0l`g} zQEMQzgdVUlqADVn6wxV9-(Epyh>3YetT#;tiV7Laf*M#Llg-lUZ1;L&Z6f9PzizzO z+N7`=aF!f55xGW;%7MD)&8`mJ*oPJPcOkb{+pVrRX4;;tEHA5$_CIsfE_>Xee5MRa>9|ww)krAg znubFhGdNi87dryW+^f6;qoox$J(_sNx)TeyC55|Q-QL>v;yC!a)+_bvv~;We^DXN- zhoAX*4-d89sq>l^-FP^Y6>z^IwmLX?*@ma>dmsO(aCEH!4s;f}G^cz?FKg>Ne$mIZ zZ*M7MV}SJ1r3kInp*->|64o2go90yT;@+n2w%-0?{ngo-tzFd#wIP4euNKZ5-z_7< zS~h3R-PJ;VQlneY8Ip=Q1n!Id+}WqVzEIlpi^E`1@EVEOxPNxbiNJn2_wLPVtZTqZ zmfW(sj0lz*4nDAt?pfQP)Zlxxjke{;DyfNH`zM=UGjrw1#|sD59i5V;jYVf)X}4*Q zpDr5TPZ;LcmmWIOl#cwNJ0l0OTo_u@0vaw=pAo2Bv!>{Hl9-oRfxB2jc2D2N;rum~;-o-$= zBnggASMIpKuch+JVsrKH=DrT~_j7Bi8=4(^dNc_x6bkM zDm&Iy)<1s2US#%5C=+k{s##c+lhWS(H11`6{k9thzm^9$f4h*#Jpuz^c<0E>A>oCPH49hP zyA2&4jdN{7(%{~t?nbADg4y9I*T8A{>nyjg-M#0@Pw;eC?&>XCGCuEDh^gM_FLNqX zIr?tC?vD(1bL#hauT3evtg-hP8lBj*+|G#>cVOA3r~!vZw*QMv5{n#*NH6{etr?Q# delta 728 zcmV;}0w?{<4e$k!B!2{FK}|sb0I`n?{9y$E000SaNLh0L03N^q03N^r5iYj300007 zbV*G`2i*l51{Dop1stRR000_vMObuGZ)S9NVRB^vP+@6qbS_RsR3LUUE;TMOF-P-4 zHvj+vSxH1eR5(wqQB6-1Q52oTC}NAqG_h*HMoN|GsZP3Q|QViJI*uHTrTNAx+XEV`Tll0ZEwjszIT=AjyLzC{fxp zt%!Egmt3P37k_^rK{}Ff!L44#$&2*QIZ)c^pQjb!B-urZz*PCbC@g$f{E5YTYgHk6 zS%jrfL`9^xh^39+)tp{-_0Jf@l^G9LXE}tqx3uH%kkWQBo;%tMXZ_#C~B4(A)!j3wPBJ7w8o3=2y ziCpd(^nVoBScjkcJV9kMwSl>X&#>8gm}}IyZ(m0VVSb*;P0Y-HLP+<}M$x{rEA;sn zEs+w2ht@Hd_i%l*43ovW?IBnAj{e+791l9sGp}K%)}b>tGw$KW*a~i4+k$FPpxy9r z_t6g&Zhyt4{09t=zk`+8#i{5j)WlP?+goUfS5aVRUm-pA2Dz#CSbVUD`%Ayj#2h8u zvkiZ&f>z@ReA*gLM#>1Vs5V^#si zo#pEl=*3_#eAUrP9X-D7dWU<^--(a@*3-i~lq!LWBho0lp2Qe(1CfdWYKz{8=`g*) zx$HC+%3!!HGsh=T37Xkbl(2C1E)3UUvC?b?BQ)G$)uZVc1*Bp|GcIG@|N2`NU^d8D z3q%^8#;U+f=IBfki_6r;qnYU_Vqk@b0ig~lZNP$2dca{>irb_P8LQu}l%Bh`K^D*t zq0(inmrf;U<^l?W!~hXj#6fv{2!IhTBoZPJGy~xCAOQ&RKt95OAgK_RLSkUxVbN-& zAx)}NMh$4uD;di~QC2Ak+U<6(UBD$sBM2b~0`mAEpUEH%GI9_3*|43mgCuwF!03@k)A5*XuiAR%9D5Q}*z zA5LQp@D2YrbRg{%=&FE!sSED^Md`22Uj(vI`fO8P^UUe$@FG+58HMIloOraKX|IgRbGp;vH$Az9U^JS zcRS78SX8AQvAx|`yr$&E`Gjy)*Z$`-b4%*(AuVmklvnD4o;^6~VMg3}r=koqT62D~ zXiSghb;QN6>p!0CeCVSM-U-Ytot_d}k!^33aurRC#;uo|yLWUjl|8H-&+tIg8fUbh zPF5Q|PUhiMy$ftRPK_M0hSAj0T>fMc`_}`0Ta8ui=0?Oc{)=-*bZ$>srIaA@t~^xo zRX|95`^mELri#kri@#60Dmt{O_fS*$iN!tR*n)$3{1u+}OZ4TRG5XGI85>%^S?60) z)~$6*`m&r(95LN8)ApTV02We$V>ZwTHUDo|O zcgv;UjC@{mUg!Qti{#SJJ(kkNiF~{u9Kf zn?m02$t}JW6F}MvJl9^g8UL(%#O~dY61H~ZgEnsNqT7#s_{qB^MH7(9Q;9X>yV6r8 zJ-?$_bsw8Otu;Hyc1zK5v^$~J=Is|!75Ri&|DETJ%O#f*Gc%=_cCYFx{1!O}ER%)j zObOVPbL9pZJAeKdWZZ}|PtK06RbRN7ClhRZT-{SNDs)0FW9DA%!PdL1ihzgiD{rH{ tFSO!9&CkhQxofWAFjUu`b-jS$#@IF8a^XjF>w4GUNUhQ;t0I@I{Ri1NsVe{g literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/electricmagictools/textures/items/electricgoggles.png b/src/main/resources/assets/electricmagictools/textures/items/electricgoggles.png index 833f6f8aa60ac0dbbce132c9c8ddb1d6147060f1..75c62e8d01029a5d6e575bb34cde66e6d93b57a5 100644 GIT binary patch literal 1493 zcmbVMdr%a09N$tD88ILbO^tOy6LN2N@AkOejSG)k5U}HUCFwN7-tG@>2X6P=UAhBo zrl*FG7S3d#=)??0Y0Z>Pf$tY7H3nrWN||F4l?GY)0Gy#c;HWu2ZSs5PoNEie`;aQn%fj&kA-q0EPH}0=dP9NrL=|x(hT%!3n1wb}Ib^$oc!Izb8qO_Da8nyrZL=z8I7opK-Ee~ z1B#qWuF$NA?&)|49S8kCONxSX*Wmvoc@d0g{%*S`q!kAcz9PlVmbkLh`5?7;)4> zlP;8_TrSiEEG57~^8#?Y$EJIZkD8K zoWz5mZBe&9!KLoYW$X&zG+A-Va(S={^4zi}t8Uo~+wJhO)uJTGJ~c6LL*oInKoOq@ zLWUxH;IR}l;uPjhfHMM@nL=@+z@eOlExi~6)5$K-7n6MiB)xeQy-Up5FPR|df#EFH=Ja3st}xa8aQ?i}L*Mrq4xMG) z3>&UREbd{GG81B!)OSR!Tx;v-K&Xm{B z!xB&0>Mx!A`_kb9)m^^aPS{bxWdVecJ1xHpg3EKjk7K z(u$v*dvW?{!I%r_d2LYPo^wgJ)wpAcyH0K6hT|eT!<#$j_sj@U-%t6e zw;>n582eUl?dH~77tUYF-~Yy(+kQN0`1b5acmL8`zcpd!C;dZr*2L6)J`gHK;$5c( zt}b(J-0)587XHw=<5zz_aD-uBP}a|G8Vc#TGqBaMXyHNP%(Mp^{2^acJ6f2!*Y4y+ zhiKPAo9#1KM90)gq3`*t`;vxMWsVM(4ksRkruX-@?`dnu4g6@c(sS64(u!aH2U~R} AX#fBK delta 475 zcmV<10VMv_3-tq#B!2{FK}|sb0I`n?{9y$E000SaNLh0L03N*n03N*oJOi&200007 zbV*G`2i*e^3M3(YXPZ?3000_vMObuGZ)S9NVRB^vP+@6qbS_RsR3LUUE;TMOF-P-4 zHvj+uUP(kjR5(xFP+Lm^VG!Ln^EXsPP(kz-J(pL+f-Hj+D}M{hyXmJ^gcP%`x@MZ$ zf8}JgGXudT-1PQ4iv^%jiIK zn>@CObe*u1mwzi*Z}C2acxiFJ4bf>rYLqyv_nFk-q6v4J;7(acR0-JzA@{)ICj(yY zc}B=TR&a7hJVhUx|C0aMsVUL<`~bnZ5>6L&^&Pw-1d5jEZ0-YrS%JtxS(zQ)5VrU( znj=<$XjkB3!J54QZ3Wn{7vV}0_DY0ZKBP2Qoyn-)x>P-@3=Xadn|$yIgJs+PRD&g3 zVA4Q_Xz}>^ct?rQEg@zQGNzS%SqoAe<^AOil=v%T;WtF@t$bAeA^yvuX`jzjA?6tn Ry6*r0002ovPDHLkV1kba%c}qY diff --git a/src/main/resources/assets/electricmagictools/textures/items/electricgoggles_alt.png b/src/main/resources/assets/electricmagictools/textures/items/electricgoggles_alt.png new file mode 100644 index 0000000000000000000000000000000000000000..a6fcc909aaaeb10394c5b6f98f0463bd2f9f66f0 GIT binary patch literal 1616 zcmbVMX;2eq7!GnYFk(Tl7ASTb6rm;A-Q2qpIkG{b4Ircgv})OGzCcQn4V#TbwA6!o zjME}2DoPa*RP4ZL5szZaV5?{`qT@MODh{m-TBM_nrL~rBIBb77{^-u^e%JFn@A19w zZpcWR7Z?y8z~k`(wW&lVHwJlLz908}^U(;&4PmS%hs~l*Y%$3IUXqbE07z>k^Fbyc zjmwJ8gLod#yU481VRLlv;uLKaksgf5Wwmo`9xpz@WhbdZz(NL)Z?>rfL#=HB$ZS*z zvSm6%XIFy)b7~0#vP#nQR7oL)83hS*p?DY030MJ3LN2St=D=Ml!Kg0I%{|+&02+m` zg(|_AQ#rZ}NKG>Ul8IzO3K64_0u!M!DTbnPkQhNFFp9upOo*bmRDq*%X#5dy))=D+ z&m>aDZE-7=pnzrVI1CpT7mJD|BAUsEQ4GUiL=20?LJlExEVHqsOK5XMO(+n+K`~}K zYo=|GN0BtpPF5x0JRJ+cYS-zW3)>vyiQ-ZQyGT2XiV)ap^~5!bcCeY?UpHQecIcPc z0h|dOw3DH@`!GdKkh$Ew+>i&zd4s1jX6{l*3qey(E3mOzLM7l%L`Jg_r=(K3)Fh>Z zG9X5T3QTGcl1hU?C;R&9s{VfVZlYqQ&mSWP_AjigUB9|Hyu9`1l{KoqzMNiDqePN? z2-puFsknG*_saI##>N$EEV++m%>hG$d#zsd<163p^z#A!&JELJn(~p(ueF5TB5yj33~g`mv6Z?M>0V)Tm+5xP4c*p67Uo8Js=XL97#&m4$rM+_fwX2DXKkRtebI0m;V_o0J=iKh7 zXT23MVFSI5UX0Jt+{It{pSd<|`0n&YuiRU_F4%(e?o{U84^P17E@~Cc583Lh$}ny1 c={?T#=A}izdDgD{bk9Ftt4Sl8lJi#o1EjTIJpcdz literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/electricmagictools/textures/items/electrichoe_16X.png b/src/main/resources/assets/electricmagictools/textures/items/electrichoe_16X.png new file mode 100644 index 0000000000000000000000000000000000000000..8a2e9331a406d80c968a59e0c1254dd510169f0c GIT binary patch literal 1339 zcmbVMZEO=|96wwbW6FjJFVhTm93Py??yc>$yK{Bx+K!g3V|LB91W9(id)gga?{0U` zY&%6K8V9Zr9SR0enZyqQg2M%3HVWdbA)1JqMI7K4$|6UUK)m z{eHjy%k%%=?xw~~D+(Vh#4v1y-{%RUab@-`$VcC@-)BTLJOI6Iuvv@1xM%>(C2L`T z`(t7h1c4|gyDxz%49n|QLT#`u&>%=!j1sdLDiPBW8^fxq6S^pM0*Hq}R8gJ8Z=>f4 zT#=nbD;Hn_x*K#TzFq?~_cn&4-cE^^iRwr3s)T?9VgQPGBG#pvLc&SR>I!I{-KGhA z76Ln+#GF%YfhOFo835-fj+7V+i#vFVRX1)D=)?fCpdAZvyk z5rUq&d0S}ZBsw6}1)7e><5b*AX-1T0d7h^k3vIEG2tk@j6^aQ`H8_u)_IkKFp5YvfhjZn)e$|Ac zDuJAB1=*hGR^F8>xD6me%?N2)SFQ@0Iy9)69h#22-FSJcqRLv_d^meUa{+sRp*#WP zIzx-$vndvoMa%=c6#$8|lA;)4NGW1t$x4ppNGpmt!ULJL+c{#MFaO`v(a0$}TPOdi zo7@&E#_V*V3(#VrkARAr$3R^&@|r7+VN2Tm9#<$ad17C6{YNz=nK$npDt{$(tn5Ny z+pX~0J;NhQUCSQYRQ>G0)cDZt{Ki4=^OuPqk5s~y{e1)Y-p3|K#_J~y{r>iKbEf2G=`+j8tM7b$Ypmt?os_Sr+}|*rTz|G=VDqk)9Wzw*uC4FxhcDF@ zFh#`2{y`r*QF|g2^sTQkw;fo%q~WX2PNuj+0Vu4yFaNn~&X>c52Zyh#)~jd0RCnnI zUa^FDYRucc`M^x^(aNQ#f89}B@nmXGo%_tiSC8Ep?Rr=;H$Ica8sp6WbHLGeq-CD*EeUnnwO-Omx{7+nO7jI~J|EGP|R!{fg zW4)oBnVO<>diT-c^y!rO`7%Dy|DEy3g-b7-di*{A)Wyj!OI-z-Ki9mWCz{`Kwo9kB v+gsO0@BhUb`l0^tVCKsCbY^P&5SE8Y`^(SX(^+04eid^rW(i`-y+#R++ zbOfh^Fr0Ccu`SaP8Aig~aFGy+Av(XfXv{)P#uk@-Pyt^ULMBd(_!KDmf$W2q+&$0p zfBwJU|NYv1mCs~mY|TIrB-69Y<%jFWxvb-EMa7i6QA{v8e1Su{_#5ledXlMx3h>{(_r$VJ1#p_I1Z24`)djwYtjTIbj-gH`n!jI^1Uar2BrCKWunQ>S zOF$@7J-4k>Kp+H4vzw-B=gLu4?)s8JT6BdalO|+T5;L8@$ahZef#?RhOn-T z^BGxx<_7y)54D`ty|4XT=q^fUZMNZI+l})bxAskj*MGL>lQt}a9q#rHJmKZvdHKRn zVBvDx`V-B}&H3-Bf5!Jn0eIWa4Lr$Og`NUk0|AUq{E4k8^+3nu)LRbC9 zO_y}k$)o(EziiM97u(t@S{KKE?4P|`{L%P;J}YnfcwRF8^DX?oSbgGBY+Au{vEkf+D@bYa&|71+^{vYx4jy0i4Syj5S&RqlJ_+>Z8{ z$491e!dr9&*&V*;KK7K3Ogl=(Or6%>o9?{cT-3fW@q@smygk+}6rAw5&^b?3v!UK{&D|4mWjedk6xuf#8`8=#IIno7%CxOMiA!JEOwj{NTU muMXlZwtL9iZywy8rbD*fX+L#oL(SFXpU>m2bbVM_-TDvdeCjm- literal 1327 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstU$g(vPY0F z14ES>14Ba#1H&(%P{RubhEf9thF1v;3|2E37{m+a>y5WKC+O?Fnv`yHa(IyAmfeoDhh3 hcT765Ti_Gp1E&0&#{$Z?opuH#G*4GQmvv4FO#rkZeyRWf diff --git a/src/main/resources/assets/electricmagictools/textures/items/electrichoegrowth_16X.png b/src/main/resources/assets/electricmagictools/textures/items/electrichoegrowth_16X.png new file mode 100644 index 0000000000000000000000000000000000000000..8ab4713edac7c3f953899b01fae5cc41547adf67 GIT binary patch literal 1399 zcmbVMdrTX394{L(>_!BXsEFZm5I0D#*Soe??ncK-AGDDI={g{okX`S7g&W*mxgKjF zQyv?SEqi1bT{5Q|kBGC0f+O3K#gw6ADv_aE)PXb6>CAlVf@U!cuRzg1$o}w>yWi{c z`FtP0@AnQ=l$E5YGu0}UD#hird6Y3V_9iDO-|V}Kv@$#?+pFarqF)Zt5>Q!K(FY(G zPuBqtpxKtD4?&?ywZ4h-R?F4yQi>6IEgi#X!+bztt5k(W;Q-Av02%UuI!-Xdzg~>O z5XYL~Dx+KH4p>1w=WLb0j@B|S)7rq0EL^k=DhyMK01spu3iFLZkP4gOC0$CH$F@-z zT7t+8W_a1DYIg->6(s-}wMK-|;TU8hwV2UBVweWPb(kK-bSO?D7)BXP6h=TR53E>| zSU=^lIaX{bD>Ga#%K-{SL!pp1q}Pg49g2}8iRy3^#}NgA1X~1|4kJP^C$3-vK}O;N zGA9a9Op*49&9WI*JY5cf54hc{!a{H*QA*0tFdaZKtq$e+SX@i!pzHzvy0IoY=xqrA z)B}QIv&1O(;m?VamE1kpPzbi>-FT?!ZlUlE5*{t|yHSyF+Ke41_~(Bnt32 z*ChmHT3|rjHmBHL;SvwzQdSAjvM6~)u`yl+74@Pl2J6KDWVJ$DsyKlaL&3b*4J`+3 z0}{6funtM&p`{d4+#2Qqp$C95>Jggu>k!6oz>oqXW<>N#%zhHE7(p1}6+ZiaQ->-} zp|LvoPu;|~lwyocSGz!2to9KQl;)9?E}8C75h_)}Nteyy4bKj}xYfDdlG?p!zIFM7 zCbHZDr}Y^!$MBtr+0Yls>ipg=P?OSEJUaT=rOA&b4C%@0J&uvIv6;#CE~rvn*$w@k ziavbh@cGEG#JyPsBad|7Jlb~uRbbn{nD|Nxa%*y$X#!=rpM8GLDO6T3^j{hNF+0J- zpM7`q>f`FMlFL6-cJ!1lcn(EQ|1_Pkw>INgZINcGlRNQ7WhA<8h)CbfIiG9SoF9k` zA7b%4H4mX3Npp_0#!pWd-k3OE`piCW{&#A4{@y@u>w6V%ir?U;@?TOvJABQVn|>t! zURCernJ+s8mo=fbG?Fv^bRczhA3vu#K9$z<{zPUTGNJvm=G^Y>FGtZ!*KQ0A?)oYR z-VlBM_RWuXQl|{R`4a99Q+Ez({@%>Y#Pkw&l7rvzB01bV+d0Y6%!e3jX8+EFq){8v_Nh5u+U!luhW_zo6 GSLZ*QuI|tP literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/electricmagictools/textures/items/electrichoegrowth_32x.png b/src/main/resources/assets/electricmagictools/textures/items/electrichoegrowth_32x.png new file mode 100644 index 0000000000000000000000000000000000000000..31ee29d3c67db4c4c8e163929e4efc0804feea73 GIT binary patch literal 1863 zcmbVNd05kS7_Ma^vVmg7i#cOJr%0Qo2W@I=rI%C=YpDapD{WF*p-FARs1*f4RMc&{ z3Fs^gQSqG44Mjz~P#={k^PU&5XCmmFOgy*gwp79G4n9p8WP6^ z1r7>iu~=pASpZp2Y+&g@gT zoW=5+Z8xRRDGBj13+dpYJ`B(8a58KbORjV~QA;{b17#tjC2Xc@j+)Pr3!cK;;-f?v^nI95{^vZbt?|$=nL?rCk{__iaNU@Df6&E5KJy zr6d>tHR-|uF;C33@C7g+L3prOgurkVAmGD723xH4rfBbYr_Q987L-XkQ;SEFpm#89KLhCL{qd8|JRK-qAAlHCk`2L zip+Fbn0#2nyU0xJ-Y(<=GTz80xa>?)&uv6!QU(OeN~ zHgi#_$jU`60xMU_NBB~ykS`UZaF?Ao@pXcjXl)F0Ghi6j3RObB8c|EMVpyuvsKu%- zuAZQ1l(67k+IB{}lZ(8SD^t60lqOv!lFaC;0)vgDNy zYjBtSV;s}DNC)sT#4`IE2V{%`+l^hq(nb=oB zPFY>t^vI$dT3)qq{H55by*Yh2Q#Z%;QNlAtAsjQ-x~TbdX&9&fi6Y+eLKwv@M+bdE zgd9%^NnbG`D#tWM`N?ln+n8-V4xD3i8is}sG&n+5E?j-+MEg^6KQ!RI;)LA3JM%1G zw{AAHX!EsW<)Jad*Q%y0t+TCNFkm492{dSIBvdb@+-(aj-57^H;j%yv!Pq%AJ&%agM@$Kqh1kbehw@L0xq6i5(Po^ z<(eyFoORT)Jr~{18;u3g`Jum7_FH|sf}b;?pLIOuT=P!7srtT_nA?7#;GTp|X*irl z9R2fq_K2e2WbYq-c(un`LD7-NraY?SBkztwxzSX3gkA+c={_|Z?$vnn=CrBU{>USf zs7b$F+1h;W(y-MChnT76*+yCDC< z?Yv{pn~pxs(WxePKb67W)dZ%?!QhS$x`mKg%A|a&l38Ua@BE2l1XhiQ`r^%}9FqJNSNB*r+Y_+VvA{5xQ~XVC8|$ z#}XqtN}adbJaL%=98zR{MO0|jU*!w>e_A=3x3CU1p0Br6hqof7VSRRgxD5*WR?+k3 z9_-#vTZ`<0BkS%)sxPkBq_DnIr(R#TjVS0^UTC0XHU((vRf3UZ#`73{owcA9j#PuSoK4Zn))LBJZ?_;m@ z$i>I8jls2j%ZKdLU9OJwe!1oEb(|!>5W^GY^^}$i!}hTqIk%qAWec9w#DxrauX}UH z!H!+(m6OYQO}C`hRLy$VH7eh>u7q*QLCZ5UMu_l(Pz7-MYPy(R(H?1t?VI2K?4jDd z8=fq_ak|ZYduI2e0d1kYl4bWrN~Nv*-KeT`{YGWt?z>k^;NLH`=|j`v=ZM$&Ua4 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/electricmagictools/textures/items/electrichoegrowth_alt.png b/src/main/resources/assets/electricmagictools/textures/items/electrichoegrowth_alt.png new file mode 100644 index 0000000000000000000000000000000000000000..18db9659e05633fa28ef22449909f6a76172b4db GIT binary patch literal 1417 zcmbVMeM}o=7%#dRU<28PGI0s#K_a?cuXk-}@1!u=D^jG;mKti@bl1DLa6o(I?x3X+ zm%&29m~(-B2*i;2F?H%l+$Ni3Fd>o6>0lWw<13peahecZ+(dNAyaGl4Ap65h?%wx( z-skswzOTtv_+ngaa;!q3h_mET4tY%oztNA$-<01U(DL$>WOhl#yhjSq0#M|zyc<9k zFI@^8fM#o}E`dyi;?XM3>5^R50+QjqN;<5g40`=CTA|3y4*F@P0!WY>lyW`;JlE3) zLmX>>OSD#%)o%i2TwX{3#i2qc6RKbc7S7IsGJ~W{-~|#51-+F%kqjE(MP5?ghs7ui zEviTr26)LSm(>QDcmY6Kr50gSI0oqmC8pI77`6?71c4Fm$pfLh55r6@)a1ggSO97kjgM6C5mbP(~0sSySWh>XDb zC64z&VMf}`S4#$1_H-!(uit82A@+&OiIP)>25CQvDOIS~8;)yHTa+B&UpH3O7M-4^L_YEa&dwhQf-nH)N5($wi?nDW0kJ0-t1|46uBoWI2{(G@1;JN5ddm zfU6K4p>ZR$-t9)zK<5EEf?*k*D#EiGp2*ReG)5C{*6XzxW>)7IjXDa?po|2OgPAcR zg0=WWiS{udVw;m~FJrNXVo8$#Xo(k`JYN~<0$Uj`@nRY8hfF3Yy@d0zd_a6IT%o0a zDIjn)fXx+nFSM9ql3T?*!{SQLD! zG~6fu>6?g1ZpQF-WeViO${YcoJUoItB^Q4V$fFx|(n94pgX15x6s0#*Z656F3w(L6 z9NRq($M0}$IV2=h9j3~yOQAf;Z2< zHaGMp+V$OdO6{);hI{uzS#_P+dmZ~8xSGy?-7L-|wqA?ZV%ewi<3gJ*y}avcV7qPl z;O$Km5mos24c9oc=el!j#C7_SKTZp?1#73q$S8iBi4h6*l}0G~U|LM(P-_yZLzc#Lk5N(c7QehuZ9Msg0LIs^G%8II}%Zzoqf=%(v@)`0T6v z%;=Ib%}8C3XZ^;va_Q~~(RdaeYcFj}-B28kdBR^$+lJjqF<+ePZ6=DM1Jm}# zWMQ}_+Pt%?(0aGi`qQ+nd362!Mf`fb^3d_pqrFtiG3fO>{Z2*Q6!Y8M75C%@+t52R z&D@?VwcS-IeFGi$8;{OcOiq5I8rHT>8MD^DZ_3*HcG8(wkL^x|x5mzP-5NaJtDAr3 Zg5rt6jymm{Bkkdzqs3fEoiy&M{|ETx0U7`R literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/electricmagictools/textures/items/electrichoegrowth_alt32x.png b/src/main/resources/assets/electricmagictools/textures/items/electrichoegrowth_alt32x.png new file mode 100644 index 0000000000000000000000000000000000000000..6eca21b765354a6eb902a2d5e11eac8101c6fc4b GIT binary patch literal 2061 zcmbVNX;c&E8je80QUXXpDS{otCTNyPf>}(YK*A9! zdO;erVr}KzqR=X>v?{14peO}#Ne&7^L5jFspc*TMLMJNT`@_>8opWZs?R}o-{odtF zc|u$S+1|sRL?V%+B1IBn1T61DTjHz9&woq|Z{gxpJQ0)OT1btOLJ&-f0#OPm4V9n} zl9$zi3P>dDEO}BYo*Em&hcN{Wve?ja6)FNvA_;GL;&Bu8{JKmru+s+jI)> z%mmL6Ql2}N8k+!wVQLfzq6JZ51``B0JQ^6p=7HcUfXM(^bdW)3@~9xlXLI=AYT(5~ zA=K1}j4u&|ztAF9LP|Q0tN3)fR;#6HSu{+YMhAI39-YCYGnrJvf~v_=;!rMCsqvm? z5TP1aEmz@kObJ*RAt{!P3n_%B&#$0R#m2rQR%%`ZiU=7!7gEtd8iTG-Snl=AT7yf_ z|GDu>YfVy~3Z+X>4VJBjiG0Ys=fOnm{$9vpNO;4KSIdc{K$#*8&Q_pGJW3>_5GOQ5 zj_^5B9xPqWT1{m`QYjVUvSm~VX3D5s29LqzvKZVT2%P76C7#O&V}dNPn9F5@pqLdJ zE(+l>!-F_X7RU+(#q-!Gr3QzTFgmX-w`f1divAYM4^yKMj;WI{EOWjJ64Ego)1+f6 zAS?`6ks?D$G<0;rDY~Uj{;zK4w}@i2OkZ{Zv3S`>sFG+NHPI!*@~568 zk_|IT6q1yCvoB>!%qG;mu;p6SwSysZw#JU`jeWI;J98H#x_Ilk5f#n{s%xPohMiM; zxo0Xm4Td$t$9}q7HYshdX1uAm-nNvi7ssw=no!>`cL(PcD>EMcp^fXFn&}F7Sli|% zAo~<{jE(W?{JS5ubUzXfq=W{vDIFb82_BCW4yrxBT->tAD3o1v?r7_1%=zf-#02Aj zUSE8<*J0QCjPv?4WhR4OvBCi-9yZ2{kOH8-6 z-Qgj=Uf*Owh%;@b{l2;C^b-5BA7YDKyNjo5b|u!IEAgmti-KO;u%T#$?;&j`;OV$m zS}{92OEwj@&b4Z{UHL$tv*Dmjf6Lk61n|Qf{0s$yr8jOm)cl-0q%#+_AwS&Er3vf) zQ-1wyYJct4?(xqvSVafwt?54v)K34b^vufnrKsz(*EYo1|mn+rOQTSaN4WU)qPBcCqH>e{Ugu?Lu2MH92Bt`BnxFRz9#v zxo|71DW7B)GYv$!T%8O)=ezHX!T$dKHoy9G|K`9hQlqckvUPn$<*cFaFNbN59^K=^ zW%ZPd=6N}@4}JbQ1+QpS^!w`S$%&KBA6;CC^mbm_>wd4GwY1dF%D#DSpN6LzSot6^`FE%Kv9}D8H=eG{ zcatyw`ZgSYefUT3aV2o5!&+Lb*yd;kC-yCuiG3tsXM3Tzvgwn_k%69etFfDx-sawX zVimJq_A9v|;rBXSVqlA(Rm+jJf2bZYq#b!xU)dU1D?3qFU2o6nU(%=hh1Cvr6Y2M( zsz1H)z%L{`@|`MC!3QG>g^OsfX-Du=Kc+STotxYG{lZKX(88W@HcAy6E=yWd_U?Y@+G*SZ92G zkYn^Z{@xMt_A}q!-CvzLTYg|^WT?JA#`&1{cgvCA4(~t~Y(8N#w==lzRNUa(3v5aC WG@D&@fujp8Kjl3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8K--E^(yW49+@N*=dA3R!B_#z``ugSN z<$C4Ddih1^`i7R4mih)p`bI{&Koz>hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83 zmzLNn0bL65LT-VtFWlg~VrW1CgG|37u|VHY&pf(~1RD?6IsxA(xEJ)Q4 zN-fSWElLK)N18HBGcfG%TLe-Fbd8mNQ6?}_5_4SglS^|`^GZBjY?XjAdMTMHR^~~T z$w_9$X1XScNlChi7A9%BiOEK3x)uhO1{M~^1{S7?hA?xm>31?$S+WEc2>{`&&*57FE7>v#Sp~9E~!PCWvMA{Mftf3;2^fj#A3ZgqM4aV zT5^hRs(Esnu9<;}sjfvznwhRyl7W$lMOw0DTB3;(RDTM&L8lLNls+h(Af+3a5HK-< znDATxKQAr4{QRM6 zc~i?rD;{3_!8qxD+>V_#%O$@4zHRbff{!zF*#U)VEw@5`G$?1yQMK8v`M+!MpSeG5O5nv5j-p<}RD_&GMg_+&<{D#(xADUKr ztrJ%gU_GT-zWl3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8K--E^(yW49+@N*=dA3R!B_#z``ugSN z<$C4Ddih1^`i7R4mih)p`bI{&Koz>hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83 zmzLNn0bL65LT-VtFWlg~VrW1CgG|37u|VHY&pf(~1RD?6IsxA(xEJ)Q4 zN-fSWElLK)N18HBGcfG%TLe-Fbd8mNQ6?}_5_4SglS^|`^GZBjY?XjAdMTMHR^~~T z$w_9$X1XScNlChi7A9%BiOEK3x)uhO1{M~^1{S7?hA?xm>31?$S+WEc2>{`&&*57FE7>v#Sp~9E~!PCWvMA{Mftf3;2^fj#A3ZgqM4aV zT5^hRs(Esnu9<;}sjfvznwhRyl7W$lMOw0DTB3;(RDTM&L8lLNls+h(Af+3a5HK-< znDATxKQAr4{QRM6 zc~i?rD;{3_!8qxD+>V_#%O$@4zHRbff{!zF*#U)VEw@5`G$?1yQMK8v`M+!MpSeG5O5nv5j-p<}RD_&GMg_+&<{D#(xADUKr ztrJ%gU_GT-zW%zgO*OqfpQPKPIAcWm?Hc1$-#hsty($|<))&SUD-TT3QUD!3RFoV7^cIuI!pr%Kd@v? zVB9*J(L8KRlJu}g6nPzr1_A+jKqcpdr6@*{B&txNN+lv`ApRnsNCgp}KQY2!1b$jz zd6DIOP?(W&aRs6tmOOnFf|s{i9~1lh!-kY>>r0o}N;9obMsO`5G z@c^{}KUW~oQa#*>5wMiIryB|@O5W%e2&_~TD&NS_1zzA2Ek->o-N+f1(a|`r!QD8G zsDV;}Xi40KP=w2csDRcDv?R^YT1ABCNqB|EXd<*GvjQj87-qr=Go~PvS`|)e3~J1T zMX(m1U!;6Ah}dQ&+rwDXQ?WXO04R|Y>>QUL>4Gc|Cvtud$3q4Kl$6W*7%t#{C0wCL z0ULq976QgBa9(IA#X9y0<_Q(9R4`hAxU?jRsMR=uP!yv^NG%{3H-Wnu6%G&Mng5$Q zRB{Rp_sM_yCUPV-V|e>`3MAq2908v+JVJO%mJQU%WKk-MG2I^gy*^uCG3AZ;HKBF2 zJ2uy*PfMC~^u2OpoWn^qMCVT^YueX*P;u~_rew>X2Pz&`1O?BE=;O`}7aY+qymR%L zighKa(`&!@?&MoO5clG!w$jeeng?1rcWcq>)cW>^$%B{C1B?2aY8}b%BhQa9xjtV_ zZqICY?I&hm=)JS}lM~lg`kZ@n`l~0_pJnBa(4xJq84b3A#*V|=esKrp)@60vyjx}7 zS#-F3UIQ%Kbva+toEKY_aeK_3fuFnk7w_+C_mtUZb&w;TJ=@)%^!LDnzAOA`!|W(1 zt@OvPs5wjcrl}i$%3gKm-BUfiJ-6-$TAYJxTAZAIekCT-A(_qxNn9`kng^fA0woEW=I&p1N=B}01r+QA9clM9J zVTZM<%D9-LV~@R=*6`}-o*55_BY88cD__(PMWDL)$;T zQTJiuf%}tjA|bJ{yp7ot&~1;sRBq91ow0DuNAnuSg%-@LPMAKvO+T%BL)F5}UC&AK zsQr#rps7=-IMaKDzbC8Dg`6>E)*n{4)FoX{o!joYy{&7>xr7lhvP)&T@%-rdb>Tm> M#gu9MW^P`|KR{GVi2wiq literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/electricmagictools/textures/items/featherwings.png b/src/main/resources/assets/electricmagictools/textures/items/featherwings.png new file mode 100644 index 0000000000000000000000000000000000000000..1f977af8e5e0b05d6afb35d15c88294b2e7a7f9c GIT binary patch literal 1822 zcmbVNX;2eq7!Dw(pqLRYD!MF4aUj{mBp8u6sU`rW4$UAE2oztk_#zR( zU^p$-CZ$j*su(dw>e#3q!?x%QG@HSQm}W7cSQbG6Y9d3cmw-K0H6WnHCE#4X3RW4U zM5cB|j*&>riA}=2PMZouSj4md9YLXhMYl+A5?dtTJGo+dZ9j%U;2ng@l7NFo zrKsWnDQP4CKAX?NU=9L=iP#9ACqj@=fCD332!SDvh=m|xUYHmW0Pi1=)@H;t;slxE zy)Jqu0W&GeAci2b*~~U`*`zT8LPR1F1alw`heab;rX_j`wXpQ2fFTJo!h{*M21-ln z0lP$0O=eRPkhXNt1)V{q`XE?udLJk{WRL|lKnNR#bUM3V@6aYHf%w;qkD^UUOAG{* zK$ysEBSz;#6EH-kWA|xAb|7tyc(zeXCk0(3Be859p{JBG2}s|taV;(mQ;RUQfGc3} zP_>$c3V9k9ig7e7AuNK0LM|-iqsWk)kMa3JgeMn9!7xuGKoB`EQUFH@c|u{75LU=! z3c(OpsW(xm9wUZyYiZqs+(^YIxnil2Kq=CgM3Re!svs_tq)1aHX#k{BAb74;kCSH8 z6nlmS9hMPB?Uw|uFp@gpU5LfnkEj=-0s&8h;VdEy)35|EkIxd~8Uah7hB-W;1`}ye z9{8S*|KHF-v{8_~PX1FjLq~Km+Ls@?fZlxQBSKF%kCE;Y`FihQy7{C^S!9x>sViAR z`b3YGa4UA%jOtgL^BkE|N~yZ2QBg^IV~SUd{9(rSpnm7P%af*;s(k$mzwwqUrBWv* zGr@a|V`xDJHqoWymy_XD-0&UY8%lZXM)}>-1<5_yhxfxfN^-mJ&G8>L;o%KoJKq_m zhoO^E_)2;;!IhpfYu3gNWLb|Da{*>G^H@4vdw~%u}TXTrmZTTfSfJ z=-~X-Xo?g4b#`z6vquNscv98*8DlntE!=sw(xv)@8{XP}(b>~QTH3X7t1q*x{8+Dl zP@B6$PSLVFx6-UE=05k>KG!qt=}#SlRPH~@li6p+`n2CW(m&vLG?b7tZ3|&nlcAJScK#LqVF&p-du@a6}$M|0A=Tk7J{Cbr6h zx-S;nR_S{89L7AIn|C?vX`01oynEbJ;eXKjwNl{N=hU$Db-vqVkE9ge>QiH{ZkaZ1 z?LpU?a}_V#o$I7QZ39kqg~LjE9|g)0ZoPHFwu{ZywUOegb%7x-@`8N#j>l&={H7@O zl$UfN*HXs$O?UG0lNPQ1`LF`Ju|K`pt6&VbyiC>Q`Q6)qwCbkXezM^)0#ux#PQAU5>N!cW?(&iTcE&*} zDlu`EE2Cw?ohdAAy%*O#VZ;Vz>ZX^y74nGw=g}JL^(3z~;2-y=B=A>sH>H?2b8?>$ z>u$yjn7>UwbYM-V&kncQ88@BsIhDVjUr@9lO}#4@w?2Px;X+%1au>BSo6Js$IV54D>t6D25zzSIl`}jV#gwSysT-= bb#P&n?ykP%x~&1U|FM+vSlOYd^kx45@WQ&N literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/electricmagictools/textures/items/featherwings_flat.png b/src/main/resources/assets/electricmagictools/textures/items/featherwings_flat.png new file mode 100644 index 0000000000000000000000000000000000000000..e1be79a558ef065809ee963949b84cb0fca59f98 GIT binary patch literal 1768 zcmbVNX;2eq7*3?1qUca50wP_bRv1V&n~NkvkR#!!Bw#=Rq3R~tNQ7j=W`TeN5ifA4 zbPA}2N=LC!l`0+_9!01Z3WG>7f;Wd1D@rKPs-Sd(VEe=IM|WrUJN9{=_x;{uHYZFH zXk+bUO(KzOf`f!oVg$_33@hTTOG_Ij21i^Jg@>a`JO#!OlCJ`lAwaMi-hfCESdp4| z4e=t8ED}`_QFxR%gfBD5|-O(JG_0!8o^;euTIeD_<8|lLYGg>&D$Uan1JB% z0?Iq5qQqfVNm^2jI075(-52Q0d27^iKwWiP(MIkQqpL!wkty3M!uBNB@1tD4KZd|KibbGk!c-N6#i2N=i$k@5zdzs_ zsnRIW6rGznL+=hOL@-q{q6olHH82rkzUl+!xiE*rQpy!n#8a-Ma_B5Jm8(#4s2mxc z!Qv|AJSEJcO!5`~H*_H36lkuK|J2RY7Ez4m>H97q7VrBA(Gbmp5nVzzNXv-kvk4aZ zM(FSKuU?^95NKENqNHT5XyqP{d7LaCa+a&fX4)r}r($6L0X&#K~anwB1UYF9XiD-bkXmXTwk;?%99 zb3W~p*Iz8Z(e6q*RcaA(#3IfI*ER!?O*u{2Fd;WV?_eu3TE0Ta|raSx=4ab!u;oJn@8ZMlT0R!Gt|eRA9Anb z8!{trZ1(F~!!Ta#ZT63u4WGAOvZPWUcxS&ZuGng5^dS`8ZSdQ(x3MF7bw~%yyO$$Q zzZ5B3VjQX{ey+E&Ug5O8t{JN=Gqse)A0xG?%XP8Fk?|1A*O$8_3Eia~Y0(N(LVe0^ z-2v|{WH4N^C$;*SO@5NL$*KC@))=tS2Xc1bi4~q}2>5)k&>_cim4eAEA+K<>tXb$I zY`a!%8d!Jy#LJ=SV?!C+UyaSRZ||#Kc)hKAY;4*{)BHxqa@)h>nQIGLtG@q{<&tSE zvi@nuB4)e(+b2N&*$UH0&DHdA=cBI$nADIyFsnD;@$em=t1ek92m9GUk^Nfv1ZzU*C_3{ibkJ&6(Ph&cB2R^136V`rj<0x6Y{I z^?*GQFK*kBOT4 z50)E|WtTLhHk=G*Yzkg)y93NfuFHJ(*+$x8H;=n9HleQPb`86a4;pGlBhOD%r>WE8 cWoRau6dRql@ab;1SLT0Dut*|2=C?lUA3->`-T(jq literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/electricmagictools/textures/items/glue.png b/src/main/resources/assets/electricmagictools/textures/items/glue.png new file mode 100644 index 0000000000000000000000000000000000000000..c6d7a2879d5097d804e315564c12328c59d1dbcf GIT binary patch literal 326 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL9r6oh?3y^w370~qEv>0#LT=By}Z;C1rt33 z>la@$fhu--x;Tbd_-~zXkhfJqz-8slDvO&;>{1V$Y>FDQ{`}8u%W26-dZZ#8cC(V( zVvEk{?0W8q>!s7ve^+n?WZd4icWc?2n(FuL7Z^4;#$?;h3A&Zs!<@pUpfNSbis3%f zn-b23GxxrVFdvYUeyzojc3pzu+dr{s#dT~PPR9G%oH@SdFK|!lax!}8&Tu&*^AMM2 z$4krL^mXDt{=Wzo*!F*ETyO$|hxUJqecwX8_l7m6FwW{Kbvk)X|LGn6_#byqx!-8M Q1oQ-hr>mdKI;Vst04vjZ!2kdN literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/electricmagictools/textures/items/glueball.png b/src/main/resources/assets/electricmagictools/textures/items/glueball.png new file mode 100644 index 0000000000000000000000000000000000000000..c6d7a2879d5097d804e315564c12328c59d1dbcf GIT binary patch literal 326 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL9r6oh?3y^w370~qEv>0#LT=By}Z;C1rt33 z>la@$fhu--x;Tbd_-~zXkhfJqz-8slDvO&;>{1V$Y>FDQ{`}8u%W26-dZZ#8cC(V( zVvEk{?0W8q>!s7ve^+n?WZd4icWc?2n(FuL7Z^4;#$?;h3A&Zs!<@pUpfNSbis3%f zn-b23GxxrVFdvYUeyzojc3pzu+dr{s#dT~PPR9G%oH@SdFK|!lax!}8&Tu&*^AMM2 z$4krL^mXDt{=Wzo*!F*ETyO$|hxUJqecwX8_l7m6FwW{Kbvk)X|LGn6_#byqx!-8M Q1oQ-hr>mdKI;Vst04vjZ!2kdN literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/electricmagictools/textures/items/hammer/electricthorhammer.png b/src/main/resources/assets/electricmagictools/textures/items/hammer/electricthorhammer.png index d2040cf2cba50d9fdf41c6af3adf2159bf48bba1..0d68dbe42a0f6d52a3c138e306d8adfbfdc07e93 100644 GIT binary patch literal 4233 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 B=gI&8 diff --git a/src/main/resources/assets/electricmagictools/textures/items/hammer/electricthorhammer.png.mcmeta b/src/main/resources/assets/electricmagictools/textures/items/hammer/electricthorhammer.png.mcmeta index d3db93d..0645f48 100644 --- a/src/main/resources/assets/electricmagictools/textures/items/hammer/electricthorhammer.png.mcmeta +++ b/src/main/resources/assets/electricmagictools/textures/items/hammer/electricthorhammer.png.mcmeta @@ -1,5 +1,5 @@ { "animation": { - "frametime": 30 + "frametime": 2 } } diff --git a/src/main/resources/assets/electricmagictools/textures/items/hammer/electricthorhammer_alt.png b/src/main/resources/assets/electricmagictools/textures/items/hammer/electricthorhammer_alt.png new file mode 100644 index 0000000000000000000000000000000000000000..5cd62e5540f80a0b7370f6268003042273b99d50 GIT binary patch literal 2724 zcmaJ?dpKKnACIO)c{QrGUbabuR;!VFL?R*xr7Kmm!Z4AX5SEMNAg&d?dX>5LYHO?2 zwWjJeomQok$}}pyplVghdQqK7QByN-bZz(k@%BB>bI$Mbd_JG=?ejb*+uv`qnaNrc z2n1s06qb#`5FV>X$X3CmReD^T8yJ6o9z##8Cj!N63i=0ssy#Ilcp+ zLm*IVK@b~c`);Li#X<~c5rdHnC3-dlLU)x*INUe@L`DJ80+9Kn_wa{6-|B$z4!yb!qzj;x!h9dAkaG2d&5pe+@mJ3QRfDs6IG&e__r-Q92$PlEe6jRR5qIpR2Ttfu4l$C)UH&_PEYpJaUg52({Q<6^leL1!w(mKFg1Jz>jUcIT~)y zcRXHITw2J&M@d*KiEp4RV*SJB+XgIt+)B&Db*KJJ*N`<`%bi}dJp#0dw5FL8sRM)B z6O(iEUC&Nz$~kz@a$Gv5oZVdNf7|b?BVlw*run>&7hWg_Ru)b`qLbO|)#ckKP0{_A_LE4Khf`9L3w~HA_K2;EuoH^KT)w)DXyT;4 zZ!~laJJsG%IyY!N{kmPzQX^XdznNGRYc%Se)VZPEFx%XtmzSNp1c5+I4Nv5h85$bO zdu_b(_t`lN_g{NCYx#ybW>?mta<#3GxaJkArjOCjFfrO$3W-cEuwtYg{RzD!ozpuS zcK1vpZrGVd^L|$Ub5X>l2j0%k&OTrMp!7Z7HlF(YcB$yxL?)U>yP`63EXmCfgodvD zJB**uD%E-2o@bAUO6H40#0c7hd^Do` zvYWFyI?wu6iO%SL%!^|hZ?#(O^KIuXn_Hqj@6hcElMd`I)Nqz%t#yc1l)sJE?vJ9w ze`TWOwWO?WS7atQy@Yq;kScC;N+8`vkUBTx|M%L53f8l z{pU314V?n>l&bzQHV^*r`8V;C2CJSyYj(sGb5yXK6`I2K&)bxu9;fU{MOAC$>~d#D zb)L?^bOicUA82#N;Bh^eSLu0hTS~^>I=78s({UP@GCRCgr(m_i zmaIl>z+etLA%3Z1+R|%fLf0qIF-=`v(N6CY_*6ISIkT_YVEHWb&L^L!VD@Ve2VOT% z_v~_SOskk5cMSPAJM~-3zmc z3D+hDl{q?tns(Fh%;f9MgL(0}lcpx+O=Fda^T(Iw*dYO9;xWItWb-pEV@Y?Zb?0^$ zw>@bNJX8=??~u)C4zXIHNMh|6?m$f_0&{R*M%-yIJXH8;0XTK9I;_vofiTkG=E^*s z);x&V5zjMdZ*0hD-rTyDaoA5PwWAYrrgPU{DjY7@BNy#NyD+M|=q62!rS*@Ji~n=rQ4Z#u*3P~a={{#9qKqQmmzck_3y6Q@A-{Kg#< zl}{?jcDE^+St8H2=@n^TI{}Xu&LrWR%&$6X?8r3?+wa57f1X|{4(Vm%&U6Cu*E^?j zgLlXG|3oh7zQ2ly{<<9&iw(E1Ei$`24V~PQzY;_tZb!XNn=n3bKqH%IuD38Rxa3$} zR$EKRgBxQSGcq4He>L(eqwtCq;(4U*l*f>&>Dn)_m%Z=?5~AT8wX6i*Fv}dg56zfM z$#~%MXXW{bKQc$Orfrqq>kRHMC?kg=T_~HzUDF~xkbHG=Ygj&9qVfCb;e-?VL>_PB z*63$M`xcm0{Rs3@+|g~$+8IM-sLGD^bDB6SKJme{X1J#y^0IMB zo7VKEVSa)5mVD;nl^?dC$ecTP^j{kUZ7r4c7lzB*bhg{*ad-<8C7a@}d30*|n$yoj z_OBGbC#F|uU2v&9joI}F54S}qzu4EWQ+(_7IDBG#?_c+7hM=17B%QFfTiV?nT_t9X zV(mcBh5qmvSnr;x*Xb=+(U$_U;0Lb{7qMN<59N_Zso4d75%2?6G3f%j1~xu1mz8^m z9qjMaqf1|~r>xs~Jgs>?U6DGUx!C7s*CqdgxXS`oXKy&D R|4Bk1KAwK8i|&zG{{gRVm)rmV literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/electricmagictools/textures/items/hammer/hammerStages/electric01.png b/src/main/resources/assets/electricmagictools/textures/items/hammer/hammerStages/electric01.png new file mode 100644 index 0000000000000000000000000000000000000000..e46b48ac3ad74169b5d12b72dcdd718f204bbc3d GIT binary patch literal 1608 zcmbVMX;2eq7>-sQhXRU&U=(m&K*VOVIW`HKCSndEsSTxpk+e>g&F+U;A=xEaAZY6a zb{fHA)xm0&)``J`7Her$bgb2>6)f5+#S0O2v^aGtD%DnGN;gPse>nc=&g_2I`#jJ4 zy~p~pv*tvEO%4+X1QF&;qm>`W2j8({`0v!dL4qHIT!xLyVG6i1!VLsEim?O8>?9Te zD^17O2oMIwqBlbF39xV`P(!DG}76J~kgGIDU3-=yA3PUud zh4T~^iG?))2c5aZ4RV%b<&sMZNt}YyXF(dTnkR4qj)1(*B9}+))xtx(YJMKvMqy~k zge%m-Po1(^vLOTG29QFmKuC#93aN0hRDt1AsR)uuq;ga$L1j21m8vn7TB?MGADCBj zQw3_P(KM{Zue7j(<5)F{mX(!>%j9Cly$F@!IF3qWs7!|N7Ko?Z#Svb_3-c#pil)>ghAFWE zj6@VbCP7pq6-JZEC{y7QOfQ#8Gq5zB(txW}I-@~u z%FsznA*|Wu;RqKALfSO1J&a9zAy#d01A=4RxeQYjs)B3>!!aHQ!$JlFG$W68QB0X9 zHJG8N7d8SnT?#0Zn{h%zAy(7Rk*Dx9g%SfeLdi)SQBar!Autt*0Hp$`08rX7MH)Pe zr~Yr~P~IstSSSCfo6r_tjKS%%F5nl>`UtrA=5g~~qED{F1%i=Ivr(7py}WV5JDD4Z z=#$HPXPpY1u5K<^heV*i*4NtRMvaWBnvwWp4c4C>tEXbG-n3ZrN5xF+GMd5R8H{Yc zbw_}nAM?@fxv8Tga;nTpHz$)zI~Q0dZRu#%^bDNo8%*yhAN6MRi6%)#*mGx3?$7;g)mt+}V6)(wbfhyeDBD)*_Z71E_^;y6!Y@FPwSeN zcPH#FZMc|8-v|q@Pb$`pZu+v7f|W%p`uk1Qro=6`9iraF_XY-5c4{kDNV<=U-ktXC znhA(eu`Q#a<13A}X7l;Z%GGn&#FJy1uU$EQJcd)pf4J7~==|*ipKqFf*T`*QX9^=f zi_9Z#?@7E{93d16`;Zn&Ha#VUE-dsbzFG78kxdTfVD*JNU~lK?%99m8_4t#UYP(kc zeQn+N(Oq3#t2!1(c)1Pf%VLi#i?0)43dQQ~-X2}Q@Q2d#>z_P`zJLF|)ndCHpTuNN z)UK?WDQZj6$G84<@#Br->Kf-YoONJZtG-A&G+lV?I$QZ&pw@rmGMk>Vzwy|ihKy6- z(L%r9U$L`%-k$V@$6N>G8jUD5Qpg@`gSX5R-}08m)hq~S2dmZ}T=C0=6Kf}=Vc7RA zEn~%-su~*`e@5bFz7nh2`?l$pQakR|Cv^C(yGx&#CdK#9_9YZ4r&Kh@21Yd9yAl&w zTU+(kzNqNUdF_9+nfof&zkeq$P+wP867d}WCRdF`yu5GHhR3Cl% zQH|#D{>o2|5>1!dy7ku|K5munYHpvE*;CdLH?VhmcIvI%D^q~)#^Ck*feHBnpY7p+ TuVX781pn>kj4WfLK7Z9ehN5Cb literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/electricmagictools/textures/items/hammer/hammerStages/electric02.png b/src/main/resources/assets/electricmagictools/textures/items/hammer/hammerStages/electric02.png new file mode 100644 index 0000000000000000000000000000000000000000..586b4a26dd626474435fb2d631bfd087b9c8d39f GIT binary patch literal 1616 zcmbVMX;2eq7>=T-6jUgM2_oGFq#h)jO*W@Qgd|8Ri4cNB(ALfF7ZM@6VRs{ec7~&^ zh$o;{6s;G^V68HvQ|+OGs8rjc$V{m^ic-g8wB8k*cBC65wm%$ybZ2+JW1r`J-tRrO zI>R(4Bq%C~$K!<<(sX8SoalST26FFrpA2H$z-RSVHjA>e#TX5E$pmEskimuJ12e#g zlA<#pk;e-ta$2mc)tIivDVGTIVMJb+n`85MiAi2Jh8F-9vVnXjsS!N*{M zW?kyA7Pry}94zZr!*FqNv8Y%oqUd}WQK?k0SOQBVLJlEhN=O#-3P~o`Z$SqboOZfd zCq+U&iB}Ry+(zRo!z42tC@y5M7jwgiNDRANzH<$s8P*K`b>p>Y#!})2 zuo*CvhsL>l*kk=BjCP>2q&S&QB;oFQCuhk z60uOBLTy4!X|oBXKw$?86;9v^vERRuHy3EEH*ME$CGBYlsp`^RfTo{G+gX_)z4zY7)|z9=pjDgsIvCWQtf@242-_9E z`EH(_-wf&ls>*U(-g(|4JN>Mn_kG=yc{eKla+mdQVJ7s)EL+|Z9UK^7hzlFFGhtcp z!=KI3caEO~0Ms`$eEMu)^o{WFx&zDRm|gLNdEBhk!RICgjf)T+{cxVVVRdInsL^Q5 zTr#F>_YC=^-%RM+P|>#94aSih7u~-(=3>P915sLrk?z;Wq-?6I%p2W$CwcqhH8H_A z16t-*Pm)Cx=8V|7b!$em#hPVZp&Pfd>({`kMC-uw!vo646$=Px_Sf^7}fhpwuf(0Mg7e@Fd~5Bg)HR`(gM>(d`JcO2{S zoOhso{DYPWwC8zvP~iEqYj-s54n5f2-M8?_q8%Btn=O5h_bh3&GHpi|?pHplKAUw& zHEqSgnP#l_@|4aMsSW3QdaAxO&s>sEmftEla)m^Swj`J6r+@=;4hvK{J^|5)@CP7 z`qW`t{7M5mILb$U1_ zmo6|y=u0 zkZW*zIm%6gplv5_dzhfZ`a|%rLpZD#&s$9OHE`9!RHy-d*f;+ZdlWHjtqg z7uEyTnGbBKEaQTPLQFbeVcw=v5^@}<5L*JRLI@i!MJQZBBS2071psm@PAK7FzU}{p z4&|Lf19kGBx(ROa#Tb~r>;iuAvX6k9ZyuKKlAawmX9)x&90q-|*?)bT=>x~5>~}Ot zc{xkIY1w9Oi9B-hSx-Dx2}WjrK@?7QiAs-M-;|9z5)VNU53qD1&q zOp#MKum+hRYXAI1^fh~3v$eJwy;D+OFzt_yYSZ|7!_wd5EamYNH}3B7B;!fR12<=i z-^ar)6u0z9W}o!=wsam&DQ>({X08)99uRb&5Jt?K;n3Kd50{qL9^&`vE?>{1rfj^ia^b&V-A_H8I?%2VFIe+!oqp~@cmb8bLL$-~1zN@XXQXmw3>w26P*WfP*{MHRA LnffEzm23Y2vR78* literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/electricmagictools/textures/items/hammer/hammerStages/electric04.png b/src/main/resources/assets/electricmagictools/textures/items/hammer/hammerStages/electric04.png new file mode 100644 index 0000000000000000000000000000000000000000..916b4a1dec5034ca29fa34438e87279e081ce4d5 GIT binary patch literal 1646 zcmbVNX;2eq7>-sEQ4j}3s7Tk4dW39tH{>AEsN^ykD-NK7RjgJ9OIvZYf&+L=opN-ffG3t#I*v!HNExeigFySk@ke)N_q*QbdEW0m zW($%MRt5&VAHd;o0u6eNksX75ufHGr{ovU!$`0X-*20*mRK|_cI490VS#iMNK+|v| zj@rCiuHj2LocFd6W(#A9U#-9>hYO74^M4P1b* zDY@$;@o>CTjoS%*HjSII6UR#O70t{Eb&Qznxb()B9wp_EJ6U8T!=`-as&|oA{dE*5Ev54K?G5VWeP+Jj6Pge zjkcvKj2hjj7Q0e%?F{2oK#<$*7P@1E6rBbka=9FWMUY4YvKFArOERbjBwbNs3>w^p z(S(yBC=&27qE;%CQF2*N-(11rjE^5DCS9X}VnYUbP$z^4VaVa|-D||!#TfB_-FU0D z%j|XHkP&xLnKZ`cBQ0(e4!^gA1fIUjD%Q0yhYw7kCjNpxE!>_U~*7m6T=`XmSG?+mEbZQms-V= zSnep^_J2bMu}(q0I{8oCjBT;S=$npr0lOIQBb;QLhi1EEz81N~;Y=(sXyVMCo_)p* z`VurO=i)qD*^>39-qzFlsm$?@e$=(E`KE1Ap+1iX27X;Dym0MEllJzcOcNuTT9`jE z(GGN@A<_qemUEWQwrlhzb8Zl(^j7+*{@Txqcu7tptL%t*&g&yK-7woigv>!55}8`uyK+p7n3YoIhn| z=Ap0J?M~gM9WM*7*LL~Ue^`IUH0|Mu8Se7rKQ1Gx`w{&;aV99NvFOJ6xk=YKEk!vM zTcfggd$2?UqPpvc#Dq+mF!U+_`Lk0USejLuG>C?TElw&4s*Rk$E1*mF?s=TpdXJf2 zTtE48WLr?(yu{<%7RYLEkt+|TMr_Pa;r9+?R~i=&b$3*$?tt#l=FokDg3cR;6&H_& zcV{dA&RL!i%^!L_aNYEDXc@OL=TlYXy-#{pJ$#_1E;_>Jzlf_bqkQY(rW@OTu-^`@=xsiE zwr{)Tbf?`<7nM99KgSUF1qozl)kR0dz`&LE;+*N>gF!2*fBF;+vj{@#ZSMRWZ9^7*FfAk`WUrpbiwJ5R&db}CPE;oBex>t!1eNzc zFKF*zO4fx%MlSGry=EX7m=$p8ccwV`8FzhmG(qeP&_)-x5#C+Z851AB=3SwO=4$RX z)pdP-thwoc@cGa&S6}W9JwNomy==OfS`2GL}ZGxsom9qUG DM5S#V literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/electricmagictools/textures/items/hammer/taintedthorhammer.png b/src/main/resources/assets/electricmagictools/textures/items/hammer/taintedthorhammer.png index dc62117c08db88fe9bcf68a3963c31537711750f..e8dcf9e1df2d9babe266388609a1a51c9c6e43eb 100644 GIT binary patch literal 9466 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 G$o~O^K&@T? literal 1332 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 Q|Ml-rML`o%DrXk(UxclMuK)l5 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/electricmagictools/textures/items/hammer/thorhammer.png b/src/main/resources/assets/electricmagictools/textures/items/hammer/thorhammer.png index 612210814130d3771e0ff6a06160d7f1a7b23cfd..83fdf5d1d3a9fde87adfb5eb8f2cbbbb660dba6a 100644 GIT binary patch literal 1604 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 Be0Tr= diff --git a/src/main/resources/assets/electricmagictools/textures/items/ironomnitool_16X.png b/src/main/resources/assets/electricmagictools/textures/items/ironomnitool_16X.png new file mode 100644 index 0000000000000000000000000000000000000000..a4d2a37cd1325a10cb4d036323dabd21d6a75d23 GIT binary patch literal 1382 zcmbVMZ%EvB7*4U?{Bw@lRg0Cf7%4b3m*jG}Yl7FC^>iMqR`i(n!8vouFK6amk|y!) zlsT;y?OI`_2xY8HP&Q`Asvm}w>bMrlHd!fbUp7{XT`R0DGFvvXCC8`a>z|~2{6o>(xg_E(Uq%lb^vZ2eEb88zz z;0=i0?L{`73N<#vwXzCe%0ZzV?j&Fj?I0)@O%PSE6DLTFz%eI{5(MM&FoYZ4dJxl^ z$_q@3zkbV>x$+`ix~?!7mPjNV3DO~}5saW|8pEBK(}|i0RO^*=Hi=4Fc}BqxG)@&2 zU6du*Qe?w&kM2cGPd7t|DUFTW!jiU?C^KbPl2tImfn%|l71st@(_6s5ZtRHGg1rjB zT7V|^sGNBpLV1R4=I+IYETHKPb6ge8OJSpand^xGNe}qFh=6H$gc)6j?{RNrI>&4^sqH=dZ7!$r_wI>LN4T zfTZcH#DR=$(X_qAb-s|x)T)5hWi=?v(M%OIcgeb}b;$}`TMJjTi4rd-wAZW~+6>qa zR51?tdR30W8!2YQ9n1qa2>?ftD9Z{s$_Xw4wY*13GiHGXJmGdz$QGafzp2Aar!cEd z{!=%ZEwdP{>2?>Gi|sxFlG!|}*(D$LJY9vLU1tOSnqcymaN00@S%(I*Czj_Et9Mrx z78Z<|cT$29j|&x*mE5T}2iphpQ~hhjV^dR8#^}h%dMf$ko>A(Na6KMhADw2A>%>o=;xjQ%Kw&mvL-m^b=^eB98 zd_0}v7x&`E&5uZXG#a(%7gr6A?&`pjijl&-00yXP=z>_?d6`c3+K6ytQh-)7D!ucXa?NJ%%63n>8Y{7dm<6 z?aFHkyzKpX=JJG(EV{Tio&V?Vrv3O(n*FTm`M}iDOC#fV-m`c2`v~=`tXB5rcX#I= z|7&z9`$C5kUs%6&xS!vn-)s=$wj3NH XzIc3K{;hpe)}Jp>*W|x^v~%bm#{Tj- literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/electricmagictools/textures/items/lightningsummoner.png b/src/main/resources/assets/electricmagictools/textures/items/lightningsummoner.png index edb389298094419c532eca46842a634710489300..081ec56cb414ac49c582e0c6be029e8dfba68460 100644 GIT binary patch literal 1519 zcmbVMc~I0=7~iU`7UU>0Q?;$epdDzNo1u!ILjilGG(jMl1*MCVW_r3T1 zzTbCdbyj9dP{7mxjYbocmdaS+8tQu|JO{tie;;DuGDS(UDf1;k@vt(`#PgCJAZboE zA6Nm)mlmG{u^P?TVn?=3u~{-`PI78lpN>{_x*%GkiH%cTELR8=#18Tuq8YvWT?>jh zcr%(~u;?tVL{Q*JEtA3gvdnC*tdOI4G;S^utJ2Vb6DTaAI*UX%t(wtcyENSUj&T$j zR#6Jg=!jD`OBRwS$pA5E4H&1>6Nrh@5(bhYh}nooTJ?(9+* zz^%Y7mB<{dhY;Zh!`wZc$fpRsq36jCSQNI1k+>2k5S28>jKUi&@8D^UB#op%a+m?= zb(o1F?HC(lw`0-3Bmfh|@tjHLxAP=CV@x0kk}xJwq@Ey>qA7!kNFvFkWSvo$z?h7F zY?|m+SdjyMZU^KZ#TuT9r4wbqDw3QnNk#rH$SRN&$z341ki@88rSQ_46Ls92 z!duB3(gmtGcE&;T_^aEDVb#C(^>$8NcmGuD2Z8G8(t!0VnyM=9pC32&(v)xC%k7_?p}y8SqI4iT z?#RH}u6rrBnNW}$v$bzw+4kB8n|2q6%^)wLf2&_Dxv+6hUGw3hx~<
FFhfuW`;Xn5yg#qGwqW^*o*&z+?3m8CUu{`@?sAcyCfeohg@<9{u>ORhTmU&ZLsMrOv!X8J08l2I|i? zaZ}C8&-$0K9l;B{dAa>};BQ>RLvHcQ7>vtqwcXzhNQPi1%U%tv4$p htA>uPYk79EMw8keyz)lOBi}DLEh&@vJR$GHe*o@zJC*5jgR3=A9lx&I`x0{NT;9+AZi419+{nDKc2 ziWH!rREcXuNpOBzNqJ&XDnmeGW?qS&pKFLhnX#U!o}r=pXD4%@sv1uh#}EtuyM4EL z8w@yHUo*YCy4EVo+|k?X!KVv9ULWUd{GA~!7@Ea1tMnSmA(COxhX znvXt=|Ngr$SS&>UReoCh?@ZT)T&weJc0Syh5GYo|wLY@D;{2C@4`O+1xNoa35;bUv onvu1^cv^)IW1Gu|My4$BeK)yFR|rVS0Ug5N>FVdQ&MBb@01~5G<^TWy diff --git a/src/main/resources/assets/electricmagictools/textures/items/lightningsummoner_alt.png b/src/main/resources/assets/electricmagictools/textures/items/lightningsummoner_alt.png new file mode 100644 index 0000000000000000000000000000000000000000..c1d2567dff1391db6a1cdbf572562666fd213399 GIT binary patch literal 1522 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+mc-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc$WX!DQqR!T z#M01EN5ROz&{*HlK;Otx*U-?)#N5izOaTg%fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD#PU%0_}#n6BP2AO_EVu8M)o`HUDF34YC)x{-2sR(CaRb3oXS&*t9 zlvIz)d8xk0B7bd)|Qogk$fm=G{Af|&4J z0OY{)QEDDA^ArJd$(^-TP7Dl8;+`&!Ar-gwO!m$Y4istoKT~B!$}OK;3DLJ$KK_lk z64fRBGHylo+9rjL9hatd>n-VWI>_$fDj3W0%4=nZ_Qs~5&bbMli+mLyH5++mB`x#2 ze8yz`Oc{SMPOk|{i^TQjRKK&m|M&dP=Ugr=`y~(AGs@UsbN~G<&nfZQ=1(igO8FG-!5c8YJWozV>+W+) z-;{exmsHJuwAsAl6t~N?bNe{0%&mOvkDK%uFOJrjzVpz*^%{ot-OckRefp#o=(?J9 zLhQMTxihEyE9vx`cjID1N2zMG`MZ|$`)BLQ9(?D^(Von)R+>S^Xw_9Mm+Ac8-NF-? zWnbLix_4sZ=DZVi!W&e+E%}(F)#qTnQ2oYn>rjz1+YP4QU#PsH{krEAo|Tdd)Kc|U za$GjJAopR>_Hqdp_VAr7#`4bIt7l(bVv(+X{aPN|8veB(8rPqwiEq2}s)bj6&7*Xk zmx&cNOnZVF;#>Hm;uk!c?zp* literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/electricmagictools/textures/items/nanobootstravel.png b/src/main/resources/assets/electricmagictools/textures/items/nanobootstravel.png index 202d2cf70b381b6bee369ce7157480dde4f293f5..fb59c8d619874ca89ea6393acfdf2e079c9f292d 100644 GIT binary patch literal 1552 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+m=!ZaB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc$WX!DQqR!T z#M01EN5ROz&{*HlK;Otx*U-?)#N5izOaTg%fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;NpiyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr7KMf<|~|UP^v> zu_jo#udkJ7UU5lcUUI6Zi>(sS0KLr26f09BOA}{HBNJB(GXq0IS7S>{V>4H0b7wUI2$*<4On9mVa^UGcH4m8Bi-4(mM(LqQ1_q{9PZ!6K zid%DneY1rFMQkVkoR^|DH|>&%np^NfCvnY%+)FRGhP(b|jwy*Pc&z_n`;J0I4n3{d zPVVwaL0{NIR(MKlEt@nWWztMPwVnIECna&mRwgFgt9^c_`rS@rp>?fmv{Y1={G8cg z(3doEf@$6K8PARj_qbo)W5lez%j@KtZi_ulNiXK~E_lstqn_o-%o%yC2_15$xC zrjuMek6w83FHJP@yt_>AgYCEWFwfa@JoKQhuJdLem%0O@ju%5DUQT(?$s|+rb1mQd zgRzVOzOvj$pJpCcaB`X`_~)H-xz3Drx+3DMvVBfIx&LR+t?S3qtD>S8Iek?$Jb9#J z$!)QZyYEEJyi;AdtHYl)ZQ&N5JJWZv7fN{k&Yw3ShiPxO_mUFsEHBsN?+#aI}v=JNgeYZr4}^tq$Vp$(JItY*C8 z$x|=j>pO>)**iTwJ!AWAjS!<58zg^fRqm6P;(~`B-YiA6fy1KfC?WY8ZV|zYS*c|(OcKV65%{Ok{a#|Y1c=!_U%}qMN8zYwV z-@h-&%=Pn(&Be2YG7BF$e_ngyqu>t@8RfsW9LpDLI4!=|ut?*^y?e)g{)Wtv zS6AHn_J;)>MLTt7ZCYeuXP36WVO?^5KL6LM*aKHJV(qAnKc{m{48hA-1hu`uRRkF YgPDj*+SiTu=7P#-Pgg&ebxsLQ0Cq@KL;wH) delta 3226 zcmV;L3}y3>44xT~B!3BTNLh0L01FcU01FcV0GgZ_000V4X+uL$P-t&-Z*ypGa3D!T zLm+T+Z)Rz1WdHzp+MQEpR8#2|J@?-9LQ9B%luK_?6$l_wLW_VDktQl32@pz%A)(n7 zQNa;KMFbnjpojyGj)066Q7jCK3fKqaA)=0hqlk*i`{8?|Yk$_f_vX$1wbwr9tn;0- z&j-K=43f59&ghTmgWD0l;*TI7}*0BAb^tj|`8MF3bZ02F3R#5n-i zEdVe{S7t~6u(trf&JYW-00;~KFj0twDF6g}0AR=?BX|IWnE(_<@>e|ZE3OddDgXd@ znX){&BsoQaTL>+22Uk}v9w^R97b_GtVFF>AKrX_0nSU8Ffiw@`^UMGMppg|3;Dhu1 zc+L*4&dxTDwhmt{>c0m6B4T3W{^ifBa6kY6;dFk{{wy!E8h|?nfNlPwCGG@hUJIag z_lst-4?wj5py}FI^KkfnJUm6Akh$5}<>chpO2k52Vaiv1{%68pz*qfj`F=e7_x0eu z;v|7GU4MZ`1o+^>%=Ap99M6&ogks$0k4OBs3;+Bb(;~!4V!2o<6ys46agIcqjPo+3 zB8fthDa9qy|77CdEc*jK-!%ZRYCZvbku9iQV*~a}ClFY4z~c7+0P?$U!PF=S1Au6Q z;m>#f??3%Vpd|o+W=WE9003S@Bra6Svp>fO0Dk~Ppn)o|K^yeJ7%adB9Ki+L!3+Fg zHiSYX#KJ-lLJDMn9CBbOtb#%)hRv`YDqt_vKpix|QD}yfa1JiQRk#j4a1Z)n2%fLC6RbVIkUx0b+_+BaR3cnT7Zv!AJxWizFb)h!jyGOOZ85F;a?DAXP{m@;!0_ zIe&*-M!JzZ$N(~e{D!NlT@zqLtGcXcuVrX|L#Xx)I%#9!{6gSJKPrN9dR61N3(c z4Tcqi$B1Vr8Jidf7-t!G7_XR2rWw%BIv?Wdily+ylO`+*KY$4Vz$Cr4+G&IO(4Q`uA9rwXSQO+7mGt}d!;r5mBU zM0dY#r|y`ZzFvTyOmC;&dA;ZQ9DOhSRQ+xGr}ak+SO&8UBnI0I&KNw!HF0k|9WTe* z@liuv!$3o&VU=N*;e?U7(SJOn)kcj*4~%KXT;n9;ZN_cJqb3F>Atp;r>P_yNQcbz0 zDW*G2J50yT%*~?B)|oY%Ju%lZ=bPu7*PGwBU|M)uEVih&xMfMQu79>|wtZn|Vi#w( z#jeBdlf9FDx_yoPJqHbk*$%56S{;6Kv~mM9!g3B(KJ}#RZ#@)!h;8Eq#KMS9gFl*neeosSBfoHYnBQIkwkyowPu(zdm zs`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMeBmZRodjHV?r+_5^X9J0W zL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0?0=B0A@}E)&XLY(4uw#D z=+@8&Vdi0r!+s1Wg@=V#hChyQh*%oYF_$%W(cD9G-$eREmPFp0XE9GXuPsV7Dn6<% zYCPIEx-_~!#x7=A%+*+(SV?S4962s3t~PFLzTf=q^M~S{;tS(@7nm=|U2u7!&cgJC zrxvL$5-d8FKz~e#PB@hCK@cja7K|nG6L%$!3VFgE!e=5c(KgYD*h5?@9!~N|DouKl z?2)`Rc_hU%r7Y#SgeR$xyi5&D-J3d|7MgY-Z8AMNy)lE5k&tmhsv%92wrA>R=4N)w ztYw9={>5&Kw=W)*2gz%*kgNq+Eef_mrsz~!DAy_nvVUh~S7yJ>iOM;atDY;(?aZ^v z+mJV$@1Ote62cPUlD4IWOIIx&SmwQ~YB{nzae3Pc;}r!fhE@iwJh+OsDs9zItL;~p zu715HdQEGAUct(O!LkCy1<%NCg+}G`0PgpNm-?d@-hMgNe6^V+j6x$b<6@S<$ z+<4_1hktL%znR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX4c}I@?e+FW+b@^R zDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i&_B8C(+grT%{XWUQ z+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?SIDu(gXbmBM!FLxzyDi(mhmCkJc;e zM-ImyzW$x>cP$Mz4ONYt#^NJzM0w=t_X*$k9t}F$c8q(h;Rn+nb{%IOFKR-X@|s4Q zQ=0o*Vq3aT%s$c9>fU<%N829{oHRUHc}nwC$!Xf@g42^{^3RN&m7RTlF8SPG+oHC6 z=YM0)-)awU@466l;nGF_i|0GMJI-A4xODQe+vO8ixL2C5I$v$-bm~0*lhaSfyPUh4 zuDM)mx$b(swR>jw=^LIm&fWCAdGQwi*43UlJ>9+YdT;l|_x0Zv-F|W>{m#p~*>@-I zt-MdXU-UrjLD@syht)q@{@mE_+<$7ocYmPs(cDM(28Dyq{*m>M4?_iynUBkc4TkHU zI6gT!;y-fz>HMcd&t%Ugo)`Y2{>!cx7B7DI)$7;J(U{Spm-3gBzioV_{p!H$8L!*M z!p0uH$#^p{Ui4P`?ZJ24cOCDe-w#jZd?0@)|7iKK^;6KN`;!@ylm7$*nDhK&Gk-1H z0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F}0005WNklj-u4%-ly*TZ%vir)GzGjHDaeSh=4nWsdA|B3u|qH^kxnvz5g)zb6Kfyyb-N7`0B z&m$T}HgB9Z02qx%0GQYSC?%4rZv#wh&_~*eWWrjft1-rkSb+?bk+aBht+ge3o(DiQ zjBv7kOl-KmzoGiQiRXEk*km@-{Xg>c{SCiAJFhPxBH#cHl&(rr`t(k4kbfWuBnSe# z$3e8#QvK1i7#wyU5kP{E0RYFen}Yi(>@11 z8fR^Mzs1w^0U#4nq{jDSJQ@%UdN%j{7Gc=uxLUW)4h|9^wUavI@q*6#4&A%1EkuJJ zMYpgEPUO{r$|-3z+tg}rQ-2rZ#h$b7U6(k1p>|RS5S3Hx3{pP-27pZhMYq6ewIUiu z8No)mTm+#1tB12ag_Fr6n*ZUE)^ zmK!x0(f)}jtZv%rc z#B)}-#N@=BQa14Nxj`8e1q+JVU=>So@U~3I5}-8#A5a-6;HwrCI$(w8d1-AQK1N|^ zUPZ04!V6B7It!s}Q3jAnZ$enifI|eO$4y2G$G1WT49`Gu3^h;)j?+eh#?8>;18de~ z&O^KGIg7S5$qIW_RiaVU@AvEd8G2E!KyiwqP|ScD42Y(ID0PC$1Q0<jb@|A$RZ|S zzz~8mx)FwSyO9h)cmP4M97|vkp5^dn8%B_J((E8fGmbklNRqIT1g;4NBSG1T2sTep zR7PMy#5S+lUc{R2i>0$=z^I~JEQ-~UE-3Vhs;GEH3Chlfo+#l3PV_6A!xdTx*bZdA z7H~PT=!51{O!Lc_=Q2o-2T%lpnyd~+mN z^9PjLa_ltUp1-L)I{-t~OsP#|pRKo(#TIyoDJUJp#X%mUW}j#E?kOzmw=rtm7*~ZGYJpLSM`Zk712Ur+u^s@s3HQDMv%FFuv{7+}}r^ zo_%C$%3uES)Vjo`>EusiXJ=xXY8!TRHRf)B-Fx~*Rz-V$wW__tgG0f)F&B>Ihu&R# zt#v2nm4+-Q*I!9J#5^xQRPyBa_0MMdG0)InQ7czY{Arn-Ie@oJ-T8L>9vR)BE7Pz3 zX@dHB@)M(U0B%cq^|6*i^r&siYp`HRHFXx?kGF>G^$jl#V{hhnpG&;l^<&!gsoDIw b*hh7fuir*aopeLI=YBjEfY#q`Vh+)t{*bSJ& zeT6|^@wpcSh)gZR3R?~-L}e5!d#fhh!Wx>738{ zOwy8v&93X3VSmU1dVk5*t_N+*MCCU~T+Om+mq}iW-bT&!mWzk>C$3trxC`F7pQRe< zRO6=Z;=c8Ph5w9O^~ODU$eRaDI&3&_USK|j#94Ar<}zR)A9;4-JXHZ*vv7;H{xcvF zmm32@u~-ivWTy&~Sgq_}G*mc0)3}(MkdflwN2HlPQY{?7<`Rjy{LT4HGs|8d=XHFj eR?UAImh}b03%lDI;qn3i0000c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc$WX!DQqR!T z#M01EN5ROz&{*HlK;Otx*U-?)#N5izOaTg%fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD#PU%0_}#n6BP2AO_EVu8M)o`HUDF34YC)x{-2sR(CaRb3oXS&*t9 zlv6w5?I1M@^PQwt@i{uFY9P9NwfeNZ|L~DtC`gduS@1@E(M64$Z_94vn5hVHo}22WdM3@dVsG4)EYpwM;&W^} zT$Gk*aJ3y)RB7PpKi>SZr0Zu*-_fLlmCG-4DzZrRw%uU-@wYB0bSn4TvgkkAPZJD0 z_}ZBtf0VeJ7jDpS{`q33g$-A;j`mDCtFtIZ@AHHyi(XqjS)dZBH~mD4(TnfDoib** zy)2p4Uc6JrY&Ng?&bxVYYU&S&#~yzDb>R~^HSdo2g&jPuPJckYJb~Il$ePf?1Z!KY3uq8ZMc=Ju2QY%?A z-&fODA5Ai3VPf17qvxY09HJ#EH{tKciaEaP!d54hv!6_v^yI;{6&EvF4kj?HzIsYO sVHR)q(M^+6<)&AZd;EW&{!9A+gK7WcIm&Tsoj@g}r>mdKI;Vst0CP?VK>z>% literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/electricmagictools/textures/items/nanowings.png b/src/main/resources/assets/electricmagictools/textures/items/nanowings.png new file mode 100644 index 0000000000000000000000000000000000000000..edf8672ae2de083e7a3145c4bb07280e020a06d8 GIT binary patch literal 1821 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 delta 675 zcmV;U0$ly54Z8)9B!2{FK}|sb0I`n?{9y$E000SaNLh0L03N^q03N^r5iYj300007 zbV*G`2i*l51{Dop1stRR000_vMObuGZ)S9NVRB^vP+@6qbS_RsR3LUUE;TMOF-P-4 zHvj+vBuPX;R5(wqQB7~tKoIR8=D>v`a%?B-Z)Z2yscDlKJAY0ZXd2S0A5ir`ivSgR zLZxs8&J}lr9&Z!V56Y2|o@RDu-rJd-mH%pnZNO*|%^Ez{sq37^jr%KG5Yh&WcI^|w zW32B55fhT|iTb{#lB^4M#4@R&U(>}s6NXFQr`MtmV_h57dB#ftiw9jWvX=z`F=m`w zFigfz=(TW%cz;A_fdl9ED4O`=@+-c5@|HsSWi70UT2zayHt_4`<+5g#UELf*+sR9T zw?`aB85odQDjP97$o2fXeU9>-oUM}Jw+MYkQ5t9f&9<^Bm_Uv zrEpEVZCPYt*0nLON)(}qHn%d84z{WS19q{`2MP+;<$rfA;M|d6AWJ+v=1Ynl^x76G z6=6FOxH!rXi^jhNl-t0YX8|r=Tq_q(1NgMXV2e26Xgm9X71@a-0=N*aTSqFLQT#E$UXN$^38et>3kBY5lTw{;>_M0X$eqO;% ztaK) diff --git a/src/main/resources/assets/electricmagictools/textures/items/quantumthaumichelmet.png b/src/main/resources/assets/electricmagictools/textures/items/quantumthaumichelmet.png index b3f31dcc0e2de40c075e8182f6f2782395330575..15122a14ae56a3145e69952db3e8eb26dd52223f 100644 GIT binary patch literal 1406 zcmbVMeM}p57%mgWLIRSAGgfhDH{6_D@1u9^-Hkd6S1gnA(Kf7qpxgECS9;L)y6Ztp zLmc}cf|4y85M@f{oKxfc8eRHgX|A4x!>14 z&-1>&_v2d1N}f(n)23-On)D(Y>rm&+_`7PQIg&wb2P;9H9&zpph^syb+>!_ zbdV^Rbz4b0Y7Z3vpJ)Tb@RH6x{edvh5DN2YzkVqt=j~MilT!mmXO(Q6d;5e)z;Bb9V;i7Obyf&f0f-oIDI%XW6&e%V zqF`9zf;>pr7FFAeT=cG7ra%UqBFQdE@+YdG%qJ;Q*e8Xcf&ys6Rxv0@k?`a33@u!k z1+rKNghE*gK=UDH#AVD22FmLNvH;xHu$G>4%k&PYpCxZ2fJH6CkEY*we5Oi!}K2wgA+4n=bqNe32XWX2P^;GJ~uWrw^ z4g7TE*`3E6Kb~&4t#cpxc5?63&DEb>c|z!Fb?2_^aQ=0*nyfrL)_4a&w^Xf4UST`t zaKB%XIXsSU`)I^JT{qWyW8fj}18G-&A#cpkt6xf)DV@vi>4@Z2ZoIy!vlxB#LdN+s z{o1$puYch_1wJx1aT#)z&c?dTvD44}_HkEI^(WsET_xh5cvcG=ZOVW2-HPMw!{Zbi z$VhA2t<^qLkyFQH6Wa8jXJhQq^1WYhwu5hueCa)TcE9CL-{DDTW0Gc#HN8Ce{iT}t OAF;?N+Ifw>EFOnj15CpBxIoF61XiQm}*<^SptwLBC z)dbfBRVT8k-G47_CbV( z>p_WS!o~t2y3vv9+&~6w8N2g%~euc0ZBdpKq z0d4gIV%K396ahOc1gC7N4rs0Gsu|EyXQ~e1z~wlKY5hJf<~0*1+~o-6{J5x5zfNvG u-zM<~!u*Lm8~nz?j$V(pewhCKrsxqi43z^9NCuj+TI7(Rt^T-9h?GV2LVC|&}-l03iNukg*!mw zaNY)62xf>w7{iZENf4NsQwecI*uscGj30prLzlU1#0`@f#f2E`0f+uU_J?oMz8`&_ z=l6SmA8pCa$%qJ#4OgjD5!OtTO_?M8PiTnp-t+q^txV6z<{~*yaL6871gcb4umi}- z(-pu5Xtus)5+tcqK{Z@{kzACWMKJ=eru`VTmv<{{l`1L4>!z71AVYRg!MTj^ZzH2H z#IZ)WP@j!uyVHS_%WM!qUPDek(@@2bES!=IC3z`DfCn-SdHHIWM0t(ynl7cR{l_Q_ ztwH1}BfRcZQFbnrE{FiqtMv$jX>iCus&T!J#PNfW2E(-|j-eV7!Es7wpzuU!W59|v zk#$fulV!t}vNOU?S$0z>>hXBg9<5psD^Q#yNfgtd8V#Z#5UJiJ(_X|S#Rn8jKw?DB zEpvhk@+;DIp;k7+il^&W;N98To5C(>BT!1nP%rI9aW#hWy#HQnXi2t#f8E#;E#=p{ z0cr!1P%AP@J{<7@vJ$&T8}b7cZ>Yl}rzC~0HVI5E4_vaM6XAG!e7 z>XKyI#ejfqPO-hgH9V3_rHg=;1ul9=`atdxJJssLt$hla-BklKRX#K(_ zAaZqpwTJ=_t%aE4wlL3X35Nra1_alW1VU~P zI<);#TITkb_B8u^CogokAHRI*a0l$`NJ$OmAMCc%w^C*uRu+jWyJyL&Xz%auYo4C` zB09b$jQgmrysQ2!DP4IO438y$Fn;b+!_m)oH(#@}9~VK^sBqt76Q?Ji-(hZ=zLTy# z6TL9=gb-_b|A;2GwQuHEta~a>8ZNn8H*$A*CFZFUai7iI|7KC%x9il{TTOHK6WS-Q zwiNX5eK~`S41ME=%G>9P2NDi3Kf4L%Ovtfqd!xesEFD_jKf2h|_uS<nq7N;b?4YNb3Y+ zD?2`R6Klj`&WpoYi*lEFejzov_rq)UFW=OkoN~1Lv@uUMo8VAiTBNyVq~JhDRC3(6 et1EAp2FIvQ<9~OpMD(HlU!>KXV;W2=f9)SdbN+b% literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/electricmagictools/textures/items/quantumwings.png b/src/main/resources/assets/electricmagictools/textures/items/quantumwings.png new file mode 100644 index 0000000000000000000000000000000000000000..4e40402246586ca5943575133718dddbc5634aa7 GIT binary patch literal 1826 zcmbVNX;2eq7!HcaFrxw;P=eAmXb~aVY>rJfB|u0bL`aMfC4xnk%_0$!jmc^PqBd3p ztte`hig$@nWf~|RBLx+$);c2+s|CEK-c*o*dKDQ;yFsx1;rOHb&F**X`@GM4&bLvm zil5*^_o2~f6BG%uWNHT7ueTTVwG7QR$(6f=4o&oThLPRvN< zE7?ku6wlEo6qxap0+j|U$i)yHBPJS%vWX}K2Ao6zn<39=5!u9yVZ9=1?LGz>z_19J zD`vbkN~=@@Qo@V_d={UHu{jVRKv)o;hd@vyz+ppN5MqNIgb6_+ozGjd4MBmzOJ)ylGRS%i5h2q6dpvN<4!!=xmbmV6_L+L%U5=%@x6Zo$lY z6R9VRfLkM)MXVsj49e2CE*MNoUket%8|2SL?Vl^NRYU= zIa0ZV567`bu?nMwM2#3e%B`okN3enqVntFjj*^5~LlAkRRiMrxNWzjsm;k91n3bwG z>IkbP+?}Df4$E+}ekHD(Vh;_0xV3X%{*#-#^E*E~tgmQtXde|F zmK~%<^RhM%3r3QfW7^Dg3V6@saeqC3UO!OU{KfP6C%Ihi zoA2}2t_2$wtDH{f*Y>WiuBKAe%lUhUhK3%5xFl54YaQ30GK#yqb3+raOq}-0{~oe) zt|BU=Ts`YTWOJ3PTK#$Hl#&IqgZ1^vbUNK}^ysGEOP4PBe|fQgacXLOXItCCppcMV zH*YTLx;EAo+V}c3+@3jhS|QL(3-s(Lv1{d?{u|f-eqzDu)vF7CyK_gkX!GVN7rMH; z9}f;L-nDC&c1%;P)0te{8JFHaW~|mXGt?_9fIt1rm{-Sd<`s??(j)1m^*{cxxv{-_ zXDkpK+&ZsZmJ;Kr?yS^tf}F~vq`ELQ{f@-PjofhU#vORAXiIff6|d&k*$*E+G@DGo zxlHw5RhY-^+qV~WUcIUcnmYASd234x}7-;@v^U)*09?OYWV^2#CM z!Elv&iDzU)1V%qsV6~Qe^vz_ICq@_TdvLk1%x?GSs`Co&I6wXjPFX=nvMsQmRy{8T+@S6zAsVCc-f6XlU5IX36&6nR{%?q?8@L z;j3QUoqkALl5WKDq9tquIr8*~W5NcXx#J}Ig95KBFJB(t@ST2Z(~eA5&QN6Rfcoso zlW@bSQ?Z#{gwZHmfBt^mv!0&ISFcX2t*i`nipw063hf?|*O%HSRs{wI@^s(S)FkfP zzyC?QYj4MkDY2!crRJ3@KiQTb^9iO$cXxN^W$&vSNS}(ouGSoQ(a~7}Z7Q{|KUYbJ zuNQB7`cT{I6CeIV2tU60)~z(JwL-tYnI4{!lv_P3{hPm%7RQA3ADgQlm>J(qahdD>0Y**8E&u=k literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/electricmagictools/textures/items/rockbreakerdrill_16X.png b/src/main/resources/assets/electricmagictools/textures/items/rockbreakerdrill_16X.png new file mode 100644 index 0000000000000000000000000000000000000000..ef13b772b29ea4f835addbd94def091d72267f8d GIT binary patch literal 1497 zcmbVMdr%a096uEa&LKe@6ARo~9ETeB_I7WNb9e5*>lOs;0FN`shHxLh<2KmcV{hRO z&~d~E;v+R?Qj*3>L!8MnY(|Y3kP>vv4D&H!sg*F4Ov04U@zEY~)*p_4v@^TE*Z1@J ze1G4^Hst3njM2~1>vX!9>@3=)jj^FODpLE-{_7E=4GC&Sky;>o)BvLZot>9i0A-6z zDR2RXudX-&tUBGK3c+2Z7CB#|I9W6>Asa(b^l50F&YB+dF-8xZSWW`rOiXzC=896 zsAV?zu~S9Pe8?dy05TiQ2xr7G$U+)0GeKh5JP0>pCKNNGIEi2wMOY{-6&inFO-waPODYpYB!6<4fd+m~5qzp3 zOHhcBVdYBI25X)^zJlm;I-d|r{_#L*Awz?V55){dR1`z^8ngDRF7U4#Pqp^Dt9<}< z0l!?Sa9Tb*$ziY-yJri93^i}4JVnrw!j#i8S1AHX&8BUzc4FWKp5h21mGBT8Vg|So zv5*9dF!Na!F#(GQSV)fNEXFX;)9@K4hlQ|XbOxDuVF8CDB#HAl;7quMv%uqc{{My!)to{@ zb@HFO32$k|7@9um0&Vf6kAS2#kD_(S^?P+^b-D=;vuV3K*uSUoXj!~{dQWH5&*HS4 zM&kU8jrHrjBT#FHx3#>_wN)I6jkQK@9EE;8k=|8n8+bj2p1QaoYrWIj>W#1ad+?Ng zRYXkAg7+okd(PDAKc9Ec6I^{qhTG)Jw;v4F9^ABkBz;km`@q@+Zm6o=OUxR&S#!1d zx4!OXpLNgiqW(Kw*H*tY+_EV(uX6Y1#Pi2C2d9;k48)bZarBIF;w9U3{Who4(y{u@ z6U5u-h5WBq#2XI1nA=l7+x{b=um2`0a`o0Z(W7OB6-?EPcN%*~?-$2?^t&)O>bYoQ zr;~=`rt2qvxfJnE-F0d8~tGD#^rN=9C{Ev zn3s3vI}B}VX;_{%we!jr*SSNDao3& zB{8M#;-@=uI^KGLSdq}2{>$#ts)O-|-@U~aU+Ot~+PP|H)|?NoQy=%GEc(R7=F~=g zf3HK8Gkb?-9@v^x&(WFZp!-8b+xLA{!JnO0-F`8)7TNYNR-7O;yn^@cDCp@QxKTcO zYE3ck*_(W8SU-Hk+m3Gdc4Wc1$+s5oTD08MKX~QQl%Lu@FQ3$C=ziee^~IfgMl!Q2 zlDwUG^zg}w(Y5u>8zSnv8C%n3oZdeoTwk_oWpQW3Ox@je-2+_(KSYOqw%HlE^k=Uw GtNRC=N-etp literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/electricmagictools/textures/items/rubberball.png b/src/main/resources/assets/electricmagictools/textures/items/rubberball.png new file mode 100644 index 0000000000000000000000000000000000000000..c3135d1438118653866f69d5ec543b1dec9472ce GIT binary patch literal 1313 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 Z003_eB$7L`WJLe~002ovPDHLkV1f#>@GJlT diff --git a/src/main/resources/assets/electricmagictools/textures/items/shieldfocus_alt.png b/src/main/resources/assets/electricmagictools/textures/items/shieldfocus_alt.png new file mode 100644 index 0000000000000000000000000000000000000000..ac3035c498474d05db87c570b6226611ba2b00bc GIT binary patch literal 1538 zcmbVMdrZ`J96u+%a6}zyRFqHt)dWP^Jj<+8$J|?a?dVV?L&k zZ3;`&J&fDbjVWVUoTw3X8jO!+pp2Lel^9=Bj82(4F`zDn^?-Bx!}!OVw7=K)^Z9&# z-$&QyI_Aa2s$*3uRh%uGbSmT6$UAbl@=faQqm&^*wid{FqDKx;606E!L^liAc&e0j zvJ?|4Z(-9^s-fkat3WQW&nIY+*H94~O_28~Xq75$PS8iu%UKz4v!$G12Jas^1_B&o z1{WFZh}~yl%ed^Y#O8$^E;_uN#u;!8X1y%bAWB$kpz$t8;3Xcgp^iL&S~6McZi0;DeD1V#+_-;88v;KC#; zaVuCROA>jYKg0z00(lH)+=$UbLmq?H05OqekNf`Xy5CwFT5CM-@Ljdl8)}z!SQli5HX-##ve(@Kmu-&O)LAlhZz{O2>VT#( zGp}%Hxp8EQ%Q5N%N#VD8dUi}cIQ?#0b<@e;pF9rr_4YOSn~K5p=g4sj6YhAO`T3tN zxm5ILXICpWepl&6$1~E6PIWAvyRxbH^fGYMhnt(B<~_$tnteInRIZ9|txBnFm|fqn zx>(nJU~5lzT2o1ip#s}OxP`CZ9UWIwSGlq? z`DRb=!CAld=6}f~ly2FfH$DyZP2l)Z4?Q_GS+u3?+I?}nXQJ-fq1R6Cs#X`K$G`W? zn?PLrk(zxVZYeh9tNB~1ZrSE~=TB@~>*3LGk>kdra_C-T@AZQHQ*yRVMv^YCJ*dHY zE?0f4;Z>e?IjQqXL&WBai=iaaa z+x2;=o7-z2eG*gm6PBBtIHibta8eojcoCrz0&reAng_CVzEG@jFHIo?pNqad*ymcVNCXn z60*TGI`=TqC_;RpQQRU^ijM*khM8vQ$e5%<24r(?*^C1vybEDM7{urDNNkxbEyL$wSSJu68z^ExSLX3Xp{fHFr;wEzmLbFFN(lhtzajC3f?M@a@;Kx81FtK99Sd^-80T}qmVwoy4W z2@#z-`BYGaW(#EC1puiK70hA;4ym;Wt|GNKz78TVT#4csN@!smr${x0r$Ez>T=FJx zb}FCFn)W5Fbn-G$^iU{TSy_oxDiK~NMRBcGi(&*y5U_-Ry;W|J@xg9yQrH3wysY5x zhz{Njg)A~QeygaHOOZ~c;PRNwGlt#XX`v*^P#@z#aRftMu25c+Xs?(L{taVRwAWhY z0cbw(@>>N~x(|C&m@H}cY)2uW6b-dea7dTJl+!%B)dk$5iPp)b6NGbc6ibpRq@848 z6(BHJttD+Rqp{gwB~aUeTFY{*8VlQ*ji0F}vLwj}qei2~aidaiz*Ks*(x_J&XiXMD zhq)%VS7h8Q2>W(OzNfkPGr5#O0F1~BR-P{pSAnIB7kO_P?|}>kD0#EP&GD7qmqRx+ zl`sti$2P!a3A_uMl$dhN;$Ef1G^CxyVU3n!V6}}*fo&WCV9w5vN)<@K7*0xkiqHLD z=};*sG*l=5shjYYRE(kNOczLtnLYw;sd)scOBxT&J13Jpchf{?T7BQ&EWn*bc}xEO zwO|X`+PW+vMnPZ6jU2aLNjy;N|7fgmoo3A)i)V3S{oHv?1v`pjGn03Ibz#l^^EpII z{h}hv$Jf(nD}B9r={xFK&8OBj!9=-St3ZwxeR zG*yv?^AT+HXGc!Qyxl(<+;nWu;pE!S75BZlGJ4>+jXKr(I?rdwXI%x5~(RN9s zuGXYycl?;$R@8JPM-kC{n~_oeZ@i3KE=iJCl3uwbaF&z@VV S4Wg?Q@oWu?|q=Co8N3<{@O&I3@7fO*~!j^F3hciBqYSVw&?vi;dw%Mx#Z^QK002R_g#*!Y8a=)Bso;% zx45}si+ei>vc|5pu_mO4WJv>VUatvRJ|JlRi?VA?YnDI&Bc-gBco^|iCfZiZ`eaX1 zVY6-t1`J%EGT{3wf^8cJLEzNOKbUL6l<{907*qoM6N<$f|5zRZ2$lO diff --git a/src/main/resources/assets/electricmagictools/textures/items/solarrevealinghelmet_alt.png b/src/main/resources/assets/electricmagictools/textures/items/solarrevealinghelmet_alt.png new file mode 100644 index 0000000000000000000000000000000000000000..33d97acea30c1d95985df2d8a86b41d7727f8408 GIT binary patch literal 1573 zcmbVMdr;GM9PeOm4uu;6H{^W8qE1}XG;P{6T`Mas6_l1*I_cz?rg=aPnv^7!0#2uJ z_`t_>u<7aMe1IF9jycgO^Wb#n97Bep^TBlIJcW6lZimjpsVoKR_J`*m%U$w&eLkP> zIw~njCX+>HW>{U)_;TnS{etwJ+&_p*!+0^>Bj#|lSc>zM%uI4#3dr=~ z1(b`z$+D6kD5FdkS;DwIqQ{6jWX9B>A18_^5%5w43~Q3#X=#-M z3~7?*YV9h!-$E5K8Ra~cQ|@pRWF zzz{?%GRcRX^4Oh#h2tqetJH#oN(}=jri8T!2Ez(Kt%5ZWtb)`S2*U;hHNZMxXrKD

%tdv0T zj9+9p76>WgUM?V-Er#Pwb;sG(4rLNS6QP*qsxX?(pk4Ypxsb-G@U!f?7qkEWUR7_34u6tSXa zILyst1rcWnDr}pPY>#l^XL1b|p29_rcXM2ExC)$woX81LAG}C{!o^shjYYRE(kNlP-`JPx^>rrRL$KE@|wtYh<#BIhj_oJ9ugL`}Pd?y!h{z zarBjn&MHm)@%XH?Rqx@+Yifb2vkms28?qbo&E)6sg65`m&a)@-ukYWTZv`!*tL4>X zVo##0dS}Y13;LP;vu<4O6uK0bPA$J*c6;F0!ABoeXzSzeSqpn-FI>2N(0OEE+&Wuq zNnO_TX75)S#!0Vk|LHY*cf^(~y2aK%u{hzuq4qZW+D}fj4b1=8*m-(U)k~v{j_p2N zeQn-^mKr>7+)n;9^#gs>AqqU6lusf`r*Z~>vNV1%omd@ z4y<1v)7-s0YUS~!Gt~=Tv75fzXRGpppxdk~i)w8*MQ{T*-8S!r2*63oj zCok`KAb);)+~$Vg^T@-+alcG%t9#g}iv6(ze7!cATHNzulVWa9b)Pyj|BM@JN>F+4o(^0%e@?k;Yg^5+@{N|vdUuH!Yphz^;h>j~hFd4m^K%&ypDP z2T^ab8_q>NyjmIgM@f?H?UPF{8OH2Fk?W(|KQO>mBU@1x<7? zao~*GaELBsL#FdNC5qsT3X-WzoS0=(oH89VgCIB`%q*zv3e@cn;~%@^?)Un9KHtah z`@Qm|)^{VrW`+R(5NS>`+JrGG@P>v6-#L$labbw#QyqLd>*5P>F9qmH)=7b82G6E! z6iyc9wNY9Cn2<-?9lXP`SVORk1P@>&eufj+0H96sb2yPh@t~8+rad~*{ZnT}AWiB- z8FC9^;S7|UPAm3O>BUw%QJh1lNm0@}pw_Pu1Q?3PK|ho0@oD@z(TJ`_m&Lpj;w{2tzA3zQ z^8cm|7My|ub@HFO32q6+7?{530%7r@k0_7OJYJzoP9{fQ27vLT*{HYsZ+w+*aYyT8 zp1YKtWTj&NiQlIgm`S$s^255gp46WDiZ93Mit3%KwD!c^S>6sqU+wIPP``e={kT1* zR{UF{f6`A;Tg2{_L(yx^wi}k5g88Sq2ey|j=z2I=rtMny>rmGdS11wDP|X~P-fB9$ zrL(`lubo|eyZ!!?N@x9td-u*GrE#Xvsh_ry4P}mqg7Cw2H-CKH{AN#igYzCf(`qiW zAl$>nz?{mEita|xY>Q1hT5;|UQg>`thjp;7Zc)i)$(>t$TFoyd?#JKW&TC84{yll& zrRGlkzJo();uz<;IAlfD`-9;1s&cxqCG&`A$Wlt2ot||yd8evl#-H&|)UUmFswAbh z*|vXsvt0by!hQAyj*PC>JDek?ey=-fO6b1o2bT2cN@>;4;+P#JA^o6z+1zDQ6ZiNr zbbRKu`qK?`$R)>$)#s1(Hm?3M;nzL`4b*|z5^ZV4bS>v{YGe7d9v*7$+w!qhnv;yb7Qa9 z3^pZIC11Fz$YqAlKRp+A^YnD&i}sdzC%JXx8#Vo#i)8UNRv)maeNRi|#q}YT z^>OFgI^Tg!2b1ELT&WxAvmQFMwgY3bw{FLBqTJC9dcg}jWXxp=klK2Pf z%dW8b{S~uYYu5mgSyL2>SZz&lYxtq31JM^g$#k6WZp--K-t$e*yB@XgYMb^wGGqCM zyY)w_OT`tTn@imEUxuiOXFLn@Beq#TUQoJnaq`yXvgSGCLV&xGu`365UFiw@(#@$> K<2Na5O8x;YoLr{> literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/electricmagictools/textures/items/solarrevealinghelmet_alt3.png b/src/main/resources/assets/electricmagictools/textures/items/solarrevealinghelmet_alt3.png new file mode 100644 index 0000000000000000000000000000000000000000..a81cf04ec1627ac2401fdb39b830e84e1680c7fc GIT binary patch literal 1523 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 W^gk`Px#1ZP1_K>z@;j|==^ z1poj532;bRa{vGi!vFvd!vV){sAK>D02*{fSaefwW^{L9a%BKeVQFr3E>1;MAa*k@ zH7+qRNAp5A000B_Nkl8Sq^)fox`o z?^)taTO4L{!F9=OjGTFn$feB%pEzwYKR=&&=81U29l3Ac+RTg+>LEAsoO#0&xhtzA zXo{zOJv{(zk|**8wa&-|rU6s1R;xwez3J%@6D(XNa(@?WaUOG+n3|emj*YzGIddOu zaREL<5OcrYMG4|eQs!!qvD+$@eRe{a10mO0U=S@mEMc#j!i0fs% zj)Zyb!E#j{l8GZtb6sIzV{CxP#lQ&}z!>HPvVZQ&YOMB`C~`9Kky;SrdRg{)yC54w z9Q;n{$7el0w5GchtKLeiK9l%|2MICGi-4>f?}Ka(@iU7443|&e`lI#AKzx}ZUyMmK zR-Y(p5aW8A0g7e-5D_*&Jbq3l9;KN`#3}kN8R$_Tbc$aU+5nq4rSk_5=~?emy78!W zDSz7i#VV&BXCG8tV48pkQ$J?%83raIE^wMKI8kvEV#21LzQI3^j=Dpv5cPluV`Rz%U7)GxI>mm68)NTrC%I<&^yvq_AFtPjX}$EmnPr^WdN zcEa_6Soabbk&8Iq9l>z*0g2XxD{}qTEPrj7`hc9ZZNiS+66gO7)E3VG&e(=2E}I$R zA?pLUVA)?PBWIo?a%pox9y1%XNy+-aXl4QP6`cploVmX~kkAAPn&N4nC#^FNR3FeC zf+>iBcC{luz0}wz%6G6v;mG*V2b0?q?n_O^A5u`hf4k`5-31>scSj$_O^b1_A2>x}zbFpU;GB3~?|(eZXzP z2iY9rf$9UgQvf1zQy&l$@^`#&eIV+ diff --git a/src/main/resources/assets/electricmagictools/textures/items/taintedfeather.png b/src/main/resources/assets/electricmagictools/textures/items/taintedfeather.png new file mode 100644 index 0000000000000000000000000000000000000000..e199a94f27e2aeeb8386b2884cccd9f45464d652 GIT binary patch literal 1430 zcmbVMe^3-<7~WD6NDUjvP>5x_kORO0=I{pQw|nd^-hrk} zqb3RsS(24A{ZTd%p=FLTb0I>a1`IPnHW8yVq9HoM7|m!V*dB1yAB=yrGrQlf_j#W8 zdw*=TBYXX#=w;Cm1TC^<5qvLG#KuSH7HY-$*ioS4D?xQ~|F~K|@gLx`2;nN`MTzK@rEBk+EPa0&}bx z$FrmgZ7_P<$6N=-c)+sb85W>@7_L%dUT^4LQ`VB~1pm4*r?up&@Bz#T zB%xenlzezrguzPe9xW6yRJ0(FQs|lMEen~j`zOn4x-ufe_V)#uzJ5L6`nJmoT6TA4eAA7n- zFD$S1fb7LvT7GZ&aBSkr_SQi|jr30I;iz4@kJ6;{7*f9=V-q*g0IaznTlaoOI}tzPqQpt*@_|$XoK@%=WAM zo_{)OD6UxUEGRLjoL&=nuWMd)OZ$l2KKw=+e4^(@&6W*)IdPHjs>Zq`%I``WLHGQ1 zotvMdkH2G~mUkNUWZT`-?&fB5d*7|ZB^{Qcf_;S%&))g;a@O~ag|syOs$W-#n26D literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/electricmagictools/textures/items/thaumiumWing.png b/src/main/resources/assets/electricmagictools/textures/items/thaumiumWing.png new file mode 100644 index 0000000000000000000000000000000000000000..f4c128fb40740044f1af54879529537341226f76 GIT binary patch literal 1433 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+mc-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc$WX!DQqR!T z#M01EN5ROz&{*HlK;Otx*U-?)#N5izOaTg%fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD#PU%0_}#n6BP2AO_EVu8M)o`HUDF34YC)x{-2sR(CaRb3oXS&*t9 zlvc z0LX#oqtrZL<|zW^62CgmO$-c-`#fD7Ln>|^3Eu6+>?mTpdGd6_N6|Vi!5IsuatSug z4QraK&^6ay;YB#dzs69mTo-A1`v=_4HH`~04oIl%TkL5zd&kYYAK$6jncs-0Xm6B# zcW&qNIo0i)iXWy=_;9>nPyLqP%uS7AkGDvg#Qyzp(q{HSRdZn{_YLVh3#YDp&#-LD z$&Zl*d{?ggDv;gZeEDt5q)>&7!p`K%WIq9k?3@fe?Z&hEXC8ccBk{0+<)e$pcJsm) zQH+t6$r~jkXKl+WWskDg-#h!p!}psf9lRH~>X}1Sor)Qs#SZRGlT-?YR;`}3U~)_I zWYalr=8=}dH^Wi{z3iI1Z^+r?$#2>zo-vCn^t7VtedmRnqfXrPOoNi5VTS@(cHuH~qclwyl0sSGXzrT)h)FRo>0lTdB>uYMz^Sv3MDucx&%L ze}UEdPx@~^U3$vu(|XD7rH*n1Co`ufsM#%QdB1kW7A@|?2a1)folCA>-*VvTmm9Y; z%pO1IYq@2xLH5rft~aW+-S5sNh8=U+-M92$sm*es0O6lPOzM`;4siXJxu9{I!DF|^ u)5yXpv97nC9IedxZhc_?-ecyBYz%@t$Mq&H-rNZ)EInQQT-G@yGywqI69jJn literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/electricmagictools/textures/items/thaumiumchainsaw.png b/src/main/resources/assets/electricmagictools/textures/items/thaumiumchainsaw.png index 0de71688999dedde98e8f04b5e21c0c3dc5a3397..6cafc21cbea741ff578056f07c2f606c10d3c51e 100644 GIT binary patch literal 2130 zcmbVNX;c&E8V-vHSSc!3K?Tx?pg?xWG7w2j!XgBar9|LLC&>VjBomTQ0$4y6MTKIu z1#5$f7F)Sm*@RM&^{@yxV3JC3rbHxe?BqEwh#}Qp!=tQD3nnWOy@k9ciM8^_|fD08MQqb=n z3}Q_oiUxu>p6_fSD+VT3rIG`9d}3lEE|H9b6)|`soleISNO%$niy*MdB$*0SV`a)M z%L*JwDO8B%DlsfW>l8r&oS{V|(r-vB*@iCznI@bXn&5$doEjCWMx4ixJ!JxUPT81=tD*RKbc67?vzoL0~Mb zf|aqb9L;8uAk@hCSvTl5TOl$b56$)bWBS?Mze8 z>)`krhi0Dry7BZQ2QN^*9_TObnC{qX9SZ|_?YrU@7G^xA1hT5g#-i+xAGp0pEr{99 z9Bb=%WSAqlQd-)4wQ+^|C2&GuliBW!FAr_p8@PGYdoHSNLIFI;Zqd%!b+1`}M9RPZ zobjjav)`XIE>scoo2>gtnmHRNBF=1%gCnPpzcdlLe`5?TP>XCU>wTkB$0u6TvNqt8 z%%5*%B#dP66t+S~?behbHqaaYZ@)W&HqRW0^@>zh1u-9+9i zp?qgCF=};e)WIv=Z6bKAz?E)5CUTHl19Q+kVh3I=Dxjb_e`&yOh4(D5Ihq{{@D z$k1&c1vAa8BR&CGY&-NJ!^H}EP8<8*1PX95bF}iT`BTYx$*XmnWV3-slbCiII(5T= z^s19fwV5NO9eQZLK*wSEqsse1QdGqePs=^cV}OLK?TRQ{Vv;3K3!5v-jIA3|Z$@X> zCo>DjcV^|(rvJ~g1_d6{C(PQC1Khe5n&xIstPN0Mk;Xlc>-_QU6D?H^w=Y~JpDg_u$owmeVdik>!5pQ#l^DquwEFauf{H7hm)S?nn{Y;bj;(2mlCSK z|2)NBUqv^+oUzu)IX81%A8+NE1T)JBXNTNZQ0000QbVXQnQ*UN;cVTj608n9RZgehA zMN}YmGcGkQF)>H;LN@>a0)9zEK~z{r?UT)J(?Ar3C-y_+0e@JvQnN(LwyQir-T*1| zPfdmR5l}#O9W?}ql)NA+E=frOZ9@xXak=Mu#+^Eb#Hrm49O=mR%xJ!I#D#-Lfv(WXwNUqPZ)S8#UMzXNvYgtpET307*qo JLGMQ$(-b=4sucKgTDX<7)CDKLRxZVrgpm*hZtOYZv zK#H$Jvn?~4%zaqglCjN~80R)2rs!m_VfIBM1X#p5Ocfj(jtF#Dpl%5^yS-(lg-es3PXYj7X>pOwp^T}~cZo{*u9=Kb%8)J>IOQ!OC;KRg1uTr{V!>iJ zRmD13ifO3pVRHZ=zK$<<%FdFFCR%jss3=C~cY72z0OaKPJrrHT%Akv_;svvI{JSnK z$TMbbg`or~@mSevzNk@Rw=|ZP(~UJW$!PO(!5qIy5pc6I1^V5!g4g6XYv*-M$~?La zYr%PlTw~TQIOQxU1FfROf(D%dq7e)Q2~vj|a1upd1u+EG!zcn{B!r?SoG_u;;NqiI ztVs-Ka@g#Pwv?4wTP@2T6Ab%&KAlgm6QwE`B}o!SFc`xi1p#>*1ex+ff;Tg!U}L?s z#Cv336u_t=8V)=H& zs5iv8#e!F+1e%T6<`vtETC- zH?$D2jg|O!SjH}iZg4)uCjK$zxon1`45Sg_h-@4(>Z73}Bn@$T4q<2#rSvXJyU1t$ zZ|Y#hDL7gu|EZhUmQsw->7y=C7LWRf6_nw#5~lDg4CH^8M)*p&uTsN#8X)-Q&4^BQ3bUa9rQFZTRAz zYk@nTHbg>cW=;9oQO(eWo&6JIlP?Decv!zZckW0AHgI_PiIh;X?ps&n;ByIcHJU3} zQSW|i`+52OUvIW8Q*XN0$r;a1W?20vpv=>aA2?55TQS`=IJT-Kb+}2@W@xTNQ%VKZ zF3U32W(yx&-}{9o!&Q4k<@`Kpc6elJwHG{M@;2NT+s5%>doI|gwy8GRD7f=F0JJ*Hy3%aqfZ^~ s*r?ucv~KeJZQCuo{q-~Y4S_h|+1?Ak)lKcXAN|P|7nIt*%CBtx2PRf1zyJUM literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/electricmagictools/textures/items/thaumiumchainsaw_alt.png b/src/main/resources/assets/electricmagictools/textures/items/thaumiumchainsaw_alt.png new file mode 100644 index 0000000000000000000000000000000000000000..be9069550cc1dcecc7fe239802a200d39fc32fdf GIT binary patch literal 2200 zcmbVOX;2es8V(Rp7{TQf9l#hIKp;maBqT8$fpA0(0wU*-rIR!eAnA|}B%ICyE6Sk5 zcmU%ps8BdEQ;5YNatNZV2XaX%0)mJr&LE76ir|8<4T`%ztf{T-s_yT4p65Nj_pR!K z{(e6CdYkkx7>qv8mm7$VxaD`P4*Eq>Q{SM&Mx|G%at|D>RDlWz!x6(m2*;CxF;E}` zic=EXAvOl1l_&`cRfh6+u|%+x2rgrYYN;G$V=!ztwHy@1LrRc zWgzq)H$IC-f>PuVDG);7B!vjQk7(;vGMc+TH?#~yy%Tob?N>~vD!wIWZ;2#Ss zVI&ro<2*fab|Dg(7*-+MmT%}oz+6ZnNruGU3RsF;Nij?E8T0>J=pXpv|2K6c)G5+( zo%~nbtZt#jxIF#T1?b{aA3-v-c@$`uOoDL{7!0{M$ChXa3eq-sUNs9v% zdSf48qhoous}Lx>wzl^rN59uGt423qwrnHE&5mKYH4^{=%D#`qV+)$G7B%|5Hq;g> z)v2v(3n76>zRMc8f2dhZs((8o=s{#~|4`Dm6ZH3^gMPBK?yh(5PZquY$DT8GdW#*= za~IwFObL1~j$R-9I`x$Du`bk8X**~<*pyUoygkhPaKpB_>kYNx!Qv<4B6~OGy@~4? z3-E-(p}fcNi>Q1)bGCPT%(0^6s+jMpQ%v0!gTE`;{)$stxK;N^$kj!yK6R_D!?s!R zd1m|H4tv|u#Vuvnwl!;X018_(tWaxYaCUyJ6r&HfI;2Z>c1f6H9*XstA46J7nZ z=e6h3jYfu3!hhJS;pyjWRVNKOQSuNws`Xw=({FbYfWLjqdhPq{l^B>#o0@toO$+33RW?M^7)j zeIKJA8b4T8+Yp{Jp4PGB<-(bZSVt2X?`G@Z+j7U`_7e5DsqjSY+Z*e z4b0-+_47BMf4AHA7yZ?IIwP2fZt z{66|~We}ryAJKmYf*{l52k-o@aBpoFDw+!A*stcA5B{Lp!tTyOisA>KCB?UGsFll` z9vJ-CWz(`lKvGo%bT$mjfI2b9Y|(tmq|lf>AXIGsW2PpL&E0C-rw<+WANhewUd-_%;>nkpb=!oUa!#Hz%`u#WV+c^_8Qtf(zerW zedM0qITBEB(~ui@hm-AcszYJK0c`6#uefF*lN%crL`YP;U|`JKsd_BP=xpszo2lUU zfa&FAT1`gUrdYzghtBpG_|p8q8>_YV_iKa^ybRPg=EjB<>o*hxpSwzvhacxjx+dG$ zR;`IM^0sGj#;K{Pp%X1BiP?S(B#D48%EPbn{U>S3r5O|?^{b7 zzcdVce$@6@*sac^MozEmc@4$=9e*!adbhN$`dDL|Z}!ggUeh&i&9?$F7UKGAczG!aP^UxnL%9aDt}GQg01e@YfKQI1B|DmRsk;KKso}p~nK+2)4*>GTtV_)mq~; zz8iji=kn=Y;;IWamxinjPjzVQGc^gVA!7`}RrYiF2(DJbG-SD2vdjLm0B2h6?prjA Y!b}%u3T>Z8to$tSy!^Q5JfgDx4WQhAy#N3J literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/electricmagictools/textures/items/thaumiumdrill.png b/src/main/resources/assets/electricmagictools/textures/items/thaumiumdrill.png index 3225484478b79629e1d6bb728e8c11b26b34a95f..3abc5d87308bf8e41ce7c14387e032f41a02e26f 100644 GIT binary patch literal 2193 zcmbVOdpJ~iAD@VIt;H&N(KHEJb7#!VYsebbZ4hJ3y2O|{GMI~V4u+ycn@i0`8>vXq zYM0gORY5Gi$)mKdw`9eua&yisZ?97GzBoS}|4+Kz-0!cW4b`$aT0=@uGkQmzm z*r8C$u|hT%=CVBLe2EChTgBjHA}PW~q3j%FQXW4VfYIT=UZI$QnW=BYpoIbkCcuV8 zU`d^TNTF*I2>2y=vH3~Se3}5`V2`$w(GdX=0Q1l?QH&U(%NUrqx^!f|x{b%6-$LMM z2IiepT$T^oNdf|B8=MW6PaqM|wlo~k#+pVXTA@hiG)QESSV2p^JG{tw0%v1 z2|#>MD20U*F?v;z7cPl|85qRVcOi(REY=5MG4wuBNXqaso)k~S5%40>YFuy85bO*5 z$BmDoA$Fn^!21G_Bo5>w_Ytvujf~{(?+vX25pU?;pb)tfUJO&hj}rl6*p11+ASXD1 zP(Zg0r}4unWD3@r7aoq~QLQ7eJU%G`OC`_I6FF1sV+oksx6a9 zbS6_N%@{D}GgE%bMM!T*~&JmM67 zwNC!4Zq~MtVqBem=mKQ%p^pGD(mWv2CHa=wo+#A%Yi>+OwrprTASA{QFi7zlz8arR zJU-~MgUY8ALkHLqS{cP=*$z6&6}JJ(j%58@3DRF+LVpHFU_iz^EWnkGgFA0KPjJCyqvmD8+ht}%Hx(sXJMCWS)clm*4dh9cX#(+pZ{@2clp)!lCiKU z^`1YX^KSE1IMeIiR8>y7mi6hnYOAtKWepABkqp+#PWz+@Lgj1wtg7!*OpnQ8P2=iE zeznHV+!Vb@COw{VFmwLxlh}g!ra!%zA$Oq`!*ou?^3ap`rCpqHo&u-dyNP-w>{`B zuJLpfu~-8Z=cTf*a_?@m+x{D4seOtIo!hKG#d%N!*`HncQO`emtGUWqf@{3V{QUe} z=VTy7WxZAAS5Gtdo3;zUkw-7{bsCn9i;^Gv2iFaK^KH?sV+HD`gvJ3bDd-)K$Crk< z-ty-ImOnjInHajT(d{CZWBRFDdtA4}tm-xK3%=h1uKK`&i5A&$fsv+Lc1+FSQssUt z%{#9THrM$sa_2~aS|%EY$1kRFgWO~{_waBj;TKrTrz06l0wbpbXG1VIqXMHe(dA(@X%?q)3&S8s@xazX*Y^IDk-E>q zq>{R&nNC<+e1(gqX{IDi?DL zE_IB4t2nBAJ}=WMGxfeWi{0j09pKVkm{Z~p&Syu*>RZjC{vo#9bYe8ZQu$7kp-0NC zGuSRoyz}l0gS9@FRQw#MfpSvY>$#%bH|H95iw5XrxE>M9{QJ4R@V~Mf`_sX_spBcwvp$d4s zdJNjv>Uu`AbD(Blz5&etvaWVfP`pOjez3=X855F!dFuG?x6`CG+L36ZAk2FU6VZ(_#{c%0_>cD3=bT%}c6xz{6 z!!gW=k$liZ8FR9pg)yu)!UcKF9WWfT~TbgVet4Bf#nH_>O@UqYgG%T zyM9|$t{TPrQIzSX;2^*C&u$EZIGdA(a)M?|Y*JN|q|TgO#I+0clolKsexsNTRnkJe XsFhD{fycB~e-hlBy_l6>gdO?|3z~)9 delta 822 zcmV-61Ihf65zPjWB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000XR z000XR0j(pwbpQYW2XskIMF-sr1QP=bI9Zf+0000QbVXQnQ*UN;cVTj608n9RZgehA zMN}YmGcGkQF)>H;LN@>a0;x$vK~z{r?UPS$5>XVzAIyi~Gk?^iY+SL>H8F8T!p^w1 zEloj7H4Ifl6{?mt0Tv7!Hf;D-O{GEwv=&>fi|aja-kUyMCig(o{`O-DT_?yyt?4d0w*z&qHG&^yE)7nVABReAn)kOZfGnplgO-78(3n&=-cH-ro^) z_KckgQGYKT9t+_cu4RVM@T+%%zP}Olb(aI=TsT|qceg?`NLw__Sk&LLFNQAv&8D4H$l!a*dj59UV%OQHo<~iR&V>H0zI>0#xKn;6Z`rPNuFn^t_^W+@jBmcsvt7HD98v_o1 zs*j!NtcR(e3ey?GkDs_kT^^cMx;fw@o_>TspZeGL(xDsp22Z{gW@wl`@zgNts?B`T z5E+0yv^hl9y9pQ0(|0&PpV#oh;E)O+LtOCthr9f(clf&TsdaeTlQm0TJ>LC7;aX-0 zKrf`#XQrPKU@35|sUZw66>dt0n6%oy)q*6%Zw*DFiFWqMf&c&j07*qoM6N<$f=9W0 AP5=M^ diff --git a/src/main/resources/assets/electricmagictools/textures/items/thaumiumdrill_16X.png b/src/main/resources/assets/electricmagictools/textures/items/thaumiumdrill_16X.png new file mode 100644 index 0000000000000000000000000000000000000000..1d103b858806ae9cffca26f7ba2c4dff8e7efce6 GIT binary patch literal 1502 zcmbVMeN5D59KH!MMnFDha2P*oQ9(nm*WMQ`oDS|lZg6-zFK`Bs_1gEKfxFgT;R-k> zr~@J_A{v*lI3aTewz)WUZkRzb5`{TIgV|7=V$8;7Fpw;wgDLAF=k|y3k2PuEuix`L zzxVgiMr-bth_K~h3WXxVoMp1fW0e054UxaA|D2=bAx_M2h}$@q=%WOnNMkrBfXr^H z1lRz@RP7u9sR~8VPS)-a9hMxD=G;okZ=;mlyo^>TQa4LHMVA2)a)J`pV}K_w^uiF! z7~p)ZMP=cQpp?z37QnXZTsvJ|MiUIYc@vZ>kurfBh!iBb%ROFFGQjh^q&)X;qcAjY zB9;T+0MaV82(7{~NKYs+t%ks`BnVewY7|qUIDudosnL^|4qA9%SxsPE zq|KDMpe3&iaH%NrB#QccKBZ5sDVTUh~#o(FXo?LxZuzaFqScarE8lA?ap%E>> zRfwL@I1wt@=|t2(?*e*)W@x=C!1E%!QA6MwOqZNN=r9b+P^W8?b!nNnDcxu!)P#`; zV9g${NO@=w&}L=r1+4z1Skfo}O5_AP$CU@Fz*@?QoVS$YA)^sW%x66e=kspxXXx35 zO+a8P0h1|kZfHKlB>Mt+EpR$<6#)>f3wI(~N<$z{K;sBO;0z9EHLj=i@B*IszoA2A zr%->L{HJaLTXHe_r_Z}UUOew3;E|h0kh`R$cIHQgVo{LUlxCN1e$u)%tCd=Dsds4h z(v^$5##Qmw4_}R28Gb!G{Qi+9=r?F&&D6o9gGB~YVrfI={i`RIk=rM%(XSuAQQ45Q zvblk5IGPmMIDxnPky3Q_wr}=fPvjc|x58_blb2^}cHfyC|Lf_oqtVe%OU&oOzE;uU zzY1|3i5<4iH=}}Ybypot=^jj!W}J2A1Y*SE3pvToL6Lor8xz!#Q@g7oZqi?Ds(r93 zY=8gymLDES(|@nYi_OOfUC{Z_#pcTE%R)o;E?rU|9UA;N`u+Ng?bAhR1vTo}LuY>P z85v5ZklOV2Jy~n(M6%g=y5aP|sH6IPQ*$%-I7Q0i!n(Q+eadF7Z=ITb@)0xBGkx;W z@cp)XubrwmXXEPYbB0YDkJJr~8`rm{>Du=Yi-P~jo%i2Fl+~W=WzCy6RrfF9^89mY}Mcs$M`p=9pT-l;+HpnC8Z9Y z6!#q;9dEDsjx6+y%@nFvM8xQ__XYKJ=d`UJx{%az;$czG&oP}#uEjRdPUyJ!xx5+hbha0AOy7C5=cml??L)C4w~wvc z668R}yW$UL1{dzI_HQ`A_b>W9Vfeth9og?)`8bKc`LJNmD~f}~y?1LTH!Sx5am^XI Krc>$f)cpgDGAm;M literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/electricmagictools/textures/items/thaumiumdrill_alt.png b/src/main/resources/assets/electricmagictools/textures/items/thaumiumdrill_alt.png new file mode 100644 index 0000000000000000000000000000000000000000..488af88c7912144daac69b016c53f7d4408cf93d GIT binary patch literal 1986 zcmbVNc~BE~6iz{oaula3N5!&@<*1r$F38aYjM=Ec1{gq~iqcK8ffTYElMP9rqM~xN z+KbSFpr8~vv>;K6MQWgqwOAD@T3b+2tI{GUiX65a-Kg09;dDCPncd&@eeZkk{ob3+ zkBV5~?(&KYi9~Xjtc0S85wN|^j>K1&k@1iid~k6B9)l@y1FS_zLIoy60Erq-Mxqf| zVcO7+@JS^54XW4#JVE*vPmZanunj{ssx<_gMB;}THLyGt!2ubPtU?9kd&jI~K&23n z;kHzNELx86b znNZUzl)PwY`BN=oB_OBZxP}LU27`fWU{Wz{GDzogxgd=JG8hyBLD88|95zx=-NG3Q z5TcW7RT^A{p@7XIEW`A;fJ}J$Bm}iaDt%@c)jdrVkuuN-Yd|`c2CCJzxE`Z*cr^02 z8_z}SVoe$Zj7D^rUMnZ=L%DE@J9 z%n>sPsz}Tf2GeLWTnVbfVN{OHXsZbAr(Ds$a(N;x0^^uA7Q@nJsvs%_!!cb7rU67E zAShmiDlmiY4ciSp2^d1Os&quLT#KoJ$0_Eio+JO?LVvEKT%IShV6XF? zch(}Sq7N7P*W9Zw6?B+}j}MjvboQD;Xj6w1 zqiMWq;>O`s<0E4xe&*DyU2k8`7@3@$3?JzYd-p;AFZ*gu)7M=shX*${4RY*dA6#>J z**z=2>i4ptyHf)1<5?a}bNc9G19dcMmwRgxc5&iz3ad8M!=nu9>nS6TPOe^Zb84C7 zvumxpU+b@Hb^|>>2%78S?dO-fM|}eO{m-HjYv9l39QZ>0tisx4rLyzlMez_Hm&OYx zG=s0)xIexq?kv?=kFQLw6E?agBYQubos*MOUU8K zgGYAz(F-}5;ZZL}1{CyvS>`6Hn-}r6-ImRzd-f=gdi(m~U9Uc(Wj8d?9WLqJr*9AU z>nSHT8vPT$%w4v!s*BNiKHDiUdUT&di;lWk!`X52q}a{Pt=fFJKfhh#`?~#uzT!6x z>uax4gcMHA>ajCrk{(*&#vFL z_6SyFKI_fDDAF`85rQSXZ#9Pjvb4>GaWaGdmX`G0!?WcboW>M_? zyO|HYVpGq?t=mU>e^q+Gr>89FY&LrJi!%vF=YLc$*|^%{(DgliS{KwOq_izNCX0LR ztJ@V7J}ei%qw(SX<&)veHEY*iY#eD_+|zjlSB8bRl_$Lw_k;4KEcJ;6nxP)$qoMEZ z(xawWKTJi8A5(@5G^fX1vM(LQ11dc4`9-!RTG|q^oZ+pieZ%3d>&;uT>9Fw+Yxh zzBT7yi-J-jPg-*5bh%Sb$*qnRmbuP-Wm6%h>d^^Lj;7$%?$JW8yG6q=%T;)(scYWW zyG=oPbw7?&S#LL7zA$*Q%J0C`=k4-h#F!NK1~tl%@UVF&I^fg8X{r78>&StfD+1^I z5mfX|Z?&GI@jC$KUJ12i#%LnF%=S@ttfiK%K{p*5D_YaF#mb*Yl$#izx literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/electricmagictools/textures/items/thaumiumdrill_alt2.png b/src/main/resources/assets/electricmagictools/textures/items/thaumiumdrill_alt2.png new file mode 100644 index 0000000000000000000000000000000000000000..14e3a3bd9a1b0c7309e86e1e325c22d3e41b1a4c GIT binary patch literal 2120 zcmbVNc~ld39uKET#VSe_a4|*&QIpB!fFu$T2uIKa6jGMbg&J)Bz2$m0tB{C*%ys8F=l?a)* za4Lt$k$XY05ya+y|#3IDuF%SOHXByfQ(C@HBXta{U4W z3sMRc5;-D)Wmp3vj}NO5CJy!VLkLnihx3V8ru>*FG-ZH>CkH?R5s*p^alN-zB0=i_-aiU`jWkVJSIkxr!1$V3{I2QKh@7SHnb^rZPvy=ks25cDR~ zJ$yVp$SkxJE?yLnL|VYIWlDr66F>{v5`*>!EagwJ3@-)5LtsS+4972YL0~M5z{*%y zj`i}wZVH#kgs@uaY^czOfLV}2au5>wC}1h}eTo^9&&UfzBo`t?rQ=xQ}?@|C>4hbqX-_$^Z1t!Yi~H4ckvsfF3^05hO#0M}bbs*wW}q z48~N-W_g5Y9uMRO>{=7LrlIC!RN(U?tDQ4f#rgUF!)0sKs{M~n4YOBp9<_K1fOfm) zwCEFy#%hmdL{n;6SuS1EVTIoQUhyjmLp^`9{>J;OU;X)<_`luR5q`Yt3$lJ_PG8+~ zu9Yjc|Kdu<-2q6{H$OLj=;_n(-}~&>egF4&J)7k~W!PbsLOfmlj=Fl8rtpnNQFqRT z6H(q~B_$=#rnTduj-m zPD>WxU$x@-(_<=M-wYjVzJR}Ol9}Ik)5Ju4d7|at8Mn1BbPop=XN>yr=2ypkaLZLp z;soRTTCGV(|LF+!AKALC_fju#;(zM));ON_VC2<5d}uK>=rf;lw!ZU$b1glmMRbc` z$}M+ta$0VgW|6Ne8)-UL&Mm0#?fow163yecb@Ec(j^NW2z5B#t-F5Mi%a}KM{Y9Jp zz0SQ|-QAsFL0j&ZMn>QADicTDwz~sO2`vt{Zr*gJC0>!7*JWpC^VM-%>gyYpXFl*R zQkUwiHPp zv@kU}YXcBibrJjDMmd0DkH>}Ja&HgWcQvlbcq zZLt0&JUk;)|F6t_Mh*#2Gh&FxIy*xVmCCuXXRPBIcq7pG)%3vJ>y3R+Qqz7i3tYEp zkrUiW&djj(iF~^_By`0-aX?CafXudo+uv?+{$f!TjeM#8J2}~OX2XqekH)%#n*7a< zzWcSYO}}(sIc?*iJU?S~d>~cO$eEqK zWlgbIx#@tar0@rkCJJjpic7bitZqKDT-=ry+!uB1!QSd{o+6}HO24;QO+FVgk<^t! zj`(rFH#tnwT74(gf49+6XMFlUd%`o*)6G?FR)>mhI-}FOipbXwJ4EgQd%ot1-mNn4 zHPxT&Y}%O^CU+kxw(+uai*8=L<>f(kIZ==wu_x&0uX(Q@mfFT-yVlLsJ?iKU&zQyq zo*IfAb>K~9RpxY_Vgdv3#sTXqhn)(UnZVuTz2Hyj#4{4p`wCnes*HbHM^6u zva3te_kFX~tNrbn+C8RgldS@%H7V^evt@%o6~1kx{@Hz_(08P}YId4m?UP&yr?_a_ zU905r));-AM^e)M7xHFIHjr5LmRS&LzhuwwF0A|qZmGuc=fP&_?1AC)kNcN2Xd}`% z_>ueI+@|uwqb{Nv#6OU3+3Op5c{h7Iw_@$f?P(*kDl;b=Q+tK*c5Zq(?aEbgV+?7%>NiG%+&5EpBJ5v(> d7@viW%rVlnC6BM-5w79i&i3ZA$~ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/electricmagictools/textures/items/thaumiumomnitool.png b/src/main/resources/assets/electricmagictools/textures/items/thaumiumomnitool.png index f89c9f1c09e43ec574a0a138576290b28a079621..b03ae8d4495f098ae3544ca43af78a49cffe0579 100644 GIT binary patch literal 2094 zcmbVNX;f2Z8V-xdPDQB*C@~-|kQK7rl!!nQ2%3Olr>NW{7Zb@wa)A&*g+df*u^Lg3 zt<}Nm3}6{_Dky?ZJAe)-4m~O*kb+_b7Z^dXz_d3i&iwH7$J}%7{kG?MpZ9y0bBm&Q zVGg!#wkQJIA1foBlNWhZ-ERjeLpwfvH^t%Ux zsHsG$bUu^)P77HvFk%>1(((ALtSnrXKTe_AjVA&CfG3dfBoY=uVAa`j7}Q|pYOh5L zOh_$MNtCceAxE1mf&xVb%)lU?zP*A>$>qK`ELXn^6cRGL22|pSI09ZKGu`VAS`G7| z|GM!(v^pkR3E}yWT9Kg=BKb)5S|lT}`(q&!5b=f{sgfW`0i{fZFhd5(VGfglK~8WY ziHJ@W073!9pMnhl1p+Kc3rNL+LQ*Q0MgRyjnm>U?28oMyKE!9SNi0eTC4fbvvWY~N ze@G~m0AP`olViXGLViiP*6|h1r zRw&V-q38|q61hl`rQT@D(Ax_$A(bQ(60ubZ8Tw6#>5>n~rwVAGfFdAc2?B_WO(g{o zumF`nz*2-lfhbi(06>ud^Nuh2e?x~yoWh&xIX*l z_H=XAdK$TVz{$y@r}YI;`8a#%aqex#$@HFd>Zdl(RZT0@O=GduQ|j!6Jqezfs_B2P zo4jd1SF0adpf3AXky{uv)4wM8hUkLfK~L3f>2TKZ_OYc4IU_9Jl4nCp#Yz2pe=6Al z{3)SPKQVdsST zr|rZ#fN#t{PS=(j8a>LYUt7!s89T0j7JRYo*Lp&F&CHU)zd{w>we?xGUKs79`amB{ z^P8R0k6fl?)O0SHUD)aIOU}y5w9iA1kSZ)5jRz+0+Tm^fIq|{j2u4pe7^S#Yusq1} zPQUZ_y}~NKWABUB4j)NeU7}q~o!=l}gvSzdM>~!r8d|u4M-#puY#kaIXuhBvgYhj+ z9lec1c*ZL~?Xp$&X2o`V$KsS~L!g7hle^Yo7{E>*5BSFMj9ndrAz>X&)>e^%p-*;* zrBZfjy;WLrq!4}@D4*}E8Pr2&f4}2H?s$2$)5oZ4ewdJ$*j43p2~3&rs^e3P=ciw+ zEw>yUrRnzVbyvUCySnc(UkQo3?5b_IV%F^bxVW(RkgKSb zPNq2kqH|c6vgUp3)}Qk8)X+S19cOCBndbQgnv#DA?oxYtIVv2CuUcA?#yo8cjnmr1$jHd+HNxm{|Lb}iExMhb zbRIWmj63DAr}%oVby-zasc}ioTDGNgk!92I(zR}-YhL>96>mH2ff{~ziOt;eiA(bR zj|ahLV0xK1Rv9^FIa_Dk{_KdezL)#;N2_%Fo%y6qC+x7% zXDc`S5^;hP()iP(0=8v9?7gd_{;TKjop9A9eRJRI;Iqq|?MAosGsG1eDw#!JH*XgN zwYlbP*b%FVG(HbK{AHny#6G1<*FMs>wS2HxwLY+oaeBN$5I5I+O#jsv2Fm8k*~boj zS#B-9b@g`HHJz0vpHdH`SW!2f`Rz5Qh22Z7N*%tqnd6-kCM89%noq2cG0e{KTHS8c zH?Er)-A&7#oeQLj z0|SqTZ_$fh1MEkgQM|-V--dB)`$p8nt5NMWKl2CPA>GlVE;$?1+_f(cwti%O)+4+s z-#JcGX4P|l=0f|)DvJl*okh~QXYF>!jQfAfn*Ro6f#UsOHL#3avdi=b=dgIphLDu} F-vI-@QNsWL delta 832 zcmV-G1Hb&P5Z4BfB!2{FK}|sb0I`n?{9y$E000SaNLh0L01FNP01FNQK)&HY00007 zbV*G`2i*$<69WQ4g)Gqk000_vMObuGZ)S9NVRB^vP+@6qbS_RsR3LUUE;TMOF-P-4 zHvj+vz)3_wR9HvtlTB|DQ51$RGe3ggP?NH8#X{G_#4S7H7JvJdLX6e;9j1^X>Ll<7 zO{GEwv=&>fi{p9E+%sJ0009R#`X+B?xF6?v&%KQKXLRRQh3xC!lS1)?Z{NHhKVez4 zPAN$3!V86hU6qnt5UgXRQi*rrJXrP4EnJ1)0AlXvI}`bhkr1=sRR_NC&Y@Xwh6wyuXvAl)3|$@>8dalr%+2Z? zz=e0NvH_%9l?(sTwBR5D51;cpd+<0DhnR-v^ZEIA?n+NU?m9YhfnU8hbj9$CI)h&u z`od6*_kRxzojzn&GSn-3G8P<;;d5cLIKy6*FyN5|XTIfwYjPZ;BN z+49oDfWzPT`0?A0Pps)|d(_|c=#=3f9z@2tELv4s9Pkl$Kf<5S{_A_?%ox7Ioo{&z z_2?6K4P)Gv`7-{Am#euq3oC0000< KMNUMnLSTYm|BOHY diff --git a/src/main/resources/assets/electricmagictools/textures/items/thaumiumomnitool_16X.png b/src/main/resources/assets/electricmagictools/textures/items/thaumiumomnitool_16X.png new file mode 100644 index 0000000000000000000000000000000000000000..2bce875e42cd023fe4727b9c6fa9f491059f123a GIT binary patch literal 1404 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 LLfB_k@7Vn}YZA(M literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/electricmagictools/textures/items/thaumiumomnitool_alt2.png b/src/main/resources/assets/electricmagictools/textures/items/thaumiumomnitool_alt2.png new file mode 100644 index 0000000000000000000000000000000000000000..1fac8399c597dbaf6a2e8b62476693281eb46679 GIT binary patch literal 2172 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 SnWHuRo+AWeetp>Xtp5U#Nj>BM literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/electricmagictools/textures/items/wandchargefocus.png b/src/main/resources/assets/electricmagictools/textures/items/wandchargefocus.png index 687e537f0091ad4e59a7aae80a3d54344b43ec17..4bb36a0dad2c3d18e9a14d44d4cf569eb2ecc099 100644 GIT binary patch literal 1543 zcmbVMdr;GM9M8l@b+9qdc}}ipj52X&nkH>&6R8fGqSY0#_6Bo@k|rt5YMa=kwy-&; zqEKI`IHyCM^PG?As?OKYdERCba07LU9^Ay6aLRn4;J}^Uu@tG>AD(|KcggSd{d_*( z-}jMFcGi@HAtQ$X0FYprO4{TxG5RV7%HL6)J(N7WC7E-jS-evUP(Bt&XLtt-T0B$% zYhx*(QZ}(9c%&THA3wtPeUNb z7@-`URc#eatc#mkH;psU0nxop`adDp*k&&q7y(&jcO27jbJ#8qJ&mYps8Tr1IcPW z#!1-7%swr7WrSRkBoGJ^2n19Cjf(dbASjOGh#EsM43;fmvCu0~LD(yfi7}9@Nc%WJ z;&?9@WuzRuUot|nr_Zk75vvua5D&2(Qo7r>1L3(u`vU6g6uMWQN&f%FIx!F@w&a z#bQ{CSCl9(&BnAjS-THwdMTDL`B+NgeRiIo7psD77ccRmix)tX2~5f1ybK=@$44{t z?7}4L;})>ccbt zH*|>X6cVkI|I|%vOD@Lf^m!M^i|2jBdgbQv$z2k@aAP3=^qXKI)9t~gNco4;?K6i} zFZ#HCb49_f$jPBg7k|*T{*tn;bbH(A6-9q$Bn}wb|I~o=QQJ$3+V(2$Y94L4I933^lDBd*ImmkxzD9N#Wnw;aAMPpE<2u>H(|v zo9ghgb9YvJex%yQZ)EYMzvgh)H)45v_FV=>|IQ`xmq$0>rpg8!+&}h^yZnbrd}O!r z=em+3JmXHN89~fl`fb!+&&_wsuxe8d^7tEUWLlRl9J(wuWo9#pi%w8xyDH z@1EmOKCQic@<8^z#G@ViR|O;IBM)xfNer)Pz7*h zQ~xpXKf2zJzh82r=xE%l!sDc^fnDZ{;??jm;OX(}k8?hI1&9;xl-idI?a^Pe#hgWk IGxC@G11sK6w*UYD delta 384 zcmV-`0e}9744VUxB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000id z000id0mpBsWB>pF8gxZibW?9;ba!ELWdKlNX>N2bPDNB8b~7$DE-^7j^FlWO009a~ zL_t(IPomEe(`#6nygW;8r9WRn6o$XJiMN7n}p zk4$gp|3&9PRLx&ofj99eVwo9D9vQNnwxC^(J0<+qsl)8ckzuDT$d%+6F1H17FoIa< eF9mVTthfTxe=u=xaw-}C0000G;OiG8| zbw?$2R7!Cp)j8^xRzg&hlX5$iT;NAq2)Pktjqkz?VU*U?B`i)~vn` zd*g5uR!bwI(ddw1j#wchLM9ucTBgL%IGpz)wGtAi!YCkuS4rhQ_*WO2@PJg}gO8$z zkVBMQI9VE)g}~uif(UU|s+cXoFY*Pv)f|jK2BQ$5mZiy69JLSr6E6pwo3=@K;FAfO z>VyC6RCGuvz*QhHKqt}(Vlo8;m~0|Qr?EkB0YD*xR1!!gQP>0!`edy_h45c) zeA8MLu|^4#gs@7Hj)<{*B)N`*vDp2+kjW79hO-=zVo8D0cnWd443?vOo(~>7AxfkY z4pYPyix^Y}fd+|01c*gTB0yqF5`jf#lUXb(nMH@dah`AC8B3XdOUZsLe>Q~*g8oz% zoz3LYS=^;u3X26Yx#L*AT!lh%F+8p<#k9X*nSYDra1j_n6-b0akv3ihp~(tVp-NUL z0WKGq7bTTT6qzbdQ-(fYmbgGz1C$Pm#27$$-u?P^8 z!6s1IG?>YtCDD`URQwmbeJLRj=)d78bqTIi*qu3{#G8D67y!98As*ogUl2 zv4b&VL9Q;0X9xp*orE=IogG%O`HR*5(%i1r=B*nJr`Yh#*4VXpH&oT<%~`jxDf=2< z{<7WYr`n4*dklMWXf5QE+Lm0p%X5oP>tk%QoWbhcfVWQPWAb8LChfj|Gd1Pfo_h(!bMIgH+cpE?lR+Iz>z-a|)^7_M3o0JFT7%`KMx`Q0wXga3%} zew(bFHJx;+w6?f+S8Ktk3DW_r=N{>AcXxX>zuKA5Jn-y7XwFM&-FyyWzs>pb(7oB2 z%ELNQy5$0G;<+DP(i#_ZF=~0dYls8Q&b*&&rD-Ux&eD`C zY3^0R~+aL8K4P+)WPp^k|9k7)Raue)C({^+f)p?o4PuW0s3my&_ zJdu6h(r|3T!ps*_7i*R;Yi~ZZ`@|JvP-?*vln z>}n%UuaBHt7j@8(qnvp=ZvV-_D%)k9Q-cM?`z~IL7be!n-oAf-{zF!Pb5BR!rB+}D zSa4%zP3OAnlD0CPF*Ma8$-yu*G%;Av^}BVQRlx}LPKM>bm!zcVdgLy_0s)>#wDVzF zN#vmpPUWlH8!UFrY{k3RIf`TY2(qijhuN7rrSha=`3{SwzmOtg@ielfx8G@s zo$l;!^N5~)5Hzi-+u(hIkv+F$^5xZk*3U{mmIeCy+Ev~-jCjwlANtRYML%r3)%hwe zCT4y36Ng^2*qr{S2*V;`T?1Iz-u7J4Sh#<`_}YVNk2Oz6xt5B;kmTHO^K*T2cJ8?> zx&QRXv%WJWT{Lw|MeEAlV{2cSGp1hHUgGLu08&URY8Km-+3$SZH~L`7`>M3;ds$(T zH=Es>@otV@`igq5%8y6ikI)L2Hx>_vAJVD07F#xU8QmR9ad)8V(^8M++L`C&&}awh z)0Lk;x%}fF&kL(IwLK}-EPnT{v~+FBnUSzd!AHCXPH(>2ueB$)2_3X|adGlxkA16K ze_dY_W$4@+(s`%hXp^SOjXt-2TSdjZny0h2LdL2pvZ}^W6PM65loIjJ{f5G`{f6_f z*Ri8!flV0=@uzG~7z6dMH#uC8Y-*hU?0m_~m-3M}Z}v4ct*vuLusl84O9J!#gGIIT z)<5xl^z6M}_iJTI{FE2kpn|@aWp@)&b^DxpimRSqrc;z@Z_#RJ zw6?Ya6bdqDbTiGloO68N>s0Zahfa0*{Is!1yXXne&pu8!9}6-cn@GmlR~xsptpjJ6 PepC4V0^SL~#0~!iQH;dr literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/electricmagictools/textures/items/wings_random2.png b/src/main/resources/assets/electricmagictools/textures/items/wings_random2.png new file mode 100644 index 0000000000000000000000000000000000000000..2e89e5b8c2225b95847e883e2796400e447c4615 GIT binary patch literal 1872 zcmbVNc~BE~6kh5l^Vv7M$Q7A~q3Uvk$@1md<2CbrqqI9ET`-kHn-I?9r^}hGM-+S+y-LPok z+>!2{?f?LcRLqlw(Ie=5KOIhgNvpMo9wt)qC~7gGq0FcW2LjZD3I`Q>GyxC8QFZEy zdfX2HhOE$rM^RD13&a?qXQ56TmPK!*(E#8#+hRm99ZrENJV9%aFdm*d%K)`%2_upp z%nmk6@kH%Bs|jChT^Np8br_;%%=QQUEMnS$9;Z;yqE9lAVvB_F#;=&3JGUVQ_{N0N zNf>WQMFlScrGyCw`7AyYV{>3oh_GNj4}syCAcqZeA(#zu5GD+Zc|tKP0N*_fI+{tX z5r@fw-o>I<5=J6L8O0D}Hk(;yE{iZFKrn(J5Ss&WI854tNv0Yo)WS57QwKfBa1t|V zjg*!!fKHF7ib$p;44UcNE9i~E!S5X#$ajgNQwCX3BLuV9kY4Y+*Bfh+3d8@U@j+`c zJk^LpVK_-7n=rZ_nyG_eI(Hur=a+#dX z3t|i8JQ;rwt1yrhYQXTp*jhUFTWny^N3mk52}dcy6iyIHgI%yFk)Q}NkuZW%Dd-!i zHK++QIm20@w-=V-CT$9?4l)sX@J))v+7E=sa5kTd3HeL}6AG9jAy33ag#v`hMR>SS zz|-(Gd@kc1Uj2Vl2hpS;XP^A1Zw9yMW^_*9tAJj-*AZ@@#bcsXQmE+olNMjHLKYBi zx!PqfpC1!CZe4?Sowtz3NJR6aT9-w=oN#5So6;zqn7P(t@A2)SL(hfQD5tEAKXi20 z+IZbGhi!8$>|0!T=NaeLlwQ0|v|)IryrZh!kkEJI#OVaDx*fe=ZL8!K0SAD}SwKlF zMNy&$4<2Oi*pZJ}ELSRv@@+Pkd(WOlc+f)ONF@4n7o*ks^^+%0iswW}@4W_UG@1pz z0|Y_)>gwhuU|4nQ&6_E}@DQ(o6Ft@TtI3k85!rv-y?fwNW@cvhCRJAZ>(_CT zbp>5rNjY_orx#kH^F$%LJ32Jw<>iV|4u|7dYC&Iq#_>_dw#pc$loX%N&d$Kk&y9t~ zhTN|mUN#0$Yc$G$0Gk@eAEcYjkz2QJrS|3I{BXX#z1vh|!TBp-lUB5`U zFz5c932O{V@!z;q_4Sqegz9uhx^wJyUi8tqGmrK6uWY?_E9cOm86#a@mX{+E%)4RJ zOmX9|{7I9pD1D`I0e+h{Zltz7&dv35TUYJLZN7+Mm?6mZOtMlmCcCyaWXzVJr^O{D zA!J4)dx(4NsEXq@rtr(WmtMWSy|dyX*U`h!KS7rj=z6#uWe3M<&R@utn`HR2MyO-TX$4fOZipv z#j|F$KWXuClg$o$Xsz}3d&J13>8`yr;bdEBDd%^$z3R<-_IM)x{`R&umG}06>Ir`% z0jE#idsL-sZ?v(f*Ja~pPm3ulEiG8OpuX=_I`dRh(~_7&em^e>95&kX5?tnR_!bov zE!$(M>8Lv5ALQ8fd`U#aZ|Bb0cJAEi@j_Tqx@9P~+EGz)`Ma7-*EscdxogGi=de}T z($eDN@tJsk$&n-6w6rus=fM%#PkEDG`0r0@IJV~E`STe*g64KSk7&=GFUi z0i(%Ou)=lw(~B1_tiN=;R(-So+tmVPYFqj;BZ}r%}nU_{OIWAGxX2w&VQUjzED;i7@zSEKo0fp literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/electricmagictools/textures/misc/Thumbs.db b/src/main/resources/assets/electricmagictools/textures/misc/Thumbs.db deleted file mode 100644 index 3e3b860323d09577bec1fd582b394302205b5795..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16896 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 diff --git a/src/main/resources/assets/electricmagictools/textures/models/Thumbs.db b/src/main/resources/assets/electricmagictools/textures/models/Thumbs.db deleted file mode 100644 index b52fd7aed43e33541152a37ebd9422ba0d2c8bd1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10240 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 YVTRD*J1SubDhxp2>FVdQ&MBb@035ynqyPW_ delta 482 zcmZqT{=+;$rJg0-(btiIVPik{pF~y$1_sUokH}&M2Dt+u%qXb0Z97nqy~NYkmHiI4 zu%NCw%Y>QXKq09T*NBqf{Irtt#G+J&fW*wa5hJyShHL-)^4<_rvssh%#5 zAsNn3ukZF^4isQ}urWZ|Ta_(!^07neA6RqVyfvwp-Xq{Fvd8v7RK@E(x=jm|oVeyY z*RE=nEmw0n$5)?TI_FU`|Nl8WXA&d*I%dW;FH|@9!qPVHzy)E6Dkf+DgcqDVwvAW> zolh^9-&11o-V2{f4qm8=VCekFKd>RuvLBh(+gL=i55>QbknxEyL;VLf!hXVCiCxYp7AE;MRD0< zxAyqO+tzKpw)e{Nb(b&N#fI`tf_evsc+}x~|o=DAaV;hTg{qzA(>L$UVHveY!9(W*9tO L{an^LB{Ts5e7@2a diff --git a/src/main/resources/assets/electricmagictools/textures/models/electricgoggles.png b/src/main/resources/assets/electricmagictools/textures/models/electricgoggles.png index feeceadc65f5f6ff584a560cd5b79c1d01794716..54a6eae37e2b3798b6ec49df55580d9b413193e1 100644 GIT binary patch literal 1695 zcmeAS@N?(olHy`uVBq!ia0vp^4M6O`!3HERU8}DLQj#UE5hcO-X(i=}MX3yqDfvmM z3ZA)%>8U}fi7AzZCsS=07?>3^Ln2Bde0{8v^K*7iAWdWaj57fJ{tG z$}cUkRRX#c;)UD-xUqS~&|m@vn0`fKfxe-h0mw@*g}%P{mFDKcRTq~8r6Sym)!^cg z%7Rq=pw#00(xPNw#HA^NtSYc_E=o--$uA1Y&(DE{Vn9ZINq%ugeu09svw}u=W?o8u zd9fx~xv#I4XI^nhVqS8pr;Du;&;Y&6%oHm(7b7$o&6x?nx#;I2y=oo!ayduRjObD2GKumb51#;l&J~a=R*o%OvdNThV9$;n>@pN$v zskrrK)>&_nM499JAD>&d_F32pmb48)0qs^2AuIMqd9&~aNeVvT{to?^3ZIC%P?X}0N!bFvb7xyG;Z zE$h>+mHLLQzWDCitj&p)vAx@s_MeH+NqoNl+U%-6O_TliEq2Yf>&)a#{eL3e)+6qO zr>EPY3x~xlZd>>8`JTSbyuaAwO5)_nmn+k3Gj^{!xA5@WCNo36`2oFKzvOO|?#!~E zmU8={$gH^I{Jxx}UrsD!RLN?tinFq*y15|WRR1sI+grrt4K7{%@gws4$+ zPP-NzUM3@aSl;4}GN*yrgCBo6R;-z6eg0y;4A-ve`g2OFnLH}ivFH1?e471t1KVe_ zHoxOCe<$A7v$ZXsef-q_cb?qd5^w9ba-XRG>{au!iu3qU?O!oEj@&CePT%iOoo$rp z>v^!{H0$xF$5vj?TcfAf^t{x(D*w)$?=Q`-l`|G?arspCy<=)+^;gaK#tSVQ-<8L$ zFlO4bZ%xP&aWMy@lfQ0RcQ)kfWPO^*x`|iizxp5b2}}Z94jK##8Cs~o5YxHOD#0LQ WrFH50ujAi9RfealpUXO@geCyZp>>l0 literal 824 zcmeAS@N?(olHy`uVBq!ia0vp^4M6O`!3HERU8}DLQY`6?zK#qG8~eHcB(eheoCO|{ z#S9E``#_j+;;z0rpdfpRr>`sfT}ByhGm94!7M%eKNtL)plmzFem6RtIr7{F0X6BXX z`MHKDlo{)p>KPike|9owU|?G4>Eakt5%>05w7;;U2>XZ1!*vYv5Bzwb8>MrlK||>h z%lZw9zd97YwuuLDX>6N%L~~lgm%w>7A6Cnqzxi&;R=wG}eTFZ8{-0EDbvreEnq_9O3T=ildYZrdNY;qTO@{%VmcvrEb^UphR=@N@97GgtP1{=R#T{@N?wR@|t!DU_SO z=Jhhw(=xAAbG>XL%?wu*7w&xFeDS~?ZeBBc z+JaNxLvoACGRt0nsJt?J&6~>?EBo)gyIV zi5oojPk+4f_D(*%)@d4h-G!L?)@T0LGJkAbn!TQH-Tb)CZ!7Ow<=wUZqf+>|;?lcl zCD-!gNbS0FuFpEQIj-;ATDxn*g#~|-w41xF-^RpmH2KkSe2$I0HK5^&CU5SU$VC(Hu!G*x_>p8fN)&zt7kZxfogdrCB~bi$n3hhy#a&I+7;eXa1d z-?~q>CkjQ%=LgxC`*oQ#NS}T$X#ZSkfAtpLDpgyt-M)Jm&waUTzlG87``N$O80LQd z;nNv!sC-_h_tURWH!JV4+HlxK%vx8la3|-I8=ovc-nyh)=XzAyr&P=eq`v*CV*#>T5c{JWol PQaOXCtDnm{r-UW|@>Xu^ diff --git a/src/main/resources/assets/electricmagictools/textures/models/featherwing.png b/src/main/resources/assets/electricmagictools/textures/models/featherwing.png new file mode 100644 index 0000000000000000000000000000000000000000..a99aa99a258c0945a69eb1f32723375821bd5fb8 GIT binary patch literal 4323 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/electricmagictools/textures/models/featherwing_noString.png b/src/main/resources/assets/electricmagictools/textures/models/featherwing_noString.png new file mode 100644 index 0000000000000000000000000000000000000000..d993fba8875e680e7aa4345d9b19af30f392d233 GIT binary patch literal 4237 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 I$UW-608$@a=Kufz literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/electricmagictools/textures/models/nanobootstravel.png b/src/main/resources/assets/electricmagictools/textures/models/nanobootstravel.png index 3c4696945ae12aa3dc9aebc6a6ca539f54e7f2dc..0ffbde3dd7e01e4f15c6c9263dcb629f271a6c61 100644 GIT binary patch literal 1372 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 O0000_%4EY}hOzp@&#o zY*7)b4pv2N)nP;wv;~hSa?}DA#iK=RQA;TX3m&a_wSwIs*#6--)9%df`;PZ}@Atjq z+fP$;i4%Q-d;kELs7X@mSsCMby~nfP3L@tUD*~B>bY>o9X7W%P2VybGh=UpuU5x8- z6m#aZ;!yy=%^}j#nRM-3g^3~ss7FWOAgwGK0HUHDR@AfQ&xWt2RY>60UnR;~7_VT)}vP;AH`2Wo{70Su9(=UgM&Hb#&CL*tp+ zwlt>|hxE9O%B4+gKFl-5z-;WE@5rObvQZ?{1e+8zTTPjAN!-F{)Jh(^Bftnu5n&V| zGN}>fi-lq#A4kLzK8hkJUxK1WA&yBzB5A~!ooC_I39vMNmP`zbU$S9okmgFV^xrnMKP2ui?V|8@nD#N zuwYc4E!>l#CkIyJG-1cFSu{n0BOz80&v1`Q;RqBJ%J^aqx!5s6{Y|$LOuzaVvFSdh1SVN+((Lk6zs6m20*6 zcX`E53G-4L!C{6d(QiMU?wyNNHiYU z^v=SCr%s<<6QxoW^^|Ow{Te|K{>_?<`SW{@_x^xz$~JEnN{dc@DV9o4-Mw4m#Ti$C zNZ&RXdhgxq`12Mpd6%d?Bsh3IeI%RH+;Huh`N-kJC1=j)oDN6Hnl%%{1AHD2fPo=_ zf$Itj3ybPpE>}@mCLGq^-*1$2BA|6U%5!_Lh6Chy-8EWX!AV)Y^Ygjirm4k2cYh7I z(<0>tdpVaaORnARa{Uy=^@{fHdTBz*<%bWQt7iV()zGl~g-!Iy)QcIz`RmH>1okCF z+pAYD80cx<3&f1qB`3etoAi3vylw6~&L&@j!En&!>TeCdhJ-5n;-NnetWXXZx4Wx2 z^^J`m4h{~sbaid5Iewfx$eC6hP+VNxMscRU^2#7fW7FD@!7oa$b~c3A53CKXx-wz) z+O@$vyq-JYUAf?Jf$$!$&7{gd>;A)+`z}@CA2fYBe5v)DUkZ2UJb3V+b9Je;U@!Om z5pwQwuc4GUb6v7sfo-HqKiN~%+lwcQ-?!V%NyU=7ufN91_2I3$#&OQ8k+F+_`g3)4 zD)w4ir{*ocAdHOkUG99-khd@~ab?P~Xp{lDGhdT+ZBm|1_O@!pnwVXJj8;Su(z;;_GQXxW3Hsr|O|ThC`1uAg1hd##!HLzuyYEwY9Zv!|kX2WKCX+!UEb{o2ieFthWhC-Ft)M1mOqyikP$;89!f| zTCY?V{%=c<}~3OGA} jFyKFm@0UNCoC$p9pFVp<-;z%}KT}PDPQ5=a^TWRZ?Gg-L literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/electricmagictools/textures/models/quantumbootstravel.png b/src/main/resources/assets/electricmagictools/textures/models/quantumbootstravel.png index ebd17bd82b9c63b3c3928a2e1ef460f4b68f62fb..ff6e6131adf275b2fb307fbe59afb4e21a5c410a 100644 GIT binary patch literal 1403 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/electricmagictools/textures/models/solarrevealinghelmet.png b/src/main/resources/assets/electricmagictools/textures/models/solarrevealinghelmet.png index 678e67b9fa9abdd7c38a3bd1d96d9d0f64507356..8229384ef3b96d554cb0080fb9266d5e08b3754d 100644 GIT binary patch literal 2164 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 HDWM4fpE{)` diff --git a/src/main/resources/assets/electricmagictools/textures/models/thaumicnanohelmet.png b/src/main/resources/assets/electricmagictools/textures/models/thaumicnanohelmet.png index 969bd35a2f125762866f9ff3e27976e5be677e66..a480cf65ac7b28e1d4f235dc419974c6340ab01c 100644 GIT binary patch literal 1625 zcmeAS@N?(olHy`uVBq!ia0vp^4M6O`!3HERU8}DLQj#UE5hcO-X(i=}MX3yqDfvmM z3ZA)%>8U}fi7AzZCsS=07?>3^Ln2Bde0{8v^K*7iAWdWaj57fJ{tG z$}cUkRRX#c;)UD-xUqS~&|m@vn0`fKfxe-h0mw@*g}%P{mFDKcRTq~8r6Sym)!^cg z%7Rq=pw#00(xPNw#HA^NtSYc_E=o--$uA1Y&(DE{Vn9ZINq%ugeu09svw}u=W?o8u zd9fx~xv#I4XI^nhVqS8pr;Du;&;Y&6%oHmZb2Ce4XEzsDOEWV=Lsw%9GbaNJ7bh13 z7Xt%JV`p=iUYGpj(%jU%5}4i;gkD#idO;~6w*Y9fOKMSOS!#+~QGTuh*vD3xxZUD} z(>$o&6x?oc#;I2y=oo!ayduRjObD2GKumb51#;l&J~a=R*o%Ovnn5|?IRgXJIZqeI zkcwMxX6^Nk4wPuG@4T3`NHEL0o$r{Cj82Qws>zcVWV24s(`#z7uqt`+;L#!r%NzCz zp@pv%W}IxgxhvA;_tdaOjDaiUoqJ|oz9X)*tn|f%MW*MCRi8h-Gx_(v^FMby{57Yz z>D5txE&&F@@EzAaub3yhzH=QvemvIOySvuT!eYb5Wy_YGV*ma#&xY~pKffjGgE%81 zA_|^Ae{N-IdGY1Tl}0mr!otFIu3f*r+(TtiTN|5pmEHX7Cr)(q|15WBnK5_n)<^#S z{;LBtA||r4v0b@wW5ujlQmsykXV0E}`RLK1w3v-QqT=JPKYFAjbY~00+qZ91*?Ri= zq9*>S+pl}q+uQrvyR)}8Zrr#jLTTcLNLvew6*Ff_9!*{!`uk(|tgP8n&g=~|kqXtD z9&9%I>gN;MJHMp2GC3}t5>Obk^m68FdlQo{$4g(odX;nM;lqcUZv6T4XREmo2g|8_ z|L?6Ykyo`zwB5FC+p4HT2Od6LD7tdrzI#$ZE2o&5o9ix|J9n;?mDMhv2u(2_Hr<2w zir#lV)cqN^Y5(5;OKKkOerH>)^Zjt7eEzlQMfN!_&ZKs2bT5ib|LgU4ec#Q?my_Qv zZHnvt`t94P-+Sv1U#y}U7 z-o3V_Z}(rgd3nnrY5y(%Kg>NE79M_+>D{5=14oXu+`e~joAdnb|Er%jMCdHLb}g*+ zaH6cdy!K3=xOuyF@7ncd!j5g*${sU?{0??l5Tx|>&6^#4eSN2!@4b7sZrb$eYY*JL zdsk1c|90J*T<&|T0yKX`sfT}ByhGm94!7M%eKNtL)plmzFem6RtIr7{F0X6BXX z`MHKDlo{)p>KPike|9owU|^c)>Eakt5%>1mS$|0KCeQF}O%lpiE1I1>celjhYI9wO@22KE=P~tk%obU2|EK5i z1q{kcnT%|6XQ#+;87NH>Ntp4uO}3lqkGhhP!8(S$zpEEt+q7uj`L3wb9Z|j~yO##^ znKeE55Gt@I=Ira*%-Wn~Q`03i{cPS@_jS+SbMLRG(HV(*ufH!XNuR-VNU6C&Axct_nLO_racxFNo_OtI0kBK7DnpF+xLC3wc6a|SiK^=S-3!%!tdy~-(vY9`XJYfo{34sbr}OmBxo?`# z{pQ!nC;2yLTTDOvVfkIXCx^a$eeQcz?)u&1cfTKBe$Duc-TlnXm6^BazE4uSyLNVU zsl2h_^%>{o>UsZZiG2#XeP_bjSIf?pt-W>b<-$p_drfY3eO?x~Idfll+3(W5tL|^o zv|hRMs$)r;E*~0j5nHpy4&^!Fb8a^ex^tYk^6gfx*+&&t;ucLK6Vh CN^g|_ diff --git a/src/main/resources/assets/electricmagictools/textures/models/thaumicquantumhelmet.png b/src/main/resources/assets/electricmagictools/textures/models/thaumicquantumhelmet.png index 8fd61bcffc417531e65df97875abc8856a58781b..45ae0972960219c77b070a6c4583f2b211fcbf44 100644 GIT binary patch literal 1613 zcmeAS@N?(olHy`uVBq!ia0vp^4M6O`!3HERU8}DLQj#UE5hcO-X(i=}MX3yqDfvmM z3ZA)%>8U}fi7AzZCsS=07?>3^Ln2Bde0{8v^K*7iAWdWaj57fJ{tG z$}cUkRRX#c;)UD-xUqS~&|m@vn0`fKfxe-h0mw@*g}%P{mFDKcRTq~8r6Sym)!^cg z%7Rq=pw#00(xPNw#HA^NtSYc_E=o--$uA1Y&(DE{Vn9ZINq%ugeu09svw}u=W?o8u zd9fx~xv#I4XI^nhVqS8pr;Du;&;Y&6%oHnUV<$5cOJ_q@OEWV=Lsw%F*UYGpj(%jU%5}4i;gkB?@dO;~6w*Y9fOKMSOS!#+~QGTuh*vD3xINjpp zhSNN#-W1$!F~F%;ALtl;P`o0=GfW7WctA{ess(c3={_|NnAnSesrv4_3x^pPm=1Zm zIEGZ*dNXUIw{)UJdp)P&v5vJV8SPWJbd|1fEnQIGps{17LLMLAG#u_$%d8gXJ(dwjgbc?Ijv{^?RqzpPe*X>*%XE4iYVnf*c^j*8n?|;8nd%yU7t@ydr z$Y~EAK1$;dU?2?Najy$2x%6iDp}&7?S1(_F{HEE?Ie)8)roX<%{$OFf@XO4H3??O4 z?%rK{@}%cx+5Y3A94zb9iat8Nl3l@|JB#J=$pZ%(PCeapCvUr%nVAR=+tZH~XZYLN z+Cp^1Lf3|E-Mo2miqXmfi#JJJc{`cDeEn)FA<*mQ8@WaOw{K_Pe4Cz@w(jfeuT{SHJX9_TM90VH*C~oGvW&@n9@E~eyUJH>a^(e~s=ogI zPz{kMpMRcdJbTvn?Ynog7-eN-t^j>idtlCt`|r(}=bV4uD`EC+?%wYYS9@KR&#D&= zQ4PO%^Jb*&yq`Z@pIp#|9^hS6YuKKnrllAzAoN+J*nzz`u7hXHe|kg`t<4kXE9Mx zyDsk3)6+A$eU>HTsMj66t*ckBUN)utnpfV#kMq**pUp~1art)Y|APkyLU?AMy6qno zQL#Qm>uB_WSb+th-6x|?Ze6x)nUCjodG_e&=vlL88yoN0v?=NA`SY`ja_q(QPFZjt ssQx0x@L%(fa0jq-rxX^X|I|Iez&J@fyzOQ43Qz&>>FVdQ&MBb@0CG%a4gdfE literal 885 zcmeAS@N?(olHy`uVBq!ia0vp^4M6O`!3HERU8}DLQY`6?zK#qG8~eHcB(eheoCO|{ z#S9E``$3q|`ESlFpdfpRr>`sfT}ByhGm94!7M%eKNtL)plmzFem6RtIr7{F0X6BXX z`MHKDlo{)p>KPike|9owU|_oE>Eakt5%>1mX@6ly8TJo*6aO>#C-ej+_o(-DhX3X6 zko&lx)7|#Rj>=hT3i)?}I9VCxeQS=eFG{+wz-39tBW*UpUc(MSZ2_AXj*lO|K9jdx zcd5zUO~+b()=kR4_4eGKw3$CmkN%n-<;21U-eV`zR;qXRAp5tr=GK4wP8kfpE z`af&+&%nbKt$9hm<~ThUH`1RgZ`u=nLM=@?-h+32u@Oiz&fM^N#QM@bJ?D@0OC9^X zsq<&g=OFF-8@oR)KDLQnA^nS5THQW{;^z(efeFi4f8;!V&D|J#TX%KM?9{&<-so$(RpX|-+dlG!O;-;CZZKbSBjNH5B$r;?clcQ&|q|N83kr)19 zsrS5Yg_BENozuPWpP#oe>HjXeekS{F%uEhO;cY&`b^AF_^>6B#Xn61OLWx^auf>)e zUU$65#^vj(OSb}Et4QUQ7<~#ct7oS2R0cW$@ba6hx*pZCh2-`91d#P02j`<}Ue#&@4z zmRBFX{C@M(>r#WCbxYjWO)c|x|NFKx*I>HM;~4-nlm?K z8&5B1+4c0-E7Q;W_(A$Z{LtA!7>K1u)-!(HI)(3) TQ|T38eqiu)^>bP0l+XkKTb7xR diff --git a/src/main/resources/assets/electricmagictools/textures/models/thaumiumwing.png b/src/main/resources/assets/electricmagictools/textures/models/thaumiumwing.png new file mode 100644 index 0000000000000000000000000000000000000000..aa6cd4a15b758437608cb0f48ecc294692ffd25f GIT binary patch literal 2176 zcmbVOdsGuw8V?|k$bv|qh!%`-TSYdROdjN6cqbr~01^bc(BdSSKnlr(WFRpX76ht1 zd~7Mut=1P+Hq_o349L_979vOqi2t&9ML_vX!IuxBkg`sgcp0`c~Ns?fcD25Z{N>9?`#tS5( zT1c(x@OE0I2|tLk2-EgT)0s zi1QB#V^d3I+z5WaJQpT;k`hr=#RUMZR!h;+DTq1&0682EK&1gR8X40dYqls+NJmy` zRxeoK!y1WNu0rLAl4!IDiIG&)lZ1KtCIp2_D12*JshLj{mNGyGsQ{2d1r!QnT(7k? zXaxKpH{PkOiQJ-sfe2WGq^c!YJ!GpFz*z47n8>JzdBY7;%dw(B$$UhTs(_Vf5Z{x8 z-B6@*DVHs#gDej*mCT?qXk-{^Scwgf8k-Wn z&{vMbEjkj!_l?xu8vQsvF&1{1OJ}tUzv)meB9#9c+$(f9hi%Kts9oDHNA3B|cYSep z7IBBy4q8itWxw?B!_T{%;-yjddI>osXQ$1Bd|6>y)mX{#q+WFT_R9uV!!&QG zYUwk#rk+&!dC`~Md-wHornIjz>ivTA0^T#Tp?t~;4&(K>@669J5OP*quPq__l&s1% zGYRrG&7OT+KZ5MsCWApeuOE&nlqWV65*d)iv^m(#8PK7u6BgAA{HA@S+9-0JWjZINVr54 zl^)uU{)CQpHvuNC!EK<+J+Q6sCK7&H^L4`(yvdx!;9|G0u6P9R%9YA? zDa9SdqH4oTVXLn2%JbyyV<$g3)0t6?H;F5IQh$A1f0p8Mj&w5X@K3!@+8EEa@$#eI z`?(#A4n67mh;BOoQU+>W&KS~edd0^VxsA^xt*q$Jw%om=$lvhip^D(SI8$qFf}L$$ zm8=fdlp0-)zjQ33U`jrX<3t%%(=mocupAMZcLj=Gz6Hh@@1a zsjI8YpW?SqEYmi8e8qe0*T91C7iY-pxGhIzpGAJ4KJB-$F{@2lIMS=mZP!;L?xxq{)##7?f7Lx1UGaC?%)^i`eL;gQ5 z&{`D%n{p?_^<|R}?!Zs)>QjDkw%eJpJZ_@}@7DRi!2Y%#sHkVt zN5y`vAz34rc-Nf-GB^Bzu{HKxZ0GReHDQ7-?t?>$&H{a@V}Dj>!u{U!=F(Fh>z=u0 zu$=8|6}g>Bm9<=J@6-1rBj-ACb+h=qiWLJlrbU-1A9TH6NZcFC_e8EU6L73%>jCfZ zLAQ}3rXlpq^#z1W*OyffJ>g$-_A!XKhxLO9q3p9)nt<`)8$;I3DI;3PN{-pTM@OT} z12cHc@yVs=WBn#id!V@boY%&l5M0}V{)w*a+Y_@D179~01k^55FPF)xPX!O>Y*}X$ vO&KQN;DnhU`VbD{yB7TqV$9s+cAOcmW89-fDU0eh{u2ZVLisg*o45TAJb`sY literal 0 HcmV?d00001